diff mbox

locale: Do not define lang_ab for tcy_IN and bhb_IN

Message ID 1437460782-26082-1-git-send-email-raj.khem@gmail.com
State Committed
Headers

Commit Message

Khem Raj July 21, 2015, 6:39 a.m. UTC 
  After renaming localedef now complains and build fails

LC_ADDRESS: field `lang_ab' must not be defined

earlier the names were similar to lang_ab definitions 'tu' or 'bh'
but after rename they are not.
---
 localedata/ChangeLog      | 6 ++++++
 localedata/locales/bhb_IN | 2 +-
 localedata/locales/tcy_IN | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

Comments

Mike Frysinger July 21, 2015, 6:53 a.m. UTC | #1 
On 20 Jul 2015 23:39, Khem Raj wrote:
> After renaming localedef now complains and build fails
> 
> LC_ADDRESS: field `lang_ab' must not be defined
> 
> earlier the names were similar to lang_ab definitions 'tu' or 'bh'
> but after rename they are not.

my understanding is that lang_ab can only contain iso-639-1 (which are two 
letters), so if the lang doesn't appear there (these only have iso-639-3 
three letter codes), we omit the value.  pushed.
-mike
Marko Myllynen Aug. 10, 2015, 10:01 a.m. UTC | #2 
Hi,

On 2015-07-21 09:53, Mike Frysinger wrote:
> On 20 Jul 2015 23:39, Khem Raj wrote:
>> After renaming localedef now complains and build fails
>>
>> LC_ADDRESS: field `lang_ab' must not be defined
>>
>> earlier the names were similar to lang_ab definitions 'tu' or 'bh'
>> but after rename they are not.
> 
> my understanding is that lang_ab can only contain iso-639-1 (which are two 
> letters), so if the lang doesn't appear there (these only have iso-639-3 
> three letter codes), we omit the value.

you're correct and amazingly enough this is even documented:

https://sourceware.org/glibc/wiki/Locales#LC_ADDRESS

Cheers,
diff mbox

Patch

diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index 030326b..0a91680 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,6 +1,12 @@ 
 2015-07-21  Khem Raj  <raj.khem@gmail.com>
 
 	[BZ #17475]
+	* locales/bhb_IN: Do not define lang_ab.
+	* locales/tcy_IN: Ditto.
+
+2015-07-21  Khem Raj  <raj.khem@gmail.com>
+
+	[BZ #17475]
 	* SUPPORTED: Rename tu_IN to tcy_IN and bh_IN to bhb_IN.
 
 2015-07-20  Chris Metcalf  <cmetcalf@ezchip.com>
diff --git a/localedata/locales/bhb_IN b/localedata/locales/bhb_IN
index 8521257..b98d67d 100644
--- a/localedata/locales/bhb_IN
+++ b/localedata/locales/bhb_IN
@@ -163,7 +163,7 @@  country_ab3 "<U0049><U004E><U0044>"
 country_car "<U0049><U004E><U0044>"
 country_num 356
 lang_name     "<U0062><U0068><U0069><U006C><U0069>"
-lang_ab       "<U0062><U0068>"
+lang_ab       ""
 lang_term     "<U0062><U0068><U0062>"
 lang_lib      "<U0062><U0068><U0062>"
 END LC_ADDRESS
diff --git a/localedata/locales/tcy_IN b/localedata/locales/tcy_IN
index 3fc1e1a..a737bb3 100644
--- a/localedata/locales/tcy_IN
+++ b/localedata/locales/tcy_IN
@@ -179,7 +179,7 @@  country_ab3 "<U0049><U004E><U0044>"
 country_car "<U0049><U004E><U0044>"
 country_num 356
 lang_name     "<U0CA4><U0CC1><U0CB3><U0CC1>"
-lang_ab       "<U0074><U0075>"
+lang_ab       ""
 lang_term     "<U0074><U0063><U0079>"
 lang_lib      "<U0074><U0063><U0079>"
 END LC_ADDRESS