AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-01-18 06:30:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

* locales/am_ET (LC_COLLATE): Define new script after copy.

Browse Source
This commit is contained in:
Ulrich Drepper 2007-10-02 02:07:50 +00:00
parent 035ef8d757
commit d7c51a0c1a
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
locale/programs/ld-collate.c
View File

@ -2660,7 +2660,6 @@ collate_read (struct linereader *ldfile, struct localedef_t *result,
if (nowtok == tok_copy) if (nowtok == tok_copy)
{ {
state = 2;
now = lr_token (ldfile, charmap, result, NULL, verbose); now = lr_token (ldfile, charmap, result, NULL, verbose);
if (now->tok != tok_string) if (now->tok != tok_string)
{ {
@ -3327,7 +3326,9 @@ error while adding equivalent collating symbol"));
was_ellipsis = tok_none; was_ellipsis = tok_none;
} }
} }
else if (state != 2 && state != 3) else if (state == 0 && copy_locale == NULL)
goto err_label;
else if (state != 0 && state != 2 && state != 3)
goto err_label; goto err_label;
state = 3; state = 3;
@ -3796,7 +3797,7 @@ error while adding equivalent collating symbol"));
/* Next we assume `LC_COLLATE'. */ /* Next we assume `LC_COLLATE'. */
if (!ignore_content) if (!ignore_content)
{ {
if (state == 0) if (state == 0 && copy_locale == NULL)
/* We must either see a copy statement or have /* We must either see a copy statement or have
ordering values. */ ordering values. */
lr_error (ldfile, lr_error (ldfile,

4
localedata/ChangeLog
View File

@ -1,3 +1,7 @@
2007-10-01 Ulrich Drepper <drepper@redhat.com>
* locales/am_ET (LC_COLLATE): Define new script after copy.
2007-09-30 Ulrich Drepper <drepper@redhat.com> 2007-09-30 Ulrich Drepper <drepper@redhat.com>
* locales/cs_SR: Removed. * locales/cs_SR: Removed.

8
localedata/locales/am_ET
View File

@ -56,14 +56,14 @@ END LC_IDENTIFICATION
LC_COLLATE LC_COLLATE
% %
% The ETHIOPIC script declaration must come first.
%
script <ETHIOPIC>
%
% Copy the template from ISO/IEC 14651 % Copy the template from ISO/IEC 14651
% %
copy "iso14651_t1" copy "iso14651_t1"
% %
% The ETHIOPIC script declaration must come first.
%
script <ETHIOPIC>
%
% Correcting Unicode's linguistic ordering to the traditional. % Correcting Unicode's linguistic ordering to the traditional.
% %
collating-symbol <HOY> collating-symbol <HOY>