Merge branch 'release/1.0.22'

CenterForOpenScience · Jan 5, 2018 · e29c6c2 · e29c6c2
2 parents 93676a0 + cea8989
commit e29c6c2
Show file tree

Hide file tree

Showing 7 changed files with 1,316 additions and 177 deletions.
diff --git a/app/components/isp-consent-form/consentText.js b/app/components/isp-consent-form/consentText.js
diff --git a/app/components/language-picker/countries.js b/app/components/language-picker/countries.js
@@ -157,6 +157,16 @@ export default [
         ],
         "name": "Denmark"
     },
+    {
+        "code": "EG",
+        "languages": [
+            {
+                "code": "ar-EG",
+                "name": "العربية"
+            }
+        ],
+        "name": "Egypt"
+    },
     {
         "code": "EE",
         "languages": [

diff --git a/app/locales/ar-eg/config.js b/app/locales/ar-eg/config.js
@@ -0,0 +1,12 @@
+// Ember-I18n includes configuration for common locales. Most users
+// can safely delete this file. Use it if you need to override behavior
+// for a locale or define behavior for a locale that Ember-I18n
+// doesn't know about.
+export default {
+    rtl: true,
+
+    pluralForm: function(count) {
+        if (count === 1) { return 'one'; }
+        return 'other';
+    }
+};