Skip to content

Commit 97535de

Browse files
TheoChevalierTheoChevalier
committed
Bug 1122328 - Add Finnish (fi), Armenian (hy-AM), Burmese (my) to master / Add Ewe (ee), Lingala (ln), Wolof (wo), Igbo (ig), Yoruba (yo), Hausa (ha) and locales to 2.0, add Wolof keyboard + generic keyboard for Africa to 2.0
1 parent 3f57a35 commit 97535de

File tree

4 files changed

+170
-2
lines changed

4 files changed

+170
-2
lines changed

‎apps/keyboard/js/layouts/en-Africa.js

+91
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
1+
Keyboards['en-Africa'] = {
2+
label: 'English (Africa)',
3+
shortLabel: 'En',
4+
imEngine: 'latin',
5+
types: ['text', 'url', 'email', 'password'],
6+
autoCorrectLanguage: 'en_gb',
7+
menuLabel: 'English (Africa)',
8+
pages: [ {
9+
alt: {
10+
a: 'áàâäåãāæ',
11+
c: 'çćč',
12+
e: 'éèêëēę€ɛ',
13+
i: 'ïíìîīį',
14+
o: 'öõóòôōœøɵ',
15+
u: 'üúùûū',
16+
s: 'ßśš$',
17+
S: 'ŚŠ$',
18+
n: 'ñń',
19+
l: 'ł£',
20+
y: 'ÿ¥',
21+
z: 'žźż',
22+
'.': ',?!;:…'
23+
},
24+
keys: [
25+
[
26+
{ value: 'q' }, { value: 'w' }, { value: 'e' }, { value: 'r' },
27+
{ value: 't' }, { value: 'y' }, { value: 'u' }, { value: 'i' },
28+
{ value: 'o' }, { value: 'p' }
29+
], [
30+
{ value: 'a' }, { value: 's' }, { value: 'd' }, { value: 'f' },
31+
{ value: 'g' }, { value: 'h' }, { value: 'j' }, { value: 'k' },
32+
{ value: 'l' }
33+
], [
34+
{ value: '⇪', ratio: 1.5, keyCode: KeyEvent.DOM_VK_CAPS_LOCK },
35+
{ value: 'z' }, { value: 'x' }, { value: 'c' }, { value: 'v' },
36+
{ value: 'b' }, { value: 'n' }, { value: 'm' },
37+
{ value: '⌫', ratio: 1.5, keyCode: KeyEvent.DOM_VK_BACK_SPACE }
38+
], [
39+
{ value: '&nbsp', ratio: 8, keyCode: KeyboardEvent.DOM_VK_SPACE },
40+
{ value: '↵', ratio: 2, keyCode: KeyEvent.DOM_VK_RETURN }
41+
]
42+
],
43+
}, {
44+
alt: {
45+
'1': ['¹', '1st'],
46+
'2': ['²', '2nd'],
47+
'3': ['³', '3rd'],
48+
'4': ['⁴', '4th'],
49+
'5': ['⁵', '5th'],
50+
'6': ['⁶', '6th'],
51+
'7': ['⁷', '7th'],
52+
'8': ['⁸', '8th'],
53+
'9': ['⁹', '9th'],
54+
'0': ['⁰', 'º'],
55+
'$': [ '€', '£', '¢', '¥'],
56+
'"': ['“', '”'],
57+
'\'':['‘', '’'],
58+
'?': ['¿'],
59+
'!': ['¡'],
60+
'+': ['-', '×', '÷', '±']
61+
},
62+
keys: [
63+
[
64+
{ value: '1' }, { value: '2' }, { value: '3' }, { value: '4' },
65+
{ value: '5' }, { value: '6' }, { value: '7' }, { value: '8' },
66+
{ value: '9' }, { value: '0' }
67+
], [
68+
{ value: '@' }, { value: '#' },
69+
{ value: '$', className: 'alternate-indicator' }, { value: '&' },
70+
{ value: '*' }, { value: '-' }, { value: '_' }, { value: '/' },
71+
{ value: '(' }, { value: ')' }
72+
], [
73+
{ value: 'Alt', ratio: 1.5,
74+
keyCode: KeyboardEvent.DOM_VK_ALT,
75+
className: 'page-switch-key',
76+
targetPage: 2
77+
},
78+
{ value: '+',
79+
supportsSwitching: {
80+
value: ','
81+
}
82+
}, { value: ':' }, { value: ';' }, { value: '"' },
83+
{ value: '\'' }, { value: '!' }, { value: '?' },
84+
{ value: '⌫', ratio: 1.5, keyCode: KeyEvent.DOM_VK_BACK_SPACE }
85+
], [
86+
{ value: '&nbsp', ratio: 8, keyCode: KeyboardEvent.DOM_VK_SPACE },
87+
{ value: '↵', ratio: 2, keyCode: KeyEvent.DOM_VK_RETURN }
88+
]
89+
]
90+
} ]
91+
};

‎apps/keyboard/js/layouts/wo.js

+43
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
Keyboards.wo = {
2+
label: 'Wolof',
3+
shortLabel: 'Wo',
4+
menuLabel: 'Wolof',
5+
imEngine: 'latin',
6+
types: ['text', 'url', 'email', 'password'],
7+
pages: [ {
8+
alt: {
9+
a: 'àâæáãäåā',
10+
c: 'çćč',
11+
e: 'éèêë€ē',
12+
i: 'îïìíī',
13+
o: 'óôœòõöōø',
14+
u: 'ùûüúū',
15+
s: 'śšşß',
16+
S: 'ŚŠŞ',
17+
n: 'ñńň',
18+
é: 'z',
19+
ë: 'h',
20+
ŋ: 'v',
21+
'.': ',?!-;:',
22+
},
23+
keys: [
24+
[
25+
{ value: 'a' }, { value: 'é' }, { value: 'e' }, { value: 'r' },
26+
{ value: 't' }, { value: 'y' }, { value: 'u' }, { value: 'i' },
27+
{ value: 'o' }, { value: 'p' }
28+
], [
29+
{ value: 'q' }, { value: 's' }, { value: 'd' }, { value: 'f' },
30+
{ value: 'g' }, { value: 'ë' }, { value: 'j' }, { value: 'k' },
31+
{ value: 'l' }, { value: 'm' }
32+
], [
33+
{ value: '⇪', ratio: 1.5, keyCode: KeyEvent.DOM_VK_CAPS_LOCK },
34+
{ value: 'w' }, { value: 'x' }, { value: 'c' }, { value: 'ŋ' },
35+
{ value: 'b' }, { value: 'n' }, { value: '\''},
36+
{ value: '⌫', ratio: 1.5, keyCode: KeyEvent.DOM_VK_BACK_SPACE }
37+
], [
38+
{ value: '&nbsp', ratio: 8, keyCode: KeyboardEvent.DOM_VK_SPACE },
39+
{ value: '↵', ratio: 2, keyCode: KeyEvent.DOM_VK_RETURN }
40+
]
41+
]
42+
} ]
43+
};

‎build/config/keyboard-layouts.json

+32-2
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@
3636
"de": [
3737
{"layoutId": "de", "app": ["apps", "keyboard"]}
3838
],
39+
"ee": [
40+
{"layoutId": "en-Africa", "app": ["apps", "keyboard"]}
41+
],
3942
"el": [
4043
{"layoutId": "el", "app": ["apps", "keyboard"]},
4144
{"layoutId": "en", "app": ["apps", "keyboard"]}
@@ -66,6 +69,9 @@
6669
{"layoutId": "fr", "app": ["apps", "keyboard"]},
6770
{"layoutId": "en", "app": ["apps", "keyboard"]}
6871
],
72+
"fi": [
73+
{"layoutId": "en", "app": ["apps", "keyboard"]}
74+
],
6975
"fr": [
7076
{"layoutId": "fr", "app": ["apps", "keyboard"]}
7177
],
@@ -81,6 +87,9 @@
8187
"gl": [
8288
{"layoutId": "es", "app": ["apps", "keyboard"]}
8389
],
90+
"ha": [
91+
{"layoutId": "en-Africa", "app": ["apps", "keyboard"]}
92+
],
8493
"he": [
8594
{"layoutId": "he", "app": ["apps", "keyboard"]},
8695
{"layoutId": "en", "app": ["apps", "keyboard"]}
@@ -98,9 +107,15 @@
98107
"hu": [
99108
{"layoutId": "hu", "app": ["apps", "keyboard"]}
100109
],
110+
"hy-AM": [
111+
{"layoutId": "en", "app": ["apps", "keyboard"]}
112+
],
101113
"id": [
102114
{"layoutId": "en", "app": ["apps", "keyboard"]}
103115
],
116+
"ig": [
117+
{"layoutId": "en-Africa", "app": ["apps", "keyboard"]}
118+
],
104119
"it": [
105120
{"layoutId": "it", "app": ["apps", "keyboard"]}
106121
],
@@ -115,7 +130,10 @@
115130
"lij": [
116131
{"layoutId": "en", "app": ["apps", "keyboard"]}
117132
],
118-
"lv": [
133+
"ln": [
134+
{"layoutId": "en-Africa", "app": ["apps", "keyboard"]}
135+
],
136+
"lv": [
119137
{"layoutId": "en", "app": ["apps", "keyboard"]}
120138
],
121139
"mk": [
@@ -189,6 +207,9 @@
189207
"sv-SE": [
190208
{"layoutId": "sv", "app": ["apps", "keyboard"]}
191209
],
210+
"sw": [
211+
{"layoutId": "en-Africa", "app": ["apps", "keyboard"]}
212+
],
192213
"ta": [
193214
{"layoutId": "ta", "app": ["apps", "keyboard"]},
194215
{"layoutId": "en", "app": ["apps", "keyboard"]}
@@ -207,6 +228,15 @@
207228
{"layoutId": "vi-Typewriter", "app": ["apps", "keyboard"]},
208229
{"layoutId": "fr", "app": ["apps", "keyboard"]}
209230
],
231+
"wo": [
232+
{"layoutId": "wo", "app": ["apps", "keyboard"]}
233+
],
234+
"xh": [
235+
{"layoutId": "en-Africa", "app": ["apps", "keyboard"]}
236+
],
237+
"yo": [
238+
{"layoutId": "en-Africa", "app": ["apps", "keyboard"]}
239+
],
210240
"zh-CN": [
211241
{"layoutId": "zh-Hans-Pinyin", "app": ["apps", "keyboard"]},
212242
{"layoutId": "en", "app": ["apps", "keyboard"]}
@@ -216,7 +246,7 @@
216246
{"layoutId": "en", "app": ["apps", "keyboard"]}
217247
],
218248
"zu": [
219-
{"layoutId": "en", "app": ["apps", "keyboard"]}
249+
{"layoutId": "en-Africa", "app": ["apps", "keyboard"]}
220250
]
221251
},
222252
"langIndependentLayouts": [

‎locales/languages_all.json

+4
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,15 @@
3030
"gd" : "Gàidhlig",
3131
"gl" : "Galego",
3232
"gu" : "ગુજરાતી",
33+
"ha" : "Yaren Hausa",
3334
"he" : "עברית",
3435
"hi-IN" : "हिन्दी (भारत)",
3536
"hr" : "Hrvatski",
3637
"ht" : "Kreyòl ayisyen",
3738
"hu" : "Magyar",
3839
"hy-AM" : "Հայերեն",
3940
"id" : "Bahasa Indonesia",
41+
"ig" : "Asụsụ Igbo",
4042
"it" : "Italiano",
4143
"ja" : "日本語",
4244
"km" : "ខ្មែរ",
@@ -51,6 +53,7 @@
5153
"ml" : "മലയാളം",
5254
"mr" : "मराठी",
5355
"ms" : "Melayu",
56+
"my" : "မြန်မာစာ",
5457
"nb-NO" : "Norsk bokmål",
5558
"ne-NP" : "नेपाली",
5659
"nl" : "Nederlands",
@@ -78,6 +81,7 @@
7881
"vi" : "Tiếng Việt",
7982
"wo" : "Wolof",
8083
"xh" : "isiXhosa",
84+
"yo" : "èdè Yorùbá",
8185
"zh-CN" : "中文 (简体)",
8286
"zh-TW" : "正體中文 (繁體)",
8387
"zu" : "isiZulu"

0 commit comments

Comments
 (0)