Merge pull request #21003 from nextcloud/enh/noid/validate-locale

Remove entries from locales.json incompatible with punic

2 files changed, 13 insertions, 5 deletions

diff --git a/resources/locales.json b/resources/locales.json
index a65cf530514..7cf9fa9b890 100644
--- a/resources/locales.json
+++ b/resources/locales.json
@@ -912,10 +912,6 @@
         "name": "English (United States)"
     },
     {
-        "code": "en_US_POSIX",
-        "name": "English (United States, Computer)"
-    },
-    {
         "code": "en_VC",
         "name": "English (St. Vincent & Grenadines)"
     },
@@ -1400,6 +1396,10 @@
         "name": "Irish"
     },
     {
+        "code": "ga_GB",
+        "name": "Irish (United Kingdom)"
+    },
+    {
         "code": "ga_IE",
         "name": "Irish (Ireland)"
     },
diff --git a/resources/update-locales.php b/resources/update-locales.php
index d5addd0a9ae..50d848c76a6 100755
--- a/resources/update-locales.php
+++ b/resources/update-locales.php
@@ -29,13 +29,21 @@ if (!extension_loaded('intl')) {
 	exit(1);
 }
 
-$locales = array_map(function (string $localeCode) {
+require '../3rdparty/autoload.php';
+
+$locales = array_map(static function (string $localeCode) {
 	return [
 		'code' => $localeCode,
 		'name' => Locale::getDisplayName($localeCode, 'en')
 	];
 }, 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) {
 	echo 'Failed to update locales.json';
 	exit(1);