luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-24 14:36:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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'.
This commit is contained in:
Tor Lillqvist 2001-02-04 19:35:04 +00:00 committed by Tor Lillqvist
parent 22357542e9
commit 58a757a2c5
10 changed files with 56 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -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> Sun Feb 4 07:38:32 2001 Tim Janik <timj@gtk.org>
* docs/debugging.txt: s/glib_trap_/g_trap_/. add comments on * docs/debugging.txt: s/glib_trap_/g_trap_/. add comments on

6
ChangeLog.pre-2-0
View File

@ -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> Sun Feb 4 07:38:32 2001 Tim Janik <timj@gtk.org>
* docs/debugging.txt: s/glib_trap_/g_trap_/. add comments on * docs/debugging.txt: s/glib_trap_/g_trap_/. add comments on

6
ChangeLog.pre-2-10
View File

@ -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> Sun Feb 4 07:38:32 2001 Tim Janik <timj@gtk.org>
* docs/debugging.txt: s/glib_trap_/g_trap_/. add comments on * docs/debugging.txt: s/glib_trap_/g_trap_/. add comments on

6
ChangeLog.pre-2-12
View File

@ -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> Sun Feb 4 07:38:32 2001 Tim Janik <timj@gtk.org>
* docs/debugging.txt: s/glib_trap_/g_trap_/. add comments on * docs/debugging.txt: s/glib_trap_/g_trap_/. add comments on

6
ChangeLog.pre-2-2
View File

@ -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> Sun Feb 4 07:38:32 2001 Tim Janik <timj@gtk.org>
* docs/debugging.txt: s/glib_trap_/g_trap_/. add comments on * docs/debugging.txt: s/glib_trap_/g_trap_/. add comments on

6
ChangeLog.pre-2-4
View File

@ -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> Sun Feb 4 07:38:32 2001 Tim Janik <timj@gtk.org>
* docs/debugging.txt: s/glib_trap_/g_trap_/. add comments on * docs/debugging.txt: s/glib_trap_/g_trap_/. add comments on

6
ChangeLog.pre-2-6
View File

@ -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> Sun Feb 4 07:38:32 2001 Tim Janik <timj@gtk.org>
* docs/debugging.txt: s/glib_trap_/g_trap_/. add comments on * docs/debugging.txt: s/glib_trap_/g_trap_/. add comments on

6
ChangeLog.pre-2-8
View File

@ -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> Sun Feb 4 07:38:32 2001 Tim Janik <timj@gtk.org>
* docs/debugging.txt: s/glib_trap_/g_trap_/. add comments on * docs/debugging.txt: s/glib_trap_/g_trap_/. add comments on

7
glib/gwin32.c
View File

@ -636,7 +636,7 @@ g_win32_getlocale (void)
case SUBLANG_ENGLISH_CAN: sl = "CA"; break; case SUBLANG_ENGLISH_CAN: sl = "CA"; break;
case SUBLANG_ENGLISH_NZ: sl = "NZ"; break; case SUBLANG_ENGLISH_NZ: sl = "NZ"; break;
case SUBLANG_ENGLISH_EIRE: sl = "IE"; 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_JAMAICA: sl = "JM"; break;
case SUBLANG_ENGLISH_CARIBBEAN: sl = "@caribbean"; break; /* ??? */ case SUBLANG_ENGLISH_CARIBBEAN: sl = "@caribbean"; break; /* ??? */
case SUBLANG_ENGLISH_BELIZE: sl = "BZ"; break; case SUBLANG_ENGLISH_BELIZE: sl = "BZ"; break;
@ -722,7 +722,7 @@ g_win32_getlocale (void)
switch (sub) switch (sub)
{ {
/* SUBLANG_NORWEGIAN_BOKMAL == SUBLANG_DEFAULT */ /* SUBLANG_NORWEGIAN_BOKMAL == SUBLANG_DEFAULT */
case SUBLANG_NORWEGIAN_NYNORSK: sl = "@nynorsk"; break; case SUBLANG_NORWEGIAN_NYNORSK: l = "nn"; break;
} }
break; break;
case LANG_ORIYA: l = "or"; break; case LANG_ORIYA: l = "or"; break;
@ -802,7 +802,8 @@ g_win32_getlocale (void)
strcpy (bfr, l); strcpy (bfr, l);
if (sl != NULL) if (sl != NULL)
{ {
strcat (bfr, "_"); if (sl[0] != '@')
strcat (bfr, "_");
strcat (bfr, sl); strcat (bfr, sl);
} }

7
gwin32.c
View File

@ -636,7 +636,7 @@ g_win32_getlocale (void)
case SUBLANG_ENGLISH_CAN: sl = "CA"; break; case SUBLANG_ENGLISH_CAN: sl = "CA"; break;
case SUBLANG_ENGLISH_NZ: sl = "NZ"; break; case SUBLANG_ENGLISH_NZ: sl = "NZ"; break;
case SUBLANG_ENGLISH_EIRE: sl = "IE"; 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_JAMAICA: sl = "JM"; break;
case SUBLANG_ENGLISH_CARIBBEAN: sl = "@caribbean"; break; /* ??? */ case SUBLANG_ENGLISH_CARIBBEAN: sl = "@caribbean"; break; /* ??? */
case SUBLANG_ENGLISH_BELIZE: sl = "BZ"; break; case SUBLANG_ENGLISH_BELIZE: sl = "BZ"; break;
@ -722,7 +722,7 @@ g_win32_getlocale (void)
switch (sub) switch (sub)
{ {
/* SUBLANG_NORWEGIAN_BOKMAL == SUBLANG_DEFAULT */ /* SUBLANG_NORWEGIAN_BOKMAL == SUBLANG_DEFAULT */
case SUBLANG_NORWEGIAN_NYNORSK: sl = "@nynorsk"; break; case SUBLANG_NORWEGIAN_NYNORSK: l = "nn"; break;
} }
break; break;
case LANG_ORIYA: l = "or"; break; case LANG_ORIYA: l = "or"; break;
@ -802,7 +802,8 @@ g_win32_getlocale (void)
strcpy (bfr, l); strcpy (bfr, l);
if (sl != NULL) if (sl != NULL)
{ {
strcat (bfr, "_"); if (sl[0] != '@')
strcat (bfr, "_");
strcat (bfr, sl); strcat (bfr, sl);
} }