From: Bruno Haible <bruno@clisp.org>
Date: Mon, 15 Mar 2004 11:51:00 +0000 (+0000)
Subject: Update Windows to locale name mapping.
X-Git-Tag: v0.14.2~277
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=083d69a066013bba5582d67b1a24a94c67c4daf7;p=thirdparty%2Fgettext.git

Update Windows to locale name mapping.
---

diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog
index 27564980e..b5a48df56 100644
--- a/gettext-runtime/intl/ChangeLog
+++ b/gettext-runtime/intl/ChangeLog
@@ -1,3 +1,8 @@
+2004-03-02  Bruno Haible  <bruno@clisp.org>
+
+	* localename.c (_nl_locale_name): Add info about default territory for
+	Basque, Mongolian, Russian, Tamil. Map Norwegian to nb, not no.
+
 2004-02-02  Bruno Haible  <bruno@clisp.org>
 
 	* Makefile.in (install-exec, installdirs, uninstall): Install
diff --git a/gettext-runtime/intl/localename.c b/gettext-runtime/intl/localename.c
index 5662e54ff..6a3b740f5 100644
--- a/gettext-runtime/intl/localename.c
+++ b/gettext-runtime/intl/localename.c
@@ -804,6 +804,10 @@ _nl_locale_name (int category, const char *categoryname)
 	}
       return "az";
     case LANG_BASQUE:
+      switch (sub)
+	{
+	case SUBLANG_DEFAULT: return "eu_ES";
+	}
       return "eu"; /* Ambiguous: could be "eu_ES" or "eu_FR".  */
     case LANG_BELARUSIAN: return "be_BY";
     case LANG_BENGALI:
@@ -986,6 +990,10 @@ _nl_locale_name (int category, const char *categoryname)
       return "mni_IN";
     case LANG_MARATHI: return "mr_IN";
     case LANG_MONGOLIAN:
+      switch (sub)
+	{
+	case SUBLANG_DEFAULT: return "mn_MN";
+	}
       return "mn"; /* Ambiguous: could be "mn_CN" or "mn_MN".  */
     case LANG_NEPALI:
       switch (sub)
@@ -997,7 +1005,7 @@ _nl_locale_name (int category, const char *categoryname)
     case LANG_NORWEGIAN:
       switch (sub)
 	{
-	case SUBLANG_NORWEGIAN_BOKMAL: return "no_NO";
+	case SUBLANG_NORWEGIAN_BOKMAL: return "nb_NO";
 	case SUBLANG_NORWEGIAN_NYNORSK: return "nn_NO";
 	}
       return "no";
@@ -1032,6 +1040,10 @@ _nl_locale_name (int category, const char *categoryname)
 	}
       return "ro";
     case LANG_RUSSIAN:
+      switch (sub)
+	{
+	case SUBLANG_DEFAULT: return "ru_RU";
+	}
       return "ru"; /* Ambiguous: could be "ru_RU" or "ru_UA" or "ru_MD".  */
     case LANG_SAAMI: /* actually Northern Sami */ return "se_NO";
     case LANG_SANSKRIT: return "sa_IN";
@@ -1096,6 +1108,10 @@ _nl_locale_name (int category, const char *categoryname)
 	}
       return "ber_MA";
     case LANG_TAMIL:
+	switch (sub)
+	{
+	case SUBLANG_DEFAULT: return "ta_IN";
+	}
       return "ta"; /* Ambiguous: could be "ta_IN" or "ta_LK" or "ta_SG".  */
     case LANG_TATAR: return "tt_RU";
     case LANG_TELUGU: return "te_IN";