]>
Commit | Line | Data |
---|---|---|
ec3eab8a JB |
1 | 2006-12-21 Bruno Haible <bruno@...> |
2 | * localename.c (SUBLANG_BENGALI_INDIA): Change value from 0 to 1. | |
3 | (SUBLANG_BENGALI_BANGLADESH): Change value from 1 to 2. | |
4 | (SUBLANG_PUNJABI_INDIA): Change value from 0 to 1. | |
5 | (SUBLANG_PUNJABI_PAKISTAN): Change value from 1 to 2. | |
6 | (SUBLANG_ROMANIAN_ROMANIA): Change value from 0 to 1. | |
7 | (SUBLANG_ROMANIAN_MOLDOVA): Change value from 1 to 2. | |
8 | (SUBLANG_SINDHI_INDIA): Remove macro. | |
9 | (SUBLANG_SINDHI_AFGHANISTAN): New macro. | |
10 | (SUBLANG_TAMAZIGHT_ALGERIA_LATIN): Renamed from | |
11 | SUBLANG_TAMAZIGHT_LATIN. | |
12 | (SUBLANG_TIGRINYA_ETHIOPIA): Change value from 0 to 1. | |
13 | (SUBLANG_TIGRINYA_ERITREA): Change value from 1 to 2. | |
14 | (_nl_locale_name_default): Update. | |
15 | Reported by Bob Rossi | |
16 | ||
17 | --- gettext-0.16.1/gettext-runtime/intl/localename.c.orig 2006-11-27 18:02:00.000000000 +0100 | |
18 | +++ gettext-0.16.1/gettext-runtime/intl/localename.c 2007-02-20 21:54:46.368009590 +0100 | |
19 | @@ -494,10 +494,10 @@ | |
20 | # define SUBLANG_AZERI_CYRILLIC 0x02 | |
21 | # endif | |
22 | # ifndef SUBLANG_BENGALI_INDIA | |
23 | -# define SUBLANG_BENGALI_INDIA 0x00 | |
24 | +# define SUBLANG_BENGALI_INDIA 0x01 | |
25 | # endif | |
26 | # ifndef SUBLANG_BENGALI_BANGLADESH | |
27 | -# define SUBLANG_BENGALI_BANGLADESH 0x01 | |
28 | +# define SUBLANG_BENGALI_BANGLADESH 0x02 | |
29 | # endif | |
30 | # ifndef SUBLANG_CHINESE_MACAU | |
31 | # define SUBLANG_CHINESE_MACAU 0x05 | |
32 | @@ -590,16 +590,16 @@ | |
33 | # define SUBLANG_NEPALI_INDIA 0x02 | |
34 | # endif | |
35 | # ifndef SUBLANG_PUNJABI_INDIA | |
36 | -# define SUBLANG_PUNJABI_INDIA 0x00 | |
37 | +# define SUBLANG_PUNJABI_INDIA 0x01 | |
38 | # endif | |
39 | # ifndef SUBLANG_PUNJABI_PAKISTAN | |
40 | -# define SUBLANG_PUNJABI_PAKISTAN 0x01 | |
41 | +# define SUBLANG_PUNJABI_PAKISTAN 0x02 | |
42 | # endif | |
43 | # ifndef SUBLANG_ROMANIAN_ROMANIA | |
44 | -# define SUBLANG_ROMANIAN_ROMANIA 0x00 | |
45 | +# define SUBLANG_ROMANIAN_ROMANIA 0x01 | |
46 | # endif | |
47 | # ifndef SUBLANG_ROMANIAN_MOLDOVA | |
48 | -# define SUBLANG_ROMANIAN_MOLDOVA 0x01 | |
49 | +# define SUBLANG_ROMANIAN_MOLDOVA 0x02 | |
50 | # endif | |
51 | # ifndef SUBLANG_SERBIAN_LATIN | |
52 | # define SUBLANG_SERBIAN_LATIN 0x02 | |
53 | @@ -607,12 +607,12 @@ | |
54 | # ifndef SUBLANG_SERBIAN_CYRILLIC | |
55 | # define SUBLANG_SERBIAN_CYRILLIC 0x03 | |
56 | # endif | |
57 | -# ifndef SUBLANG_SINDHI_INDIA | |
58 | -# define SUBLANG_SINDHI_INDIA 0x00 | |
59 | -# endif | |
60 | # ifndef SUBLANG_SINDHI_PAKISTAN | |
61 | # define SUBLANG_SINDHI_PAKISTAN 0x01 | |
62 | # endif | |
63 | +# ifndef SUBLANG_SINDHI_AFGHANISTAN | |
64 | +# define SUBLANG_SINDHI_AFGHANISTAN 0x02 | |
65 | +# endif | |
66 | # ifndef SUBLANG_SPANISH_GUATEMALA | |
67 | # define SUBLANG_SPANISH_GUATEMALA 0x04 | |
68 | # endif | |
69 | @@ -670,14 +670,14 @@ | |
70 | # ifndef SUBLANG_TAMAZIGHT_ARABIC | |
71 | # define SUBLANG_TAMAZIGHT_ARABIC 0x01 | |
72 | # endif | |
73 | -# ifndef SUBLANG_TAMAZIGHT_LATIN | |
74 | -# define SUBLANG_TAMAZIGHT_LATIN 0x02 | |
75 | +# ifndef SUBLANG_TAMAZIGHT_ALGERIA_LATIN | |
76 | +# define SUBLANG_TAMAZIGHT_ALGERIA_LATIN 0x02 | |
77 | # endif | |
78 | # ifndef SUBLANG_TIGRINYA_ETHIOPIA | |
79 | -# define SUBLANG_TIGRINYA_ETHIOPIA 0x00 | |
80 | +# define SUBLANG_TIGRINYA_ETHIOPIA 0x01 | |
81 | # endif | |
82 | # ifndef SUBLANG_TIGRINYA_ERITREA | |
83 | -# define SUBLANG_TIGRINYA_ERITREA 0x01 | |
84 | +# define SUBLANG_TIGRINYA_ERITREA 0x02 | |
85 | # endif | |
86 | # ifndef SUBLANG_URDU_PAKISTAN | |
87 | # define SUBLANG_URDU_PAKISTAN 0x01 | |
88 | @@ -1378,8 +1378,8 @@ | |
89 | case LANG_SINDHI: | |
90 | switch (sub) | |
91 | { | |
92 | - case SUBLANG_SINDHI_INDIA: return "sd_IN"; | |
93 | case SUBLANG_SINDHI_PAKISTAN: return "sd_PK"; | |
94 | + case SUBLANG_SINDHI_AFGHANISTAN: return "sd_AF"; | |
95 | } | |
96 | return "sd"; | |
97 | case LANG_SINHALESE: return "si_LK"; | |
98 | @@ -1432,7 +1432,7 @@ | |
99 | { | |
100 | /* FIXME: Adjust this when Tamazight locales appear on Unix. */ | |
101 | case SUBLANG_TAMAZIGHT_ARABIC: return "ber_MA@arabic"; | |
102 | - case SUBLANG_TAMAZIGHT_LATIN: return "ber_MA@latin"; | |
103 | + case SUBLANG_TAMAZIGHT_ALGERIA_LATIN: return "ber_DZ@latin"; | |
104 | } | |
105 | return "ber_MA"; | |
106 | case LANG_TAMIL: |