summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndras Timar <andras.timar@collabora.com>2020-01-22 21:34:25 +0100
committerAndras Timar <andras.timar@collabora.com>2020-02-10 17:22:05 +0100
commit87fea7126f15b157148bdc70e6a7e8753ad545df (patch)
tree295a68c3a259ce3c2bd11b8e78dd649975dd7a39
parent97e56d3011a09bc1f463060ffb8f9e2d889c6440 (diff)
accept standard BCP 47 language tagslibreoffice-6-4
Some integrations send a BCP 47 language tag in lang parameter (by the way this is what makes sense, the lower case codes are non-standard). This commit fixes the bug, when for example lang=pt-BR fell back to pt with the JavaScript UI. Change-Id: I770f499feb605696fa589bfc326194218c3c9fb1 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/87223 Tested-by: Andras Timar <andras.timar@collabora.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
-rw-r--r--loleaflet/l10n/admin-localizations.json7
-rw-r--r--loleaflet/l10n/help-localizations.json7
-rw-r--r--loleaflet/l10n/localizations.json7
-rw-r--r--loleaflet/l10n/locore-localizations.json7
-rw-r--r--loleaflet/l10n/uno-localizations.json7
5 files changed, 35 insertions, 0 deletions
diff --git a/loleaflet/l10n/admin-localizations.json b/loleaflet/l10n/admin-localizations.json
index 0ad504c88..a42f0de97 100644
--- a/loleaflet/l10n/admin-localizations.json
+++ b/loleaflet/l10n/admin-localizations.json
@@ -11,6 +11,7 @@
"be": "../l10n/ui-be.json",
"bg": "../l10n/ui-bg.json",
"bn-in": "../l10n/ui-bn_IN.json",
+ "bn-IN": "../l10n/ui-bn_IN.json",
"bn": "../l10n/ui-bn.json",
"bo": "../l10n/ui-bo.json",
"br": "../l10n/ui-br.json",
@@ -26,7 +27,9 @@
"dz": "../l10n/ui-dz.json",
"el": "../l10n/ui-el.json",
"en-gb": "../l10n/ui-en_GB.json",
+ "en-GB": "../l10n/ui-en_GB.json",
"en-za": "../l10n/ui-en_ZA.json",
+ "en-ZA": "../l10n/ui-en_ZA.json",
"eo": "../l10n/ui-eo.json",
"es": "../l10n/ui-es.json",
"et": "../l10n/ui-et.json",
@@ -79,8 +82,10 @@
"om": "../l10n/ui-om.json",
"or": "../l10n/ui-or.json",
"pa-in": "../l10n/ui-pa_IN.json",
+ "pa-IN": "../l10n/ui-pa_IN.json",
"pl": "../l10n/ui-pl.json",
"pt-br": "../l10n/ui-pt_BR.json",
+ "pt-BR": "../l10n/ui-pt_BR.json",
"pt": "../l10n/ui-pt.json",
"ro": "../l10n/ui-ro.json",
"ru": "../l10n/ui-ru.json",
@@ -116,6 +121,8 @@
"vi": "../l10n/ui-vi.json",
"xh": "../l10n/ui-xh.json",
"zh-cn": "../l10n/ui-zh_CN.json",
+ "zh-CN": "../l10n/ui-zh_CN.json",
"zh-tw": "../l10n/ui-zh_TW.json",
+ "zh-TW": "../l10n/ui-zh_TW.json",
"zu": "../l10n/ui-zu.json"
}
diff --git a/loleaflet/l10n/help-localizations.json b/loleaflet/l10n/help-localizations.json
index c9ed79a86..14e908ae8 100644
--- a/loleaflet/l10n/help-localizations.json
+++ b/loleaflet/l10n/help-localizations.json
@@ -11,6 +11,7 @@
"be": "l10n/help-be.json",
"bg": "l10n/help-bg.json",
"bn-in": "l10n/help-bn_IN.json",
+ "bn-IN": "l10n/help-bn_IN.json",
"bn": "l10n/help-bn.json",
"bo": "l10n/help-bo.json",
"br": "l10n/help-br.json",
@@ -26,7 +27,9 @@
"dz": "l10n/help-dz.json",
"el": "l10n/help-el.json",
"en-gb": "l10n/help-en_GB.json",
+ "en-GB": "l10n/help-en_GB.json",
"en-za": "l10n/help-en_ZA.json",
+ "en-ZA": "l10n/help-en_ZA.json",
"eo": "l10n/help-eo.json",
"es": "l10n/help-es.json",
"et": "l10n/help-et.json",
@@ -79,8 +82,10 @@
"om": "l10n/help-om.json",
"or": "l10n/help-or.json",
"pa-in": "l10n/help-pa_IN.json",
+ "pa-IN": "l10n/help-pa_IN.json",
"pl": "l10n/help-pl.json",
"pt-br": "l10n/help-pt_BR.json",
+ "pt-BR": "l10n/help-pt_BR.json",
"pt": "l10n/help-pt.json",
"ro": "l10n/help-ro.json",
"ru": "l10n/help-ru.json",
@@ -117,6 +122,8 @@
"vi": "l10n/help-vi.json",
"xh": "l10n/help-xh.json",
"zh-cn": "l10n/help-zh_CN.json",
+ "zh-CN": "l10n/help-zh_CN.json",
"zh-tw": "l10n/help-zh_TW.json",
+ "zh-TW": "l10n/help-zh_TW.json",
"zu": "l10n/help-zu.json"
}
diff --git a/loleaflet/l10n/localizations.json b/loleaflet/l10n/localizations.json
index 1ad80c0db..d862ccc8e 100644
--- a/loleaflet/l10n/localizations.json
+++ b/loleaflet/l10n/localizations.json
@@ -11,6 +11,7 @@
"be": "l10n/ui-be.json",
"bg": "l10n/ui-bg.json",
"bn-in": "l10n/ui-bn_IN.json",
+ "bn-IN": "l10n/ui-bn_IN.json",
"bn": "l10n/ui-bn.json",
"bo": "l10n/ui-bo.json",
"br": "l10n/ui-br.json",
@@ -26,7 +27,9 @@
"dz": "l10n/ui-dz.json",
"el": "l10n/ui-el.json",
"en-gb": "l10n/ui-en_GB.json",
+ "en-GB": "l10n/ui-en_GB.json",
"en-za": "l10n/ui-en_ZA.json",
+ "en-ZA": "l10n/ui-en_ZA.json",
"eo": "l10n/ui-eo.json",
"es": "l10n/ui-es.json",
"et": "l10n/ui-et.json",
@@ -79,8 +82,10 @@
"om": "l10n/ui-om.json",
"or": "l10n/ui-or.json",
"pa-in": "l10n/ui-pa_IN.json",
+ "pa-IN": "l10n/ui-pa_IN.json",
"pl": "l10n/ui-pl.json",
"pt-br": "l10n/ui-pt_BR.json",
+ "pt-BR": "l10n/ui-pt_BR.json",
"pt": "l10n/ui-pt.json",
"ro": "l10n/ui-ro.json",
"ru": "l10n/ui-ru.json",
@@ -117,6 +122,8 @@
"vi": "l10n/ui-vi.json",
"xh": "l10n/ui-xh.json",
"zh-cn": "l10n/ui-zh_CN.json",
+ "zh-CN": "l10n/ui-zh_CN.json",
"zh-tw": "l10n/ui-zh_TW.json",
+ "zh-TW": "l10n/ui-zh_TW.json",
"zu": "l10n/ui-zu.json"
}
diff --git a/loleaflet/l10n/locore-localizations.json b/loleaflet/l10n/locore-localizations.json
index 41605fe29..d6089ebe9 100644
--- a/loleaflet/l10n/locore-localizations.json
+++ b/loleaflet/l10n/locore-localizations.json
@@ -11,6 +11,7 @@
"be": "l10n/locore/be.json",
"bg": "l10n/locore/bg.json",
"bn-in": "l10n/locore/bn-IN.json",
+ "bn-IN": "l10n/locore/bn-IN.json",
"bn": "l10n/locore/bn.json",
"bo": "l10n/locore/bo.json",
"br": "l10n/locore/br.json",
@@ -27,7 +28,9 @@
"dz": "l10n/locore/dz.json",
"el": "l10n/locore/el.json",
"en-gb": "l10n/locore/en-GB.json",
+ "en-GB": "l10n/locore/en-GB.json",
"en-za": "l10n/locore/en-ZA.json",
+ "en-ZA": "l10n/locore/en-ZA.json",
"eo": "l10n/locore/eo.json",
"es": "l10n/locore/es.json",
"et": "l10n/locore/et.json",
@@ -83,8 +86,10 @@
"om": "l10n/locore/om.json",
"or": "l10n/locore/or.json",
"pa-in": "l10n/locore/pa-IN.json",
+ "pa-IN": "l10n/locore/pa-IN.json",
"pl": "l10n/locore/pl.json",
"pt-br": "l10n/locore/pt-BR.json",
+ "pt-BR": "l10n/locore/pt-BR.json",
"pt": "l10n/locore/pt.json",
"ro": "l10n/locore/ro.json",
"ru": "l10n/locore/ru.json",
@@ -122,6 +127,8 @@
"vi": "l10n/locore/vi.json",
"xh": "l10n/locore/xh.json",
"zh-cn": "l10n/locore/zh-CN.json",
+ "zh-CN": "l10n/locore/zh-CN.json",
"zh-tw": "l10n/locore/zh-TW.json",
+ "zh-TW": "l10n/locore/zh-TW.json",
"zu": "l10n/locore/zu.json"
}
diff --git a/loleaflet/l10n/uno-localizations.json b/loleaflet/l10n/uno-localizations.json
index 5bf1d99f1..46cb148a8 100644
--- a/loleaflet/l10n/uno-localizations.json
+++ b/loleaflet/l10n/uno-localizations.json
@@ -11,6 +11,7 @@
"be": "l10n/uno/be.json",
"bg": "l10n/uno/bg.json",
"bn-in": "l10n/uno/bn-IN.json",
+ "bn-IN": "l10n/uno/bn-IN.json",
"bn": "l10n/uno/bn.json",
"bo": "l10n/uno/bo.json",
"br": "l10n/uno/br.json",
@@ -27,7 +28,9 @@
"dz": "l10n/uno/dz.json",
"el": "l10n/uno/el.json",
"en-gb": "l10n/uno/en-GB.json",
+ "en-GB": "l10n/uno/en-GB.json",
"en-za": "l10n/uno/en-ZA.json",
+ "en-ZA": "l10n/uno/en-ZA.json",
"eo": "l10n/uno/eo.json",
"es": "l10n/uno/es.json",
"et": "l10n/uno/et.json",
@@ -83,8 +86,10 @@
"om": "l10n/uno/om.json",
"or": "l10n/uno/or.json",
"pa-in": "l10n/uno/pa-IN.json",
+ "pa-IN": "l10n/uno/pa-IN.json",
"pl": "l10n/uno/pl.json",
"pt-br": "l10n/uno/pt-BR.json",
+ "pt-BR": "l10n/uno/pt-BR.json",
"pt": "l10n/uno/pt.json",
"ro": "l10n/uno/ro.json",
"ru": "l10n/uno/ru.json",
@@ -123,6 +128,8 @@
"vi": "l10n/uno/vi.json",
"xh": "l10n/uno/xh.json",
"zh-cn": "l10n/uno/zh-CN.json",
+ "zh-CN": "l10n/uno/zh-CN.json",
"zh-tw": "l10n/uno/zh-TW.json",
+ "zh-TW": "l10n/uno/zh-TW.json",
"zu": "l10n/uno/zu.json"
}