From 6f0b3b069f3ee9a9eceec77666fc124b9695f124 Mon Sep 17 00:00:00 2001
From: Koala Yeung <koalay@gmail.com>
Date: Sun, 23 Apr 2017 11:58:47 +0800
Subject: Adding arabic string localization (rebased) (#1895)

* Create ar.jsx

* Preparing file for translation.

* Create ar.yml

* Preparing file for translation.

* Create simple_form.ar.yml

* Preparing file for translation.

* Create devise.ar.yml

* Preparing file for translation.

* Create doorkeeper.ar.yml

* Preparing file for translation.

* Update index.jsx

Preparing file for translation.

* Update mastodon.jsx

* Preparing file to translation.
* Correction thanks to @Taekiro
  https://github.com/tootsuite/mastodon/pull/1798#pullrequestreview-32924922

* Update settings_helper.rb

Preparing file to translation.

* Update application.rb

* Preparing file to translation.

* Update simple_form.ar.yml

* Update doorkeeper.ar.yml

* Update devise.ar.yml

* Update ar.yml

* Fix i18n-tasks unused issue (ar)

Remove unused translation strings

* Update application.rb

* Update ar.jsx

* Fix various issues with Arabic translation

* Fix duplication caused in merge
* Fix syntax error in devise.ar.yml
* Fix import error Duplicated incorrect import in mastodon.jsx
* Fix duplication error in locales/index.jsx

* Update ar.yml

* Update ar.jsx

* Update ar.yml

* Update ar.jsx

* Fix ar translation
---
 app/assets/javascripts/components/containers/mastodon.jsx | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'app/assets/javascripts/components/containers')

diff --git a/app/assets/javascripts/components/containers/mastodon.jsx b/app/assets/javascripts/components/containers/mastodon.jsx
index 6aae23b62..e2b91e5dd 100644
--- a/app/assets/javascripts/components/containers/mastodon.jsx
+++ b/app/assets/javascripts/components/containers/mastodon.jsx
@@ -42,6 +42,7 @@ import Blocks from '../features/blocks';
 import Mutes from '../features/mutes';
 import Report from '../features/report';
 import { IntlProvider, addLocaleData } from 'react-intl';
+import ar from 'react-intl/locale-data/ar';
 import en from 'react-intl/locale-data/en';
 import de from 'react-intl/locale-data/de';
 import eo from 'react-intl/locale-data/eo';
@@ -76,6 +77,7 @@ const browserHistory = useRouterHistory(createBrowserHistory)({
 
 addLocaleData([
   ...en,
+  ...ar,
   ...de,
   ...eo,
   ...es,
-- 
cgit