From: Bruno Haible Date: Wed, 2 Oct 2024 00:23:57 +0000 (+0200) Subject: localename-unsafe: Modernize locale name mapping. X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=035e164bb016481ffe5e9f6b8be189bcdc41b0dd;p=gnulib.git localename-unsafe: Modernize locale name mapping. * lib/localename-unsafe.c (gl_locale_name_from_win32_LANGID): Return "az" instead of "az@latin", "az_AZ" instead of "az_AZ@latin", "ber_MA" instead of "ber_MA@arabic", "ber_DZ" instead of "ber_DZ@latin". --- diff --git a/ChangeLog b/ChangeLog index f971059a0a..7d88adbb21 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2024-10-01 Bruno Haible + + localename-unsafe: Modernize locale name mapping. + * lib/localename-unsafe.c (gl_locale_name_from_win32_LANGID): Return + "az" instead of "az@latin", "az_AZ" instead of "az_AZ@latin", + "ber_MA" instead of "ber_MA@arabic", "ber_DZ" instead of "ber_DZ@latin". + 2024-09-30 Paul Eggert file-has-acl: improve performance on Linux symlinks diff --git a/lib/localename-unsafe.c b/lib/localename-unsafe.c index 845ee92c31..0a2654d8a3 100644 --- a/lib/localename-unsafe.c +++ b/lib/localename-unsafe.c @@ -1597,9 +1597,8 @@ gl_locale_name_from_win32_LANGID (LANGID langid) case LANG_AZERI: switch (sub) { - /* FIXME: Adjust this when Azerbaijani locales appear on Unix. */ - case 0x1e: return "az@latin"; - case SUBLANG_AZERI_LATIN: return "az_AZ@latin"; + case 0x1e: return "az"; + case SUBLANG_AZERI_LATIN: return "az_AZ"; case 0x1d: return "az@cyrillic"; case SUBLANG_AZERI_CYRILLIC: return "az_AZ@cyrillic"; } @@ -2011,7 +2010,6 @@ gl_locale_name_from_win32_LANGID (LANGID langid) } return "rw"; case LANG_KONKANI: - /* FIXME: Adjust this when such locales appear on Unix. */ switch (sub) { case SUBLANG_KONKANI_INDIA: return "kok_IN"; @@ -2085,7 +2083,6 @@ gl_locale_name_from_win32_LANGID (LANGID langid) } return "mt"; case LANG_MANIPURI: - /* FIXME: Adjust this when such locales appear on Unix. */ switch (sub) { case SUBLANG_DEFAULT: return "mni_IN"; @@ -2288,7 +2285,6 @@ gl_locale_name_from_win32_LANGID (LANGID langid) } return "so"; case LANG_SORBIAN: - /* FIXME: Adjust this when such locales appear on Unix. */ switch (sub) { /* Upper Sorbian */ @@ -2379,10 +2375,9 @@ gl_locale_name_from_win32_LANGID (LANGID langid) /* Note: Microsoft uses the non-ISO language code "tmz". */ switch (sub) { - /* FIXME: Adjust this when Tamazight locales appear on Unix. */ - case SUBLANG_TAMAZIGHT_ARABIC: return "ber_MA@arabic"; + case SUBLANG_TAMAZIGHT_ARABIC: return "ber_MA"; case 0x1f: return "ber@latin"; - case SUBLANG_TAMAZIGHT_ALGERIA_LATIN: return "ber_DZ@latin"; + case SUBLANG_TAMAZIGHT_ALGERIA_LATIN: return "ber_DZ"; } return "ber"; case LANG_TAMIL: