From 42eaa27fac748edc54b780539fbd9a18921454ba Mon Sep 17 00:00:00 2001 From: Marko Myllynen Date: Fri, 12 Jun 2015 17:05:25 +0300 Subject: [PATCH] localedata: remove timezone information [BZ #18525] as discussed in the thread starting at https://sourceware.org/ml/libc-alpha/2015-06/msg00098.html it looks like the best options is to remove locale timezone information from locales which currently provide it (in incomplete or incorrect fashion) rather than to start duplicating tzdata info in glibc. --- ChangeLog | 10 ++++++++++ NEWS | 2 +- localedata/locales/km_KH | 2 -- localedata/locales/lo_LA | 2 -- localedata/locales/my_MM | 3 --- localedata/locales/nan_TW@latin | 1 - localedata/locales/th_TH | 2 -- localedata/locales/uk_UA | 25 ------------------------- 8 files changed, 11 insertions(+), 36 deletions(-) diff --git a/ChangeLog b/ChangeLog index 54a0ab3..a228926 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2015-08-05 Marko Myllynen + + [BZ #18525] + * locales/km_KH: Remove timezone definition. + * locales/lo_LA: Likewise. + * locales/my_MM: Likewise. + * locales/nan_TW@latin: Likewise. + * locales/th_TH: Likewise. + * locales/uk_UA: Likewise. + 2015-08-05 Daniel Marjamäki [BZ #18265] diff --git a/NEWS b/NEWS index d011ce6..6e0726c 100644 --- a/NEWS +++ b/NEWS @@ -8,7 +8,7 @@ using `glibc' in the "product" field. Version 2.23 * The following bugs are resolved with this release: - 18265 + 18265, 18525. Version 2.22 diff --git a/localedata/locales/km_KH b/localedata/locales/km_KH index 5563659..aaef20d 100644 --- a/localedata/locales/km_KH +++ b/localedata/locales/km_KH @@ -1838,8 +1838,6 @@ am_pm "";"/ %/ %" -% ICT-7ICT-7 -%timezone "" END LC_TIME diff --git a/localedata/locales/lo_LA b/localedata/locales/lo_LA index c584877..eba90ce 100644 --- a/localedata/locales/lo_LA +++ b/localedata/locales/lo_LA @@ -716,8 +716,6 @@ era_d_t_fmt "%A%e%B< date_fmt "/ / " -% ICT-7ICT-7 -timezone "" END LC_TIME LC_MESSAGES diff --git a/localedata/locales/my_MM b/localedata/locales/my_MM index d9a2db1..165519a 100644 --- a/localedata/locales/my_MM +++ b/localedata/locales/my_MM @@ -157,9 +157,6 @@ t_fmt "" -% MMT-6.5MMT-6.5 -timezone "" - alt_digits "";/ "";/ "";/ diff --git a/localedata/locales/nan_TW@latin b/localedata/locales/nan_TW@latin index a1e7d49..eb2b292 100644 --- a/localedata/locales/nan_TW@latin +++ b/localedata/locales/nan_TW@latin @@ -136,7 +136,6 @@ d_fmt "" t_fmt "" am_pm "";"" t_fmt_ampm "" -timezone "" date_fmt "" END LC_TIME diff --git a/localedata/locales/th_TH b/localedata/locales/th_TH index 88c3637..5b8c41b 100644 --- a/localedata/locales/th_TH +++ b/localedata/locales/th_TH @@ -911,8 +911,6 @@ era_d_t_fmt "%A%e%B< date_fmt "/ / " -% ICT-7ICT-7 -timezone "" END LC_TIME LC_MESSAGES diff --git a/localedata/locales/uk_UA b/localedata/locales/uk_UA index 511f004..5e58043 100644 --- a/localedata/locales/uk_UA +++ b/localedata/locales/uk_UA @@ -964,31 +964,6 @@ first_weekday 2 % Define the first workday relative to the keyword first_workday 2 -% Zymovyj CHas (winter time) or z.ch. (or nothing) -% Litnij CHas (summer time) or l.ch. -% -% ( or EET/EEST (Easter Europe [Summer] Time) ) -% ( or Europe/Kyiv (or Kiev, in Russian) ) -% -% Format: -% -% ,,[,...] -% -% ZoneName - at least 3 letters, up to 10 -% Offset - (+|-)hh[:mm[:ss]] -% - - time zone is east of Prime Meridian -% + - time zone is west of Prime Meridian -% rule: [/time[/year]] -% date: -% J , 1-365 (without 29.02) -% , 0-364 (without 29.02) -% M.. - m - month(1-12) -% n - week(1-5) -% d - day of week(0-7), day zero and day seven is Sunday -% time - the same as (but without leading +/-) -% -timezone "" - % Example: % % traven` cherven` -- 2.7.4