From fdcb55a0a645e8b89d6b094c38a1571291174500 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Wed, 26 Apr 2017 04:40:27 +0200
Subject: Fix various regressions (#2466)

---
 app/assets/javascripts/components/containers/mastodon.jsx |  2 ++
 app/assets/javascripts/components/locales/fa.jsx          | 10 ----------
 app/assets/javascripts/components/locales/hr.jsx          |  3 ---
 3 files changed, 2 insertions(+), 13 deletions(-)

(limited to 'app/assets/javascripts')

diff --git a/app/assets/javascripts/components/containers/mastodon.jsx b/app/assets/javascripts/components/containers/mastodon.jsx
index c85a353ee..e34cf6c92 100644
--- a/app/assets/javascripts/components/containers/mastodon.jsx
+++ b/app/assets/javascripts/components/containers/mastodon.jsx
@@ -47,6 +47,7 @@ import en from 'react-intl/locale-data/en';
 import de from 'react-intl/locale-data/de';
 import eo from 'react-intl/locale-data/eo';
 import es from 'react-intl/locale-data/es';
+import fa from 'react-intl/locale-data/fa';
 import fi from 'react-intl/locale-data/fi';
 import fr from 'react-intl/locale-data/fr';
 import hu from 'react-intl/locale-data/hu';
@@ -81,6 +82,7 @@ addLocaleData([
   ...de,
   ...eo,
   ...es,
+  ...fa,
   ...fi,
   ...fr,
   ...hu,
diff --git a/app/assets/javascripts/components/locales/fa.jsx b/app/assets/javascripts/components/locales/fa.jsx
index ed46a890b..40a750618 100644
--- a/app/assets/javascripts/components/locales/fa.jsx
+++ b/app/assets/javascripts/components/locales/fa.jsx
@@ -1,13 +1,3 @@
-/**
- * Note for Contributors:
- * This file (en.jsx) serve as a template for other languages.
- * To make other contributors' life easier, please REMEMBER:
- *   1. to add your new string here; and
- *   2. to remove old strings that are no longer needed; and
- *   3. to sort the strings by the key.
- *   4. To rename the `en` const name and export default name to match your locale.
- * Thanks!
- */
 const fa = {
   "account.block": "@{name} را مسدود کن",
   "account.disclaimer": "این کاربر عضو سرور متفاوتی است. شاید عدد واقعی بیشتر از این باشد.",
diff --git a/app/assets/javascripts/components/locales/hr.jsx b/app/assets/javascripts/components/locales/hr.jsx
index 30eff9627..0ca3ef73e 100644
--- a/app/assets/javascripts/components/locales/hr.jsx
+++ b/app/assets/javascripts/components/locales/hr.jsx
@@ -1,6 +1,3 @@
-/**
-hrvatski jezik
- */
 const hr = {
   "account.block": "Blokiraj @{name}",
   "account.disclaimer": "Ovaj korisnik je sa druge instance. Ovaj broj bi mogao biti veći.",
-- 
cgit