Use "nn" for Nynorsk, as nn.po files are appearing now. If the sublanguage

2001-02-04  Tor Lillqvist  <tml@iki.fi>

	* gwin32.c (g_win32_getlocale): Use "nn" for Nynorsk, as nn.po
	files are appearing now. If the sublanguage starts with '@', don't
	use a '_' separator. South Africa is 'ZA', not 'SA'.

diff --git a/ChangeLog b/ChangeLog
index 4dd323f..43d3089 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-02-04  Tor Lillqvist  <tml@iki.fi>
+
+       * gwin32.c (g_win32_getlocale): Use "nn" for Nynorsk, as nn.po
+       files are appearing now. If the sublanguage starts with '@', don't
+       use a '_' separator. South Africa is 'ZA', not 'SA'.
+
 Sun Feb  4 07:38:32 2001  Tim Janik  <timj@gtk.org>
 
        * docs/debugging.txt: s/glib_trap_/g_trap_/. add comments on

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 4dd323f..43d3089 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+2001-02-04  Tor Lillqvist  <tml@iki.fi>
+
+       * gwin32.c (g_win32_getlocale): Use "nn" for Nynorsk, as nn.po
+       files are appearing now. If the sublanguage starts with '@', don't
+       use a '_' separator. South Africa is 'ZA', not 'SA'.
+
 Sun Feb  4 07:38:32 2001  Tim Janik  <timj@gtk.org>
 
        * docs/debugging.txt: s/glib_trap_/g_trap_/. add comments on

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 4dd323f..43d3089 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2001-02-04  Tor Lillqvist  <tml@iki.fi>
+
+       * gwin32.c (g_win32_getlocale): Use "nn" for Nynorsk, as nn.po
+       files are appearing now. If the sublanguage starts with '@', don't
+       use a '_' separator. South Africa is 'ZA', not 'SA'.
+
 Sun Feb  4 07:38:32 2001  Tim Janik  <timj@gtk.org>
 
        * docs/debugging.txt: s/glib_trap_/g_trap_/. add comments on

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 4dd323f..43d3089 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,9 @@
+2001-02-04  Tor Lillqvist  <tml@iki.fi>
+
+       * gwin32.c (g_win32_getlocale): Use "nn" for Nynorsk, as nn.po
+       files are appearing now. If the sublanguage starts with '@', don't
+       use a '_' separator. South Africa is 'ZA', not 'SA'.
+
 Sun Feb  4 07:38:32 2001  Tim Janik  <timj@gtk.org>
 
        * docs/debugging.txt: s/glib_trap_/g_trap_/. add comments on

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 4dd323f..43d3089 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+2001-02-04  Tor Lillqvist  <tml@iki.fi>
+
+       * gwin32.c (g_win32_getlocale): Use "nn" for Nynorsk, as nn.po
+       files are appearing now. If the sublanguage starts with '@', don't
+       use a '_' separator. South Africa is 'ZA', not 'SA'.
+
 Sun Feb  4 07:38:32 2001  Tim Janik  <timj@gtk.org>
 
        * docs/debugging.txt: s/glib_trap_/g_trap_/. add comments on

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 4dd323f..43d3089 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+2001-02-04  Tor Lillqvist  <tml@iki.fi>
+
+       * gwin32.c (g_win32_getlocale): Use "nn" for Nynorsk, as nn.po
+       files are appearing now. If the sublanguage starts with '@', don't
+       use a '_' separator. South Africa is 'ZA', not 'SA'.
+
 Sun Feb  4 07:38:32 2001  Tim Janik  <timj@gtk.org>
 
        * docs/debugging.txt: s/glib_trap_/g_trap_/. add comments on

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 4dd323f..43d3089 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+2001-02-04  Tor Lillqvist  <tml@iki.fi>
+
+       * gwin32.c (g_win32_getlocale): Use "nn" for Nynorsk, as nn.po
+       files are appearing now. If the sublanguage starts with '@', don't
+       use a '_' separator. South Africa is 'ZA', not 'SA'.
+
 Sun Feb  4 07:38:32 2001  Tim Janik  <timj@gtk.org>
 
        * docs/debugging.txt: s/glib_trap_/g_trap_/. add comments on

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 4dd323f..43d3089 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+2001-02-04  Tor Lillqvist  <tml@iki.fi>
+
+       * gwin32.c (g_win32_getlocale): Use "nn" for Nynorsk, as nn.po
+       files are appearing now. If the sublanguage starts with '@', don't
+       use a '_' separator. South Africa is 'ZA', not 'SA'.
+
 Sun Feb  4 07:38:32 2001  Tim Janik  <timj@gtk.org>
 
        * docs/debugging.txt: s/glib_trap_/g_trap_/. add comments on

diff --git a/glib/gwin32.c b/glib/gwin32.c
index a3577e3..2a832cd 100644 (file)
--- a/glib/gwin32.c
+++ b/glib/gwin32.c
@@ -636,7 +636,7 @@ g_win32_getlocale (void)
        case SUBLANG_ENGLISH_CAN: sl = "CA"; break;
        case SUBLANG_ENGLISH_NZ: sl = "NZ"; break;
        case SUBLANG_ENGLISH_EIRE: sl = "IE"; break;
-       case SUBLANG_ENGLISH_SOUTH_AFRICA: sl = "SA"; break;
+       case SUBLANG_ENGLISH_SOUTH_AFRICA: sl = "ZA"; break;
        case SUBLANG_ENGLISH_JAMAICA: sl = "JM"; break;
        case SUBLANG_ENGLISH_CARIBBEAN: sl = "@caribbean"; break; /* ??? */
        case SUBLANG_ENGLISH_BELIZE: sl = "BZ"; break;
@@ -722,7 +722,7 @@ g_win32_getlocale (void)
       switch (sub)
        {
        /* SUBLANG_NORWEGIAN_BOKMAL == SUBLANG_DEFAULT */
-       case SUBLANG_NORWEGIAN_NYNORSK: sl = "@nynorsk"; break;
+       case SUBLANG_NORWEGIAN_NYNORSK: l = "nn"; break;
        }
       break;
     case LANG_ORIYA: l = "or"; break;
@@ -802,7 +802,8 @@ g_win32_getlocale (void)
   strcpy (bfr, l);
   if (sl != NULL)
     {
-      strcat (bfr, "_");
+      if (sl[0] != '@')
+       strcat (bfr, "_");
       strcat (bfr, sl);
     }
 

diff --git a/gwin32.c b/gwin32.c
index a3577e3..2a832cd 100644 (file)
--- a/gwin32.c
+++ b/gwin32.c
@@ -636,7 +636,7 @@ g_win32_getlocale (void)
        case SUBLANG_ENGLISH_CAN: sl = "CA"; break;
        case SUBLANG_ENGLISH_NZ: sl = "NZ"; break;
        case SUBLANG_ENGLISH_EIRE: sl = "IE"; break;
-       case SUBLANG_ENGLISH_SOUTH_AFRICA: sl = "SA"; break;
+       case SUBLANG_ENGLISH_SOUTH_AFRICA: sl = "ZA"; break;
        case SUBLANG_ENGLISH_JAMAICA: sl = "JM"; break;
        case SUBLANG_ENGLISH_CARIBBEAN: sl = "@caribbean"; break; /* ??? */
        case SUBLANG_ENGLISH_BELIZE: sl = "BZ"; break;
@@ -722,7 +722,7 @@ g_win32_getlocale (void)
       switch (sub)
        {
        /* SUBLANG_NORWEGIAN_BOKMAL == SUBLANG_DEFAULT */
-       case SUBLANG_NORWEGIAN_NYNORSK: sl = "@nynorsk"; break;
+       case SUBLANG_NORWEGIAN_NYNORSK: l = "nn"; break;
        }
       break;
     case LANG_ORIYA: l = "or"; break;
@@ -802,7 +802,8 @@ g_win32_getlocale (void)
   strcpy (bfr, l);
   if (sl != NULL)
     {
-      strcat (bfr, "_");
+      if (sl[0] != '@')
+       strcat (bfr, "_");
       strcat (bfr, sl);
     }