Merge pull request #27468 from TheoChevalier/bug-1122328-2.0

Bug 1122328 - Add Finnish (fi), Armenian (hy-AM), Burmese (my) to master...
mozilla-b2g · Jan 22, 2015 · 2989f2b · 2989f2b
2 parents 736933b + 1e93144
commit 2989f2b
Show file tree

Hide file tree

Showing 4 changed files with 156 additions and 1 deletion.
diff --git a/apps/keyboard/js/layouts/en-Africa.js b/apps/keyboard/js/layouts/en-Africa.js
@@ -0,0 +1,80 @@
+Keyboards['en-Africa'] = {
+  label: 'English (Africa)',
+  shortLabel: 'En',
+  imEngine: 'latin',
+  types: ['text', 'url', 'email'],
+  autoCorrectLanguage: 'en_gb',
+  menuLabel: 'English (Africa)',
+  alt: {
+    a: 'áàâäåãāæ',
+    c: 'çćč',
+    e: 'éèêëēę€ɛ',
+    i: 'ïíìîīį',
+    o: 'öóòôōœøɵ',
+    u: 'üúùûū',
+    s: 'ßśš$',
+    S: 'ŚŠ$',
+    n: 'ñń',
+    l: 'ł£',
+    y: 'ÿ¥',
+    z: 'žźż',
+    '.': ',?!;:'
+  },
+  keys: [
+    [
+      { value: 'q' }, { value: 'w' }, { value: 'e' }, { value: 'r' },
+      { value: 't' }, { value: 'y' }, { value: 'u' }, { value: 'i' },
+      { value: 'o' }, { value: 'p' }
+    ], [
+      { value: 'a' }, { value: 's' }, { value: 'd' }, { value: 'f' },
+      { value: 'g' }, { value: 'h' }, { value: 'j' }, { value: 'k' },
+      { value: 'l' },
+      { value: ':', visible: ['url']}, { value: '_', visible: ['email']}
+    ], [
+      { value: '⇪', ratio: 1.5, keyCode: KeyEvent.DOM_VK_CAPS_LOCK },
+      { value: 'z' }, { value: 'x' }, { value: 'c' }, { value: 'v' },
+      { value: 'b' }, { value: 'n' }, { value: 'm' },
+      { value: '⌫', ratio: 1.5, keyCode: KeyEvent.DOM_VK_BACK_SPACE }
+    ], [
+      { value: '&nbsp', ratio: 8, keyCode: KeyboardEvent.DOM_VK_SPACE },
+      { value: '↵', ratio: 2, keyCode: KeyEvent.DOM_VK_RETURN }
+    ]
+  ],
+  alternateLayout: {
+    alt: {
+      '0': 'º',
+      '1': '1st ',
+      '2': '2nd ',
+      '3': '3rd ',
+      '4': '4th ',
+      '5': '5th ',
+      '6': '6th ',
+      '7': '7th ',
+      '8': '8th ',
+      '9': '9th ',
+      '$': '€ £ ¥',
+      '?': '¿',
+      '!': '¡'
+    },
+    keys: [
+      [
+        { value: '1' }, { value: '2' }, { value: '3' }, { value: '4' },
+        { value: '5' }, { value: '6' }, { value: '7' }, { value: '8' },
+        { value: '9' }, { value: '0' }
+      ], [
+        { value: '@', hidden: ['email'] }, { value: '#' }, { value: '$' },
+        { value: '%' }, { value: '&' }, { value: '*' }, { value: '-' },
+        { value: '+' }, { value: '(' }, { value: ')' },
+        { value: '_', visible: ['email'] }
+      ], [
+        { value: 'ALT', ratio: 1.5, keyCode: KeyEvent.DOM_VK_ALT },
+        { value: '!' }, { value: '\"' }, { value: "'" }, { value: ':' },
+        { value: ';' }, { value: '/' }, { value: '?' },
+        { value: '⌫', ratio: 1.5, keyCode: KeyEvent.DOM_VK_BACK_SPACE }
+      ], [
+        { value: '&nbsp', ratio: 8, keyCode: KeyboardEvent.DOM_VK_SPACE },
+        { value: '↵', ratio: 2, keyCode: KeyEvent.DOM_VK_RETURN }
+      ]
+    ]
+  }
+};
diff --git a/apps/keyboard/js/layouts/wo.js b/apps/keyboard/js/layouts/wo.js
@@ -0,0 +1,41 @@
+Keyboards.wo = {
+  label: 'Wolof',
+  shortLabel: 'Wo',
+  menuLabel: 'Wolof',
+  imEngine: 'latin',
+  types: ['text', 'url', 'email'],
+  alt: {
+    a: 'àâæáãäåā',
+    c: 'çćč',
+    e: 'éèêë€ē',
+    i: 'îïìíī',
+    o: 'óôœòõöōø',
+    u: 'ùûüúū',
+    s: 'śšşß',
+    S: 'ŚŠŞ',
+    n: 'ñńň',
+    é: 'z',
+    ë: 'h',
+    ŋ: 'v',
+    '.': ',?!-;:',
+  },
+  keys: [
+    [
+      { value: 'a' }, { value: 'é' }, { value: 'e' }, { value: 'r' },
+      { value: 't' }, { value: 'y' }, { value: 'u' }, { value: 'i' },
+      { value: 'o' }, { value: 'p' }
+    ], [
+      { value: 'q' }, { value: 's' }, { value: 'd' }, { value: 'f' },
+      { value: 'g' }, { value: 'ë' }, { value: 'j' }, { value: 'k' },
+      { value: 'l' }, { value: 'm' }
+    ], [
+      { value: '⇪', ratio: 1.5, keyCode: KeyEvent.DOM_VK_CAPS_LOCK },
+      { value: 'w' }, { value: 'x' }, { value: 'c' }, { value: 'ŋ' },
+      { value: 'b' }, { value: 'n' }, { value: '\''},
+      { value: '⌫', ratio: 1.5, keyCode: KeyEvent.DOM_VK_BACK_SPACE }
+    ], [
+      { value: '&nbsp', ratio: 8, keyCode: KeyboardEvent.DOM_VK_SPACE },
+      { value: '↵', ratio: 2, keyCode: KeyEvent.DOM_VK_RETURN }
+    ]
+  ]
+};
diff --git a/build/config/keyboard-layouts.json b/build/config/keyboard-layouts.json
@@ -18,6 +18,9 @@
     "bn-BD": [
         {"layoutId": "en", "app": ["apps", "keyboard"]}
     ],
+    "bs": [
+        {"layoutId": "en", "app": ["apps", "keyboard"]}
+    ],
     "ca": [
         {"layoutId": "ca", "app": ["apps", "keyboard"]}
     ],
@@ -33,6 +36,9 @@
     "de": [
         {"layoutId": "de", "app": ["apps", "keyboard"]}
     ],
+    "ee": [
+        {"layoutId": "en-Africa", "app": ["apps", "keyboard"]}
+    ],
     "el": [
         {"layoutId": "el", "app": ["apps", "keyboard"]},
         {"layoutId": "en", "app": ["apps", "keyboard"]}
@@ -77,6 +83,9 @@
     "gl": [
         {"layoutId": "es", "app": ["apps", "keyboard"]}
     ],
+    "ha": [
+        {"layoutId": "en-Africa", "app": ["apps", "keyboard"]}
+    ],
     "he": [
         {"layoutId": "he", "app": ["apps", "keyboard"]},
         {"layoutId": "en", "app": ["apps", "keyboard"]}
@@ -97,6 +106,9 @@
     "id": [
         {"layoutId": "en", "app": ["apps", "keyboard"]}
     ],
+    "ig": [
+        {"layoutId": "en-Africa", "app": ["apps", "keyboard"]}
+    ],
     "it": [
         {"layoutId": "it", "app": ["apps", "keyboard"]}
     ],
@@ -111,6 +123,9 @@
     "lij": [
         {"layoutId": "en", "app": ["apps", "keyboard"]}
     ],
+    "ln": [
+        {"layoutId": "en-Africa", "app": ["apps", "keyboard"]}
+    ],
     "mk": [
         {"layoutId": "mk", "app": ["apps", "keyboard"]}
     ],
@@ -173,6 +188,9 @@
     "sv-SE": [
         {"layoutId": "sv", "app": ["apps", "keyboard"]}
     ],
+    "sw": [
+        {"layoutId": "en-Africa", "app": ["apps", "keyboard"]}
+    ],
     "ta": [
         {"layoutId": "ta", "app": ["apps", "keyboard"]},
         {"layoutId": "en", "app": ["apps", "keyboard"]}
@@ -191,6 +209,15 @@
         {"layoutId": "vi-Typewriter", "app": ["apps", "keyboard"]},
         {"layoutId": "fr", "app": ["apps", "keyboard"]}
     ],
+    "wo": [
+        {"layoutId": "wo", "app": ["apps", "keyboard"]}
+    ],
+    "xh": [
+        {"layoutId": "en-Africa", "app": ["apps", "keyboard"]}
+    ],
+    "yo": [
+        {"layoutId": "en-Africa", "app": ["apps", "keyboard"]}
+    ],
     "zh-CN": [
         {"layoutId": "zh-Hans-Pinyin", "app": ["apps", "keyboard"]},
         {"layoutId": "en", "app": ["apps", "keyboard"]}
@@ -200,7 +227,7 @@
         {"layoutId": "en", "app": ["apps", "keyboard"]}
     ],
     "zu": [
-        {"layoutId": "en", "app": ["apps", "keyboard"]}
+        {"layoutId": "en-Africa", "app": ["apps", "keyboard"]}
     ]
   },
   "langIndependentLayouts": [

diff --git a/locales/languages_all.json b/locales/languages_all.json
@@ -13,6 +13,7 @@
   "cy"        : "Cymraeg",
   "da"        : "Dansk",
   "de"        : "Deutsch",
+  "ee"        : "Èʋe",
   "el"        : "Ελληνικά",
   "en-GB"     : "English (GB)",
   "en-US"     : "English (US)",
@@ -27,24 +28,28 @@
   "gd"        : "Gàidhlig",
   "gl"        : "Galego",
   "gu"        : "ગુજરાતી",
+  "ha"        : "Yaren Hausa",
   "he"        : "עברית",
   "hi-IN"     : "हिन्दी (भारत)",
   "hr"        : "Hrvatski",
   "ht"        : "Kreyòl ayisyen",
   "hu"        : "Magyar",
   "id"        : "Bahasa Indonesia",
+  "ig"        : "Asụsụ Igbo",
   "it"        : "Italiano",
   "ja"        : "日本語",
   "km"        : "ខ្មែរ",
   "kn"        : "ಕನ್ನಡ",
   "ko"        : "한국어",
   "lij"       : "Ligure",
+  "ln"        : "Ngala",
   "lt"        : "Lietuvių",
   "mai"       : "मैथिली",
   "mk"        : "Македонски",
   "ml"        : "മലയാളം",
   "mr"        : "मराठी",
   "ms"        : "Melayu",
+  "my"        : "မြန်မာစာ",
   "nb-NO"     : "Norsk bokmål",
   "ne-NP"     : "नेपाली",
   "nl"        : "Nederlands",
@@ -69,7 +74,9 @@
   "tr"        : "Türkçe",
   "ur"        : "اُردو",
   "vi"        : "Tiếng Việt",
+  "wo"        : "Wolof",
   "xh"        : "isiXhosa",
+  "yo"        : "èdè Yorùbá",
   "zh-CN"     : "中文 (简体)",
   "zh-TW"     : "正體中文 (繁體)",
   "zu"        : "isiZulu"