Merge pull request #31187 from TheoChevalier/bug1189532-add-bm-mg

Bug 1189532 - Add Bambara (bm) and Malagasy (mg) locales to master. r=stas
mozilla-b2g · Sep 7, 2015 · fdaa25b · fdaa25b
2 parents 876ba1b + 4c985a8
commit fdaa25b
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/build/config/keyboard-layouts.json b/build/config/keyboard-layouts.json
@@ -18,8 +18,17 @@
         {"layoutId": "bg-BDS", "app": ["apps", "keyboard"]},
         {"layoutId": "en", "app": ["apps", "keyboard"]}
     ],
+    "bm": [
+        {"layoutId": "en", "app": ["apps", "keyboard"]}
+    ],
     "bn-BD": [
         {"layoutId": "bn-Avro", "app": ["apps", "keyboard"]},
+        {"layoutId": "bn-Probhat", "app": ["apps", "keyboard"]},
+        {"layoutId": "en", "app": ["apps", "keyboard"]}
+    ],
+    "bn-IN": [
+        {"layoutId": "bn-Avro", "app": ["apps", "keyboard"]},
+        {"layoutId": "bn-Probhat", "app": ["apps", "keyboard"]},
         {"layoutId": "en", "app": ["apps", "keyboard"]}
     ],
     "bs": [
@@ -83,7 +92,7 @@
         {"layoutId": "fr", "app": ["apps", "keyboard"]}
     ],
     "fy-NL": [
-        {"layoutId": "en", "app": ["apps", "keyboard"]}
+        {"layoutId": "fy", "app": ["apps", "keyboard"]}
     ],
     "ga-IE": [
         {"layoutId": "ga", "app": ["apps", "keyboard"]}
@@ -147,14 +156,17 @@
         {"layoutId": "en-Africa", "app": ["apps", "keyboard"]}
     ],
     "lv": [
-        {"layoutId": "en", "app": ["apps", "keyboard"]}
+        {"layoutId": "lv", "app": ["apps", "keyboard"]}
     ],
     "mk": [
         {"layoutId": "mk", "app": ["apps", "keyboard"]}
     ],
     "ml": [
         {"layoutId": "en", "app": ["apps", "keyboard"]}
     ],
+    "mg": [
+        {"layoutId": "en", "app": ["apps", "keyboard"]}
+    ],
     "mr": [
         {"layoutId": "en", "app": ["apps", "keyboard"]}
     ],
@@ -244,7 +256,7 @@
         {"layoutId": "tr-F", "app": ["apps", "keyboard"]}
     ],
     "uk": [
-        {"layoutId": "en", "app": ["apps", "keyboard"]}
+        {"layoutId": "uk", "app": ["apps", "keyboard"]}
     ],
     "ur": [
         {"layoutId": "en", "app": ["apps", "keyboard"]}

diff --git a/locales/languages_all.json b/locales/languages_all.json
@@ -6,6 +6,7 @@
   "ast"       : "Asturianu",
   "be"        : "Беларуская",
   "bg"        : "български",
+  "bm"        : "Bamanankan",
   "bn-BD"     : "বাংলা (বাংলাদেশ)",
   "bn-IN"     : "বাংলা (ভারত)",
   "br"        : "Brezhoneg",
@@ -53,6 +54,7 @@
   "lt"        : "Lietuvių",
   "lv"        : "Latviešu valoda",
   "mai"       : "मैथिली",
+  "mg"        : "Malagasy",
   "mk"        : "Македонски",
   "ml"        : "മലയാളം",
   "mr"        : "मराठी",