Fix some incorrect SUBLANG_* values that were taken from glib's gwin32.c.

diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog
index 5fdd4b1af365548d99b18a07ef517330363dd7ff..a8f6ebe0400820a03677af822d5e637bbda19270 100644 (file)
--- a/gettext-runtime/intl/ChangeLog
+++ b/gettext-runtime/intl/ChangeLog
@@ -1,3 +1,19 @@
+2006-12-21  Bruno Haible  <bruno@clisp.org>
+
+       * localename.c (SUBLANG_BENGALI_INDIA): Change value from 0 to 1.
+       (SUBLANG_BENGALI_BANGLADESH): Change value from 1 to 2.
+       (SUBLANG_PUNJABI_INDIA): Change value from 0 to 1.
+       (SUBLANG_PUNJABI_PAKISTAN): Change value from 1 to 2.
+       (SUBLANG_ROMANIAN_ROMANIA): Change value from 0 to 1.
+       (SUBLANG_ROMANIAN_MOLDOVA): Change value from 1 to 2.
+       (SUBLANG_SINDHI_INDIA): Remove macro.
+       (SUBLANG_SINDHI_AFGHANISTAN): New macro.
+       (SUBLANG_TAMAZIGHT_ALGERIA_LATIN): Renamed from
+       SUBLANG_TAMAZIGHT_LATIN.
+       (SUBLANG_TIGRINYA_ETHIOPIA): Change value from 0 to 1.
+       (SUBLANG_TIGRINYA_ERITREA): Change value from 1 to 2.
+       (_nl_locale_name_default): Update.
+
 2006-10-30  Bruno Haible  <bruno@clisp.org>
 
        * plural-exp.h [C++]: Define functions without name mangling.

diff --git a/gettext-runtime/intl/localename.c b/gettext-runtime/intl/localename.c
index e1b4615a057029de56590c5387834ba733ed626d..95133b0b1e459175553c59efbe24f92941cb525c 100644 (file)
--- a/gettext-runtime/intl/localename.c
+++ b/gettext-runtime/intl/localename.c
@@ -494,10 +494,10 @@
 # define SUBLANG_AZERI_CYRILLIC 0x02
 # endif
 # ifndef SUBLANG_BENGALI_INDIA
-# define SUBLANG_BENGALI_INDIA 0x00
+# define SUBLANG_BENGALI_INDIA 0x01
 # endif
 # ifndef SUBLANG_BENGALI_BANGLADESH
-# define SUBLANG_BENGALI_BANGLADESH 0x01
+# define SUBLANG_BENGALI_BANGLADESH 0x02
 # endif
 # ifndef SUBLANG_CHINESE_MACAU
 # define SUBLANG_CHINESE_MACAU 0x05
@@ -590,16 +590,16 @@
 # define SUBLANG_NEPALI_INDIA 0x02
 # endif
 # ifndef SUBLANG_PUNJABI_INDIA
-# define SUBLANG_PUNJABI_INDIA 0x00
+# define SUBLANG_PUNJABI_INDIA 0x01
 # endif
 # ifndef SUBLANG_PUNJABI_PAKISTAN
-# define SUBLANG_PUNJABI_PAKISTAN 0x01
+# define SUBLANG_PUNJABI_PAKISTAN 0x02
 # endif
 # ifndef SUBLANG_ROMANIAN_ROMANIA
-# define SUBLANG_ROMANIAN_ROMANIA 0x00
+# define SUBLANG_ROMANIAN_ROMANIA 0x01
 # endif
 # ifndef SUBLANG_ROMANIAN_MOLDOVA
-# define SUBLANG_ROMANIAN_MOLDOVA 0x01
+# define SUBLANG_ROMANIAN_MOLDOVA 0x02
 # endif
 # ifndef SUBLANG_SERBIAN_LATIN
 # define SUBLANG_SERBIAN_LATIN 0x02
@@ -607,12 +607,12 @@
 # ifndef SUBLANG_SERBIAN_CYRILLIC
 # define SUBLANG_SERBIAN_CYRILLIC 0x03
 # endif
-# ifndef SUBLANG_SINDHI_INDIA
-# define SUBLANG_SINDHI_INDIA 0x00
-# endif
 # ifndef SUBLANG_SINDHI_PAKISTAN
 # define SUBLANG_SINDHI_PAKISTAN 0x01
 # endif
+# ifndef SUBLANG_SINDHI_AFGHANISTAN
+# define SUBLANG_SINDHI_AFGHANISTAN 0x02
+# endif
 # ifndef SUBLANG_SPANISH_GUATEMALA
 # define SUBLANG_SPANISH_GUATEMALA 0x04
 # endif
@@ -670,14 +670,14 @@
 # ifndef SUBLANG_TAMAZIGHT_ARABIC
 # define SUBLANG_TAMAZIGHT_ARABIC 0x01
 # endif
-# ifndef SUBLANG_TAMAZIGHT_LATIN
-# define SUBLANG_TAMAZIGHT_LATIN 0x02
+# ifndef SUBLANG_TAMAZIGHT_ALGERIA_LATIN
+# define SUBLANG_TAMAZIGHT_ALGERIA_LATIN 0x02
 # endif
 # ifndef SUBLANG_TIGRINYA_ETHIOPIA
-# define SUBLANG_TIGRINYA_ETHIOPIA 0x00
+# define SUBLANG_TIGRINYA_ETHIOPIA 0x01
 # endif
 # ifndef SUBLANG_TIGRINYA_ERITREA
-# define SUBLANG_TIGRINYA_ERITREA 0x01
+# define SUBLANG_TIGRINYA_ERITREA 0x02
 # endif
 # ifndef SUBLANG_URDU_PAKISTAN
 # define SUBLANG_URDU_PAKISTAN 0x01
@@ -1378,8 +1378,8 @@ _nl_locale_name_default (void)
       case LANG_SINDHI:
        switch (sub)
          {
-         case SUBLANG_SINDHI_INDIA: return "sd_IN";
          case SUBLANG_SINDHI_PAKISTAN: return "sd_PK";
+         case SUBLANG_SINDHI_AFGHANISTAN: return "sd_AF";
          }
        return "sd";
       case LANG_SINHALESE: return "si_LK";
@@ -1432,7 +1432,7 @@ _nl_locale_name_default (void)
          {
          /* FIXME: Adjust this when Tamazight locales appear on Unix.  */
          case SUBLANG_TAMAZIGHT_ARABIC: return "ber_MA@arabic";
-         case SUBLANG_TAMAZIGHT_LATIN: return "ber_MA@latin";
+         case SUBLANG_TAMAZIGHT_ALGERIA_LATIN: return "ber_DZ@latin";
          }
        return "ber_MA";
       case LANG_TAMIL: