qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[BZ #73] 

2007-10-07  Ulrich Drepper  <drepper@redhat.com>
	[BZ #73]
	* locales/nb_NO: Update time information, collation, thousands
	separator.
	* locales/nn_NO: Likewise.
This commit is contained in:
Ulrich Drepper 2007-10-07 22:09:38 +00:00
parent 659a9013d4
commit 64ba41bcc6
4 changed files with 87 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
localedata/ChangeLog
View File

@ -1,3 +1,10 @@
2007-10-07 Ulrich Drepper <drepper@redhat.com>
[BZ #73]
* locales/nb_NO: Update time information, collation, thousands
separator.
* locales/nn_NO: Likewise.
2007-10-04 Ulrich Drepper <drepper@redhat.com> 2007-10-04 Ulrich Drepper <drepper@redhat.com>
* locales/en_NG: New file. * locales/en_NG: New file.

80
localedata/locales/nb_NO
View File

@ -15,15 +15,13 @@ comment_char %
% Date: 1996-10-15 % Date: 1996-10-15
% Application: general % Application: general
% Users: general % Users: general
% Repertoiremap: mnemonic.ds
% Charset: ISO-8859-1
% Distribution and use is free, also % Distribution and use is free, also
% for commercial purposes. % for commercial purposes.
LC_IDENTIFICATION LC_IDENTIFICATION
title "Norwegian (Bokmal) locale for Norway" title "Norwegian (Bokmal) locale for Norway"
source "Norsk Standardiseringsforbund" source "Norsk Standardiseringsforbund"
address "University Library,, Drammensveien 41, N-9242 Oslo, Norge" address "University Library, Drammensveien 41, N-9242 Oslo, Norge"
contact "" contact ""
email "bug-glibc-locales@gnu.org" email "bug-glibc-locales@gnu.org"
tel "" tel ""
@ -66,6 +64,9 @@ reorder-after <RES-1>
<CAP-MIN> <CAP-MIN>
<MIN-CAP> <MIN-CAP>
reorder-after <OBL>
<ETH>
reorder-after <z> reorder-after <z>
<ae> <ae>
<o-stroke> <o-stroke>
@ -73,31 +74,33 @@ reorder-after <z>
reorder-after <U0178> reorder-after <U0178>
<U00DC> <y>;<U00DC>;<CAP>;IGNORE <U00DC> <y>;<U00DC>;<CAP>;IGNORE
<U00FC> <y>;<U00DC>;<MIN>;IGNORE
<U0170> <y>;<U0170>;<CAP>;IGNORE <U0170> <y>;<U0170>;<CAP>;IGNORE
reorder-after <U00FF>
<U00FC> <y>;<U00DC>;<MIN>;IGNORE
<U0171> <y>;<U0170>;<MIN>;IGNORE <U0171> <y>;<U0170>;<MIN>;IGNORE
reorder-after <U017B> reorder-after <U017B>
<U00C6> <ae>;<BAS>;<CAP>;IGNORE <U00C6> <ae>;<BAS>;<CAP>;IGNORE
<U00E6> <ae>;<BAS>;<MIN>;IGNORE
<U01FC> <ae>;<ACA>;<CAP>;IGNORE <U01FC> <ae>;<ACA>;<CAP>;IGNORE
<U01FD> <ae>;<ACA>;<MIN>;IGNORE
<U01E2> <ae>;<MAC>;<CAP>;IGNORE <U01E2> <ae>;<MAC>;<CAP>;IGNORE
<U01E3> <ae>;<MAC>;<MIN>;IGNORE
<U00C4> <ae>;<PCL>;<CAP>;IGNORE <U00C4> <ae>;<PCL>;<CAP>;IGNORE
<U00E4> <ae>;<PCL>;<MIN>;IGNORE
<U00D8> <o-stroke>;<BAS>;<CAP>;IGNORE <U00D8> <o-stroke>;<BAS>;<CAP>;IGNORE
<U00F8> <o-stroke>;<BAS>;<MIN>;IGNORE
<U01FE> <o-stroke>;<ACA>;<CAP>;IGNORE <U01FE> <o-stroke>;<ACA>;<CAP>;IGNORE
<U01FF> <o-stroke>;<ACA>;<MIN>;IGNORE
<U00D6> <o-stroke>;<REU>;<CAP>;IGNORE <U00D6> <o-stroke>;<REU>;<CAP>;IGNORE
<U00F6> <o-stroke>;<REU>;<MIN>;IGNORE
<U0150> <o-stroke>;<DAC>;<CAP>;IGNORE <U0150> <o-stroke>;<DAC>;<CAP>;IGNORE
<U0151> <o-stroke>;<DAC>;<MIN>;IGNORE
<U00C5> <a-ring>;<BAS>;<CAP>;IGNORE <U00C5> <a-ring>;<BAS>;<CAP>;IGNORE
<U00E5> <a-ring>;<BAS>;<MIN>;IGNORE
<A-A> <a-ring>;<A-A>;<CAP>;IGNORE <A-A> <a-ring>;<A-A>;<CAP>;IGNORE
<A-a> <a-ring>;<A-A>;<CAP-MIN>;IGNORE <A-a> <a-ring>;<A-A>;<CAP-MIN>;IGNORE
reorder-after <U017C>
<U00E6> <ae>;<BAS>;<MIN>;IGNORE
<U01FD> <ae>;<ACA>;<MIN>;IGNORE
<U01E3> <ae>;<MAC>;<MIN>;IGNORE
<U00E4> <ae>;<PCL>;<MIN>;IGNORE
<U00F8> <o-stroke>;<BAS>;<MIN>;IGNORE
<U01FF> <o-stroke>;<ACA>;<MIN>;IGNORE
<U00F6> <o-stroke>;<REU>;<MIN>;IGNORE
<U0151> <o-stroke>;<DAC>;<MIN>;IGNORE
<U00E5> <a-ring>;<BAS>;<MIN>;IGNORE
<a-A> <a-ring>;<A-A>;<MIN-CAP>;IGNORE <a-A> <a-ring>;<A-A>;<MIN-CAP>;IGNORE
<a-a> <a-ring>;<A-A>;<MIN>;IGNORE <a-a> <a-ring>;<A-A>;<MIN>;IGNORE
@ -105,15 +108,14 @@ reorder-after <U017B>
% removed from latest iso14651 tables. % removed from latest iso14651 tables.
reorder-after <U0162> reorder-after <U0162>
<U00DE> "<t><h>";"<LIG><LIG>";"<CAP><CAP>";IGNORE <U00DE> "<t><h>";"<LIG><LIG>";"<CAP><CAP>";IGNORE
reorder-after <U0163>
<U00FE> "<t><h>";"<LIG><LIG>";"<MIN><MIN>";IGNORE <U00FE> "<t><h>";"<LIG><LIG>";"<MIN><MIN>";IGNORE
reorder-after <OBL>
<ETH>
reorder-after <U0064> reorder-after <U0064>
<U0110> <d>;<OBL>;<CAP>;IGNORE <U0110> <d>;<OBL>;<CAP>;IGNORE
<U0111> <d>;<OBL>;<MIN>;IGNORE
<U00D0> <d>;<ETH>;<CAP>;IGNORE <U00D0> <d>;<ETH>;<CAP>;IGNORE
reorder-after <U0044>
<U0111> <d>;<OBL>;<MIN>;IGNORE
<U00F0> <d>;<ETH>;<MIN>;IGNORE <U00F0> <d>;<ETH>;<MIN>;IGNORE
reorder-end reorder-end
@ -132,7 +134,7 @@ LC_MONETARY
int_curr_symbol "<U004E><U004F><U004B><U0020>" int_curr_symbol "<U004E><U004F><U004B><U0020>"
currency_symbol "<U006B><U0072>" currency_symbol "<U006B><U0072>"
mon_decimal_point "<U002C>" mon_decimal_point "<U002C>"
mon_thousands_sep "<U002E>" mon_thousands_sep "<U00A0>"
mon_grouping 3;3 mon_grouping 3;3
positive_sign "" positive_sign ""
negative_sign "<U002D>" negative_sign "<U002D>"
@ -148,15 +150,15 @@ END LC_MONETARY
LC_NUMERIC LC_NUMERIC
decimal_point "<U002C>" decimal_point "<U002C>"
thousands_sep "<U002E>" thousands_sep "<U00A0>"
grouping 3;3 grouping 3;3
END LC_NUMERIC END LC_NUMERIC
LC_TIME LC_TIME
abday "<U0073><U00F8><U006E>";"<U006D><U0061><U006E>";/ abday "<U0073><U00F8><U002E>";"<U006D><U0061><U002E>";/
"<U0074><U0069><U0072>";"<U006F><U006E><U0073>";/ "<U0074><U0069><U002E>";"<U006F><U006E><U002E>";/
"<U0074><U006F><U0072>";"<U0066><U0072><U0065>";/ "<U0074><U006F><U002E>";"<U0066><U0072><U002E>";/
"<U006C><U00F8><U0072>" "<U006C><U00F8><U002E>"
day "<U0073><U00F8><U006E><U0064><U0061><U0067>";/ day "<U0073><U00F8><U006E><U0064><U0061><U0067>";/
"<U006D><U0061><U006E><U0064><U0061><U0067>";/ "<U006D><U0061><U006E><U0064><U0061><U0067>";/
"<U0074><U0069><U0072><U0073><U0064><U0061><U0067>";/ "<U0074><U0069><U0072><U0073><U0064><U0061><U0067>";/
@ -164,12 +166,12 @@ day "<U0073><U00F8><U006E><U0064><U0061><U0067>";/
"<U0074><U006F><U0072><U0073><U0064><U0061><U0067>";/ "<U0074><U006F><U0072><U0073><U0064><U0061><U0067>";/
"<U0066><U0072><U0065><U0064><U0061><U0067>";/ "<U0066><U0072><U0065><U0064><U0061><U0067>";/
"<U006C><U00F8><U0072><U0064><U0061><U0067>" "<U006C><U00F8><U0072><U0064><U0061><U0067>"
abmon "<U006A><U0061><U006E>";"<U0066><U0065><U0062>";/ abmon "<U006A><U0061><U006E><U002E>";"<U0066><U0065><U0062><U002E>";/
"<U006D><U0061><U0072>";"<U0061><U0070><U0072>";/ "<U006D><U0061><U0072><U0073>";"<U0061><U0070><U0072><U0069><U006C>";/
"<U006D><U0061><U0069>";"<U006A><U0075><U006E>";/ "<U006D><U0061><U0069>";"<U006A><U0075><U006E><U0069>";/
"<U006A><U0075><U006C>";"<U0061><U0075><U0067>";/ "<U006A><U0075><U006C><U0069>";"<U0061><U0075><U0067><U002E>";/
"<U0073><U0065><U0070>";"<U006F><U006B><U0074>";/ "<U0073><U0065><U0070><U002E>";"<U006F><U006B><U0074><U002E>";/
"<U006E><U006F><U0076>";"<U0064><U0065><U0073>" "<U006E><U006F><U0076><U002E>";"<U0064><U0065><U0073><U002E>"
mon "<U006A><U0061><U006E><U0075><U0061><U0072>";/ mon "<U006A><U0061><U006E><U0075><U0061><U0072>";/
"<U0066><U0065><U0062><U0072><U0075><U0061><U0072>";/ "<U0066><U0065><U0062><U0072><U0075><U0061><U0072>";/
"<U006D><U0061><U0072><U0073>";/ "<U006D><U0061><U0072><U0073>";/
@ -183,14 +185,22 @@ mon "<U006A><U0061><U006E><U0075><U0061><U0072>";/
"<U006E><U006F><U0076><U0065><U006D><U0062><U0065><U0072>";/ "<U006E><U006F><U0076><U0065><U006D><U0062><U0065><U0072>";/
"<U0064><U0065><U0073><U0065><U006D><U0062><U0065><U0072>" "<U0064><U0065><U0073><U0065><U006D><U0062><U0065><U0072>"
% usual date representation % usual date representation
d_t_fmt "<U0025><U0061><U0020><U0025><U0064><U002D><U0025><U006D><U002D><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>" % %a %d. %b %Y kl. %H.%M %z
d_fmt "<U0025><U0064><U002D><U0025><U006D><U002D><U0025><U0059>" d_t_fmt "<U0025><U0061><U0020><U0025><U0064><U002E><U0020><U0025><U0062>/
t_fmt "<U0025><U0054>" <U0020><U0025><U0059><U0020><U006B><U006C><U002E><U0020><U0025><U0048>/
<U002E><U0025><U004D><U0020><U0025><U007A>"
% %d. %b %Y
d_fmt "<U0025><U0064><U002E><U0020><U0025><U0062><U0020><U0025><U0059>"
% kl. %H.%M %z
t_fmt "<U006B><U006C><U002E><U0020><U0025><U0048><U002E><U0025>/
<U004D><U0020><U0025><U007A>"
am_pm "";"" am_pm "";""
t_fmt_ampm "" t_fmt_ampm ""
date_fmt "<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/ % %a %d. %b %H:%M:%S %z %Y
<U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/ date_fmt "<U0025><U0061><U0020><U0025><U0064><U002E><U0020><U0025>/
<U0025><U005A><U0020><U0025><U0059>" <U0062><U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053>/
<U0020><U0025><U007A><U0020><U0025><U0059>"
week 7;19971201;4 week 7;19971201;4
first_weekday 1 first_weekday 1
first_workday 1 first_workday 1

74
localedata/locales/nn_NO
View File

@ -75,27 +75,27 @@ LC_TIME
% for IBM Class for Unicode/Java % for IBM Class for Unicode/Java
% %
% Abbreviated weekday names (%a) % Abbreviated weekday names (%a)
abday "<U0073><U0075><U0020>";"<U006D><U00E5><U0020>";/ abday "<U0073><U0075><U002E>";"<U006D><U00E5><U002E>";/
"<U0074><U0079><U0020>";"<U006F><U006E><U0020>";/ "<U0074><U0079><U002E>";"<U006F><U006E><U002E>";/
"<U0074><U006F><U0020>";"<U0066><U0072><U0020>";/ "<U0074><U006F><U002E>";"<U0066><U0072><U002E>";/
"<U006C><U0061><U0075><U0020>" "<U006C><U0061><U002E>"
% %
% Full weekday names (%A) % Full weekday names (%A)
day "<U0073><U0075><U006E><U0064><U0061><U0067><U0020>";/ day "<U0073><U0075><U006E><U0064><U0061><U0067> ";/
"<U006D><U00E5><U006E><U0064><U0061><U0067><U0020>";/ "<U006D><U00E5><U006E><U0064><U0061><U0067> ";/
"<U0074><U0079><U0073><U0064><U0061><U0067><U0020>";/ "<U0074><U0079><U0073><U0064><U0061><U0067> ";/
"<U006F><U006E><U0073><U0064><U0061><U0067><U0020>";/ "<U006F><U006E><U0073><U0064><U0061><U0067> ";/
"<U0074><U006F><U0072><U0073><U0064><U0061><U0067><U0020>";/ "<U0074><U006F><U0072><U0073><U0064><U0061><U0067> ";/
"<U0066><U0072><U0065><U0064><U0061><U0067><U0020>";/ "<U0066><U0072><U0065><U0064><U0061><U0067> ";/
"<U006C><U0061><U0075><U0072><U0064><U0061><U0067><U0020>" "<U006C><U0061><U0075><U0072><U0064><U0061><U0067> "
% %
% Abbreviated month names (%b) % Abbreviated month names (%b)
abmon "<U006A><U0061><U006E>";"<U0066><U0065><U0062>";/ abmon "<U006A><U0061><U006E><U002E>";"<U0066><U0065><U0062><U002E>";/
"<U006D><U0061><U0072>";"<U0061><U0070><U0072>";/ "<U006D><U0061><U0072><U0073>";"<U0061><U0070><U0072><U0069><U006C>";/
"<U006D><U0061><U0069>";"<U006A><U0075><U006E>";/ "<U006D><U0061><U0069>";"<U006A><U0075><U006E><U0069>";/
"<U006A><U0075><U006C>";"<U0061><U0075><U0067>";/ "<U006A><U0075><U006C><U0069>";"<U0061><U0075><U0067><U002E>";/
"<U0073><U0065><U0070>";"<U006F><U006B><U0074>";/ "<U0073><U0065><U0070><U002E>";"<U006F><U006B><U0074><U002E>";/
"<U006E><U006F><U0076>";"<U0064><U0065><U0073>" "<U006E><U006F><U0076><U002E>";"<U0064><U0065><U0073><U002E>"
% %
% Full month names (%B) % Full month names (%B)
mon "<U006A><U0061><U006E><U0075><U0061><U0072>";/ mon "<U006A><U0061><U006E><U0075><U0061><U0072>";/
@ -110,32 +110,24 @@ mon "<U006A><U0061><U006E><U0075><U0061><U0072>";/
"<U006F><U006B><U0074><U006F><U0062><U0065><U0072>";/ "<U006F><U006B><U0074><U006F><U0062><U0065><U0072>";/
"<U006E><U006F><U0076><U0065><U006D><U0062><U0065><U0072>";/ "<U006E><U006F><U0076><U0065><U006D><U0062><U0065><U0072>";/
"<U0064><U0065><U0073><U0065><U006D><U0062><U0065><U0072>" "<U0064><U0065><U0073><U0065><U006D><U0062><U0065><U0072>"
%
% Equivalent of AM PM % usual date representation
am_pm "";"" % %a %d. %b %Y kl. %H.%M %z
% d_t_fmt "<U0025><U0061><U0020><U0025><U0064><U002E><U0020><U0025><U0062>/
% Appropriate date and time representation <U0020><U0025><U0059><U0020><U006B><U006C><U002E><U0020><U0025><U0048>/
% %d. %b %Ykl %H.%M %Z <U002E><U0025><U004D><U0020><U0025><U007A>"
d_t_fmt "<U0025><U0064><U002E><U0020><U0025><U0062><U0020><U0025>/
<U0059><U0020><U006B><U006C><U0020><U0025><U0048><U002E><U0025><U004D>/
<U0020><U0025><U005A>"
%
% Appropriate date representation
% %d. %b %Y % %d. %b %Y
d_fmt "<U0025><U0064><U002E><U0020><U0025><U0062><U0020><U0025><U0059>" d_fmt "<U0025><U0064><U002E><U0020><U0025><U0062><U0020><U0025><U0059>"
% % kl. %H.%M %z
% Appropriate time representation t_fmt "<U006B><U006C><U002E><U0020><U0025><U0048><U002E><U0025>/
% kl %H.%M %Z <U004D><U0020><U0025><U007A>"
t_fmt "<U006B><U006C><U0020><U0025><U0048><U002E><U0025><U004D>/ am_pm "";""
<U0020><U0025><U005A>"
%
% Appropriate 12 h time representation (%r)
t_fmt_ampm "" t_fmt_ampm ""
% % %a %d. %b %H:%M:%S %z %Y
% Appropriate date representation (date(1)) "%a %b %e %H:%M:%S %Z %Y" date_fmt "<U0025><U0061><U0020><U0025><U0064><U002E><U0020><U0025>/
date_fmt "<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/ <U0062><U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053>/
<U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/ <U0020><U0025><U007A><U0020><U0025><U0059>"
<U0025><U005A><U0020><U0025><U0059>"
week 7;19971201;4 week 7;19971201;4
first_weekday 1 first_weekday 1
first_workday 1 first_workday 1

3
posix/glob.c
View File

@ -455,7 +455,8 @@ glob (pattern, flags, errfunc, pglob)
} }
} }
else if (filename == pattern else if (filename == pattern
|| (filename == pattern + 1 && pattern[0] == '\\')) || (filename == pattern + 1 && pattern[0] == '\\'
&& (flags & GLOB_NOESCAPE) == 0))
{ {
/* "/pattern" or "\\/pattern". */ /* "/pattern" or "\\/pattern". */
dirname = "/"; dirname = "/";