From 4682deeb62247d34de87f8e777f99e2d337fd377 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= <debian@jff.email>
Date: Sun, 20 Oct 2024 15:21:43 +0200
Subject: New upstream version 1.3

---
 lib/localename-unsafe.c | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

(limited to 'lib/localename-unsafe.c')

diff --git a/lib/localename-unsafe.c b/lib/localename-unsafe.c
index 845ee92c..0a2654d8 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:
-- 
cgit v1.2.3