mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove entries from locales.json incompatible with punic 

As reported at https://github.com/nextcloud/server/issues/20999 the list contains en_US_POSIX as locale but punic is unable to parse such a locale. If you select that locale everyone is confused.

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
This commit is contained in:
Daniel Kesselberg 2020-05-16 23:21:22 +02:00 committed by backportbot[bot]
parent 231eaf6ffd
commit b0cfa3ed22
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
resources/locales.json
View File

@ -911,10 +911,6 @@
"code": "en_US", "code": "en_US",
"name": "English (United States)" "name": "English (United States)"
}, },
{
"code": "en_US_POSIX",
"name": "English (United States, Computer)"
},
{ {
"code": "en_VC", "code": "en_VC",
"name": "English (St. Vincent & Grenadines)" "name": "English (St. Vincent & Grenadines)"
@ -1399,6 +1395,10 @@
"code": "ga", "code": "ga",
"name": "Irish" "name": "Irish"
}, },
{
"code": "ga_GB",
"name": "Irish (United Kingdom)"
},
{ {
"code": "ga_IE", "code": "ga_IE",
"name": "Irish (Ireland)" "name": "Irish (Ireland)"

10
resources/update-locales.php
View File

@ -29,13 +29,21 @@ if (!extension_loaded('intl')) {
exit(1); exit(1);
} }
$locales = array_map(function (string $localeCode) { require '../3rdparty/autoload.php';
$locales = array_map(static function (string $localeCode) {
return [ return [
'code' => $localeCode, 'code' => $localeCode,
'name' => Locale::getDisplayName($localeCode, 'en') 'name' => Locale::getDisplayName($localeCode, 'en')
]; ];
}, ResourceBundle::getLocales('')); }, ResourceBundle::getLocales(''));
$locales = array_filter($locales, static function (array $locale) {
return is_array(Punic\Data::explodeLocale($locale['code']));
});
$locales = array_values($locales);
if (file_put_contents(__DIR__ . '/locales.json', json_encode($locales, JSON_PRETTY_PRINT)) === false) { if (file_put_contents(__DIR__ . '/locales.json', json_encode($locales, JSON_PRETTY_PRINT)) === false) {
echo 'Failed to update locales.json'; echo 'Failed to update locales.json';
exit(1); exit(1);