Microsoft changed the value of SUBLANG_SINDHI_PAKISTAN, arghhh.

diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog
index e79f02ee983ec55209e0dadb21aaaca91006ef0a..1688c4337c9abef48b3ffe35069caa29f34a0bfe 100644 (file)
--- a/gettext-runtime/intl/ChangeLog
+++ b/gettext-runtime/intl/ChangeLog
@@ -1,3 +1,10 @@
+2008-04-16  Bruno Haible  <bruno@clisp.org>
+
+       * localename.c (SUBLANG_SINDHI_INDIA): New macro.
+       (SUBLANG_SINDHI_PAKISTAN): Change value from 1 to 2.
+       (gl_locale_name_from_win32_LANGID): Fix code for Sindhi.
+       Reported by Daniel Bergström <daniel@octocode.com>.
+
 2007-12-25  KJK::Hyperion  <hackbunny@reactos.com>
             Bruno Haible  <bruno@clisp.org>
 

diff --git a/gettext-runtime/intl/localename.c b/gettext-runtime/intl/localename.c
index 8e213461c075943e87487094d70412f41b0283fe..78910de21fe049acc0def03e3e054a06b77423ce 100644 (file)
--- a/gettext-runtime/intl/localename.c
+++ b/gettext-runtime/intl/localename.c
@@ -1,5 +1,5 @@
 /* Determine name of the currently selected locale.
-   Copyright (C) 1995-1999, 2000-2007 Free Software Foundation, Inc.
+   Copyright (C) 1995-1999, 2000-2008 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify it
    under the terms of the GNU Library General Public License as published
@@ -612,9 +612,11 @@
 # ifndef SUBLANG_SERBIAN_CYRILLIC
 # define SUBLANG_SERBIAN_CYRILLIC 0x03
 # endif
-# ifndef SUBLANG_SINDHI_PAKISTAN
-# define SUBLANG_SINDHI_PAKISTAN 0x01
+# ifndef SUBLANG_SINDHI_INDIA
+# define SUBLANG_SINDHI_INDIA 0x01
 # endif
+# undef SUBLANG_SINDHI_PAKISTAN
+# define SUBLANG_SINDHI_PAKISTAN 0x02
 # ifndef SUBLANG_SINDHI_AFGHANISTAN
 # define SUBLANG_SINDHI_AFGHANISTAN 0x02
 # endif
@@ -1338,8 +1340,9 @@ gl_locale_name_from_win32_LANGID (LANGID langid)
       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";
+         /*case SUBLANG_SINDHI_AFGHANISTAN: return "sd_AF";*/
          }
        return "sd";
       case LANG_SINHALESE: return "si_LK";