Skip to content
This repository has been archived by the owner on Mar 13, 2024. It is now read-only.

Adding English Australian to translated languages #8192

Merged
merged 26 commits into from
Jun 9, 2021
Merged

Adding English Australian to translated languages #8192

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
411d669
Adding English Australian to translated languages
Jun 2, 2021
1ba409a
Merge branch 'master' into MM-30943Update
mattermod Jun 2, 2021
1438340
changing en-AU.json to en_AU.json in i18n.jsx
Jun 2, 2021
3cfaf75
Merge branch 'MM-30943Update' of https://github.com/ctlaltdieliet/mat…
Jun 2, 2021
eb7a287
changing en-AU to en_AU everywhere in i18n.jsx
Jun 2, 2021
7116901
build keeps failing somewhere on en_AU
Jun 2, 2021
8f95835
build keeps failing somewhere on en_AU but this time in schema_admin_…
Jun 2, 2021
622b409
I' commited
Jun 2, 2021
ada3d9a
I do not have bonding problems, I just do not feel anything for you, …
Jun 3, 2021
350434f
Merge branch 'master' into MM-30943Update
mattermod Jun 3, 2021
4b97844
Update components/latex_block/__snapshots__/latex_block.test.tsx.snap
ctlaltdieliet Jun 4, 2021
0940978
Adding English Australian to translated languages
Jun 2, 2021
61a5a91
changing en-AU.json to en_AU.json in i18n.jsx
Jun 2, 2021
be9c5a6
changing en-AU to en_AU everywhere in i18n.jsx
Jun 2, 2021
86cf245
build keeps failing somewhere on en_AU
Jun 2, 2021
130c747
build keeps failing somewhere on en_AU but this time in schema_admin_…
Jun 2, 2021
2acb237
I' commited
Jun 2, 2021
e45b2d1
I do not have bonding problems, I just do not feel anything for you, …
Jun 3, 2021
a240a85
Run updatesnapshot
metanerd Jun 4, 2021
4d4e0af
Merge branch 'master' into MM-30943Update
mattermod Jun 4, 2021
d6785c8
Merge branch 'mattermost:MM-30943Update' into MM-30943Update
ctlaltdieliet Jun 4, 2021
d424a3e
Another snapshot
Jun 4, 2021
70fe991
Revert latex snapshot
metanerd Jun 4, 2021
d0f97bb
Merge pull request #124 from mattermost/MM-30943Update
ctlaltdieliet Jun 4, 2021
70bd0cf
Fix naming
metanerd Jun 8, 2021
486f05c
Merge pull request #130 from mattermost/MM-30943-modify-file-load
ctlaltdieliet Jun 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
78 changes: 44 additions & 34 deletions components/admin_console/__snapshots__/schema_admin_settings.test.jsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,86 +296,91 @@ exports[`components/admin_console/SchemaAdminSettings should match snapshot with
},
Object {
"order": 2,
"text": "English Australian (Beta)",
"value": "en-AU",
},
Object {
"order": 3,
"text": "Español",
"value": "es",
},
Object {
"order": 3,
"order": 4,
"text": "Français",
"value": "fr",
},
Object {
"order": 4,
"order": 5,
"text": "Italiano",
"value": "it",
},
Object {
"order": 5,
"text": "Magyar",
"order": 6,
"text": "Magyar (Beta)",
"value": "hu",
},
Object {
"order": 6,
"order": 7,
"text": "Nederlands",
"value": "nl",
},
Object {
"order": 7,
"order": 8,
"text": "Polski",
"value": "pl",
},
Object {
"order": 8,
"order": 9,
"text": "Português (Brasil)",
"value": "pt-BR",
},
Object {
"order": 9,
"order": 10,
"text": "Română",
"value": "ro",
},
Object {
"order": 10,
"order": 11,
"text": "Svenska",
"value": "sv",
},
Object {
"order": 11,
"order": 12,
"text": "Türkçe",
"value": "tr",
},
Object {
"order": 12,
"order": 13,
"text": "Български",
"value": "bg",
},
Object {
"order": 13,
"order": 14,
"text": "Pусский",
"value": "ru",
},
Object {
"order": 14,
"order": 15,
"text": "Yкраїнська (Alpha)",
"value": "uk",
},
Object {
"order": 15,
"order": 16,
"text": "한국어 (Alpha)",
"value": "ko",
},
Object {
"order": 16,
"order": 17,
"text": "中文 (简体)",
"value": "zh-CN",
},
Object {
"order": 17,
"order": 18,
"text": "中文 (繁體)",
"value": "zh-TW",
},
Object {
"order": 18,
"order": 19,
"text": "日本語",
"value": "ja",
},
Expand Down Expand Up @@ -417,86 +422,91 @@ exports[`components/admin_console/SchemaAdminSettings should match snapshot with
},
Object {
"order": 2,
"text": "English Australian (Beta)",
"value": "en-AU",
},
Object {
"order": 3,
"text": "Español",
"value": "es",
},
Object {
"order": 3,
"order": 4,
"text": "Français",
"value": "fr",
},
Object {
"order": 4,
"order": 5,
"text": "Italiano",
"value": "it",
},
Object {
"order": 5,
"text": "Magyar",
"order": 6,
"text": "Magyar (Beta)",
"value": "hu",
},
Object {
"order": 6,
"order": 7,
"text": "Nederlands",
"value": "nl",
},
Object {
"order": 7,
"order": 8,
"text": "Polski",
"value": "pl",
},
Object {
"order": 8,
"order": 9,
"text": "Português (Brasil)",
"value": "pt-BR",
},
Object {
"order": 9,
"order": 10,
"text": "Română",
"value": "ro",
},
Object {
"order": 10,
"order": 11,
"text": "Svenska",
"value": "sv",
},
Object {
"order": 11,
"order": 12,
"text": "Türkçe",
"value": "tr",
},
Object {
"order": 12,
"order": 13,
"text": "Български",
"value": "bg",
},
Object {
"order": 13,
"order": 14,
"text": "Pусский",
"value": "ru",
},
Object {
"order": 14,
"order": 15,
"text": "Yкраїнська (Alpha)",
"value": "uk",
},
Object {
"order": 15,
"order": 16,
"text": "한국어 (Alpha)",
"value": "ko",
},
Object {
"order": 16,
"order": 17,
"text": "中文 (简体)",
"value": "zh-CN",
},
Object {
"order": 17,
"order": 18,
"text": "中文 (繁體)",
"value": "zh-TW",
},
Object {
"order": 18,
"order": 19,
"text": "日本語",
"value": "ja",
},
Expand Down
43 changes: 25 additions & 18 deletions i18n/i18n.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
/* eslint-disable import/order */
import bg from './bg.json';
import de from './de.json';
import enAU from './en_AU.json';
import es from './es.json';
import fr from './fr.json';
import hu from './hu.json';
Expand Down Expand Up @@ -39,106 +40,112 @@ const languages = {
order: 1,
url: '',
},
'en-AU': {
value: 'en-AU',
name: 'English Australian (Beta)',
order: 2,
url: enAU,
},
es: {
value: 'es',
name: 'Español',
order: 2,
order: 3,
url: es,
},
fr: {
value: 'fr',
name: 'Français',
order: 3,
order: 4,
url: fr,
},
it: {
value: 'it',
name: 'Italiano',
order: 4,
order: 5,
url: it,
},
hu: {
value: 'hu',
name: 'Magyar',
order: 5,
name: 'Magyar (Beta)',
order: 6,
url: hu,
},
nl: {
value: 'nl',
name: 'Nederlands',
order: 6,
order: 7,
url: nl,
},
pl: {
value: 'pl',
name: 'Polski',
order: 7,
order: 8,
url: pl,
},
'pt-BR': {
value: 'pt-BR',
name: 'Português (Brasil)',
order: 8,
order: 9,
url: ptBR,
},
ro: {
value: 'ro',
name: 'Română',
order: 9,
order: 10,
url: ro,
},
sv: {
value: 'sv',
name: 'Svenska',
order: 10,
order: 11,
url: sv,
},
tr: {
value: 'tr',
name: 'Türkçe',
order: 11,
order: 12,
url: tr,
},
bg: {
value: 'bg',
name: 'Български',
order: 12,
order: 13,
url: bg,
},
ru: {
value: 'ru',
name: 'Pусский',
order: 13,
order: 14,
url: ru,
},
uk: {
value: 'uk',
name: 'Yкраїнська (Alpha)',
order: 14,
order: 15,
url: uk,
},
ko: {
value: 'ko',
name: '한국어 (Alpha)',
order: 15,
order: 16,
url: ko,
},
'zh-CN': {
value: 'zh-CN',
name: '中文 (简体)',
order: 16,
order: 17,
url: zhCN,
},
'zh-TW': {
value: 'zh-TW',
name: '中文 (繁體)',
order: 17,
order: 18,
url: zhTW,
},
ja: {
value: 'ja',
name: '日本語',
order: 18,
order: 19,
url: ja,
},
};
Expand Down