mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-21 01:12:26 +08:00
989182c40a
It has been discovered that some locales use the 12-hour time formats but do not use any AM/PM indicator thus making the time ambiguous. This commit adds "%p" wherever it was missing. In some cases it has been identified that a locale should use 24-hour time format rather than 12-hour. All time formats come from CLDR but this commit introduces as few changes as possible (for example, it tries not to change the time zone display). For the locales which are not supported by CLDR the consistency with similar locales (which means the same language or the same country) has been preserved: if the time formats were the same before the change then they are still the same after the change. The time format updates can be roughly summarized as follows: * Most of the locales of Djibouti, Eritrea, and Ethiopia now use "%l:%M:%S %p". * Most of the locales of India and some surrounding countries (Bangladesh, Nepal etc.) now use "%I:%M:%S %p %Z". * Most of the Arabic locales now use "%Z %I:%M:%S %p". * Ge'ez language (Eritrea and Ethiopia) now uses "%l:%M:%S፡%p" (note the consistent use of Ethiopic wordspace character). * Tamil (India) now uses "%p %I:%M:%S %Z". * Chinese (Hong Kong) t_fmt now uses "%p %I<U6642>%M<U5206>%S<U79D2> %Z". * Additionally, the following locales have been switched from 12-hour time formats to 24-hour, according to CLDR: Arabic (Morocco), Maltese, Somali (Kenya), and Tamil (Sri Lanka). * Finally, the Bulgarian, Czech, and Slovak locales used 24-hour time format correctly but their t_fmt_ampm field was not empty containing 12-hour time format which was incorrect so it is now replaced with an empty string. [BZ #10496] * localedata/locales/aa_DJ (t_fmt): Set to "%l:%M:%S %p". (t_fmt_ampm): Likewise. * localedata/locales/aa_ER (t_fmt): Likewise. (t_fmt_ampm): Likewise. * localedata/locales/aa_ER@saaho (t_fmt): Likewise. (t_fmt_ampm): Likewise. * localedata/locales/aa_ET (t_fmt): Likewise. (t_fmt_ampm): Likewise. * localedata/locales/am_ET (t_fmt): Likewise. (t_fmt_ampm): Likewise. * localedata/locales/byn_ER (t_fmt): Likewise. (t_fmt_ampm): Likewise. * localedata/locales/om_ET (t_fmt): Likewise. (t_fmt_ampm): Likewise. * localedata/locales/sid_ET (t_fmt): Likewise. (t_fmt_ampm): Likewise. * localedata/locales/so_DJ (t_fmt): Likewise. (t_fmt_ampm): Likewise. * localedata/locales/so_ET (t_fmt): Likewise. (t_fmt_ampm): Likewise. * localedata/locales/so_SO (t_fmt): Likewise. (t_fmt_ampm): Likewise. * localedata/locales/ti_ER (t_fmt): Likewise. (t_fmt_ampm): Likewise. * localedata/locales/ti_ET (t_fmt): Likewise. (t_fmt_ampm): Likewise. * localedata/locales/tig_ER (t_fmt): Likewise. (t_fmt_ampm): Likewise. * localedata/locales/wal_ET (t_fmt): Likewise. (t_fmt_ampm): Likewise. * localedata/locales/anp_IN (t_fmt): Set to "%I:%M:%S %p %Z". * localedata/locales/ar_IN (t_fmt): Likewise. * localedata/locales/bhb_IN (t_fmt): Likewise. * localedata/locales/bho_IN (t_fmt): Likewise. * localedata/locales/bi_VU (t_fmt): Likewise. * localedata/locales/bn_BD (t_fmt): Likewise. * localedata/locales/bn_IN (t_fmt): Likewise. * localedata/locales/brx_IN (t_fmt): Likewise. * localedata/locales/doi_IN (t_fmt): Likewise. * localedata/locales/en_HK (t_fmt): Likewise. (t_fmt_ampm): Likewise. * localedata/locales/en_IN (t_fmt): Likewise. * localedata/locales/en_PH (t_fmt): Likewise. * localedata/locales/gu_IN (t_fmt): Likewise. * localedata/locales/hi_IN (t_fmt): Likewise. * localedata/locales/hif_FJ (t_fmt): Likewise. * localedata/locales/hne_IN (t_fmt): Likewise. * localedata/locales/kn_IN (t_fmt): Likewise. * localedata/locales/kok_IN (t_fmt): Likewise. * localedata/locales/ks_IN (t_fmt): Likewise. * localedata/locales/ks_IN@devanagari (t_fmt): Likewise. * localedata/locales/mag_IN (t_fmt): Likewise. * localedata/locales/mai_IN (t_fmt): Likewise. * localedata/locales/mjw_IN (t_fmt): Likewise. * localedata/locales/ml_IN (t_fmt): Likewise. * localedata/locales/mni_IN (t_fmt): Likewise. * localedata/locales/mr_IN (t_fmt): Likewise. * localedata/locales/ms_MY (t_fmt): Likewise. * localedata/locales/pa_IN (t_fmt): Likewise. * localedata/locales/raj_IN (t_fmt): Likewise. * localedata/locales/sa_IN (t_fmt): Likewise. * localedata/locales/sat_IN (t_fmt): Likewise. * localedata/locales/sd_IN (t_fmt): Likewise. * localedata/locales/sd_IN@devanagari (t_fmt): Likewise. * localedata/locales/tcy_IN (t_fmt): Likewise. * localedata/locales/the_NP (t_fmt): Likewise. * localedata/locales/to_TO (t_fmt): Likewise. * localedata/locales/ur_IN (t_fmt): Likewise. * localedata/locales/hif_FJ (d_t_fmt): Set to "%A %d %b %Y %I:%M:%S %p". (date_fmt): Add, set to "%A %d %b %Y %I:%M:%S %p %Z". * localedata/locales/ar_AE (t_fmt): Set to "%Z %I:%M:%S %p". * localedata/locales/ar_BH (t_fmt): Likewise. * localedata/locales/ar_DZ (t_fmt): Likewise. * localedata/locales/ar_EG (t_fmt): Likewise. * localedata/locales/ar_IQ (t_fmt): Likewise. * localedata/locales/ar_JO (t_fmt): Likewise. * localedata/locales/ar_KW (t_fmt): Likewise. * localedata/locales/ar_LB (t_fmt): Likewise. * localedata/locales/ar_LY (t_fmt): Likewise. * localedata/locales/ar_OM (t_fmt): Likewise. * localedata/locales/ar_QA (t_fmt): Likewise. * localedata/locales/ar_SD (t_fmt): Likewise. * localedata/locales/ar_SS (t_fmt): Likewise. * localedata/locales/ar_SY (t_fmt): Likewise. * localedata/locales/ar_TN (t_fmt): Likewise. * localedata/locales/ar_YE (t_fmt): Likewise. * localedata/locales/gez_ER (t_fmt): Set to "%l:%M:%S<U1361>%p". (t_fmt_ampm): Likewise. * localedata/locales/gez_ET (t_fmt): Likewise. (t_fmt_ampm): Likewise. * localedata/locales/ta_IN (t_fmt): Set to "%p %I:%M:%S %Z". (t_fmt_ampm): Likewise. (d_t_fmt): Set to "%A %d %B %Y %p %I:%M:%S %Z". * localedata/locales/zh_HK (t_fmt): Set to "%p %I<U6642>%M<U5206>%S<U79D2> %Z". * localedata/locales/ar_MA (t_fmt_ampm): Set to "" (empty string) because this locale does not use the 12-hour clock. (t_fmt): Set to "%Z %H:%M:%S". (d_t_fmt): Set to "%d %b, %Y %Z %H:%M:%S". * localedata/locales/mt_MT (t_fmt_ampm): Set to "" (empty string) because this locale does not use the 12-hour clock. (t_fmt): Set to "%H:%M:%S %Z". (d_t_fmt): Set to "%A, %d ta %b, %Y %H:%M:%S %Z". * localedata/locales/so_KE (t_fmt_ampm): Set to "" (empty string) because this locale does not use the 12-hour clock. (t_fmt): Set to "%T". (d_t_fmt): Set to "%A, %B %e, %Y %X %Z". (date_fmt): Set to "%A, %B %e, %X %Z %Y". * localedata/locales/ta_LK (t_fmt_ampm): Set to "" (empty string) because this locale does not use the 12-hour clock. (t_fmt): Set to "%H:%M:%S %Z". (d_t_fmt): Set to "%A %d %B %Y %H:%M:%S %Z". * localedata/locales/bg_BG (t_fmt_ampm): Set to "" (empty string) because this locale does not use the 12-hour clock. * localedata/locales/cs_CZ (t_fmt_ampm): Likewise. * localedata/locales/sk_SK (t_fmt_ampm): Likewise.
209 lines
5.2 KiB
Plaintext
209 lines
5.2 KiB
Plaintext
comment_char %
|
|
escape_char /
|
|
|
|
% This file is part of the GNU C Library and contains locale data.
|
|
% The Free Software Foundation does not claim any copyright interest
|
|
% in the locale data contained in this file. The foregoing does not
|
|
% affect the license of the GNU C Library as a whole. It does not
|
|
% exempt you from the conditions of the license if your use would
|
|
% otherwise be governed by that license.
|
|
|
|
% Punjabi language locale for Indian Punjabi(Gurmukhi)
|
|
% Last update by A Alam <amanlinux@netscape.net>
|
|
|
|
LC_IDENTIFICATION
|
|
title "Punjabi language locale for Indian Punjabi(Gurmukhi)"
|
|
source "IndLinux.org"
|
|
address ""
|
|
contact ""
|
|
email "bug-glibc-locales@gnu.org"
|
|
tel ""
|
|
fax ""
|
|
language "Punjabi"
|
|
territory "India"
|
|
revision "0.2"
|
|
date "2004-09-30"
|
|
|
|
category "i18n:2012";LC_IDENTIFICATION
|
|
category "i18n:2012";LC_CTYPE
|
|
category "i18n:2012";LC_COLLATE
|
|
category "i18n:2012";LC_TIME
|
|
category "i18n:2012";LC_NUMERIC
|
|
category "i18n:2012";LC_MONETARY
|
|
category "i18n:2012";LC_MESSAGES
|
|
category "i18n:2012";LC_PAPER
|
|
category "i18n:2012";LC_NAME
|
|
category "i18n:2012";LC_ADDRESS
|
|
category "i18n:2012";LC_TELEPHONE
|
|
category "i18n:2012";LC_MEASUREMENT
|
|
END LC_IDENTIFICATION
|
|
|
|
LC_CTYPE
|
|
copy "i18n"
|
|
|
|
% Punjabi uses the alternate digits U+0A66..U+0A6F
|
|
outdigit <U0A66>..<U0A6F>
|
|
|
|
% This is used in the scanf family of functions to read Punjabi numbers
|
|
% using "%Id" and such.
|
|
map to_inpunct; /
|
|
(<U0030>,<U0A66>); /
|
|
(<U0031>,<U0A67>); /
|
|
(<U0032>,<U0A68>); /
|
|
(<U0033>,<U0A69>); /
|
|
(<U0034>,<U0A6A>); /
|
|
(<U0035>,<U0A6B>); /
|
|
(<U0036>,<U0A6C>); /
|
|
(<U0037>,<U0A6D>); /
|
|
(<U0038>,<U0A6E>); /
|
|
(<U0039>,<U0A6F>);
|
|
|
|
translit_start
|
|
include "translit_combining";""
|
|
translit_end
|
|
END LC_CTYPE
|
|
|
|
|
|
LC_COLLATE
|
|
|
|
% Copy the template from ISO/IEC 14651
|
|
copy "iso14651_t1"
|
|
|
|
END LC_COLLATE
|
|
|
|
LC_MONETARY
|
|
copy "hi_IN"
|
|
END LC_MONETARY
|
|
|
|
|
|
LC_NUMERIC
|
|
copy "hi_IN"
|
|
END LC_NUMERIC
|
|
|
|
|
|
LC_TIME
|
|
% This is the POSIX Locale definition for the LC_TIME category.
|
|
% These are generated based on XML base Locale definition file
|
|
% for IBM Class for Unicode/Java
|
|
%
|
|
% Abbreviated weekday names (%a)
|
|
abday "<U0A10><U0A24>";/
|
|
"<U0A38><U0A4B><U0A2E>";/
|
|
"<U0A2E><U0A70><U0A17><U0A32>";/
|
|
"<U0A2C><U0A41><U0A71><U0A27>";/
|
|
"<U0A35><U0A40><U0A30>";/
|
|
"<U0A36><U0A41><U0A71><U0A15><U0A30>";/
|
|
"<U0A36><U0A28><U0A3F><U0A71><U0A1A><U0A30>"
|
|
%
|
|
% Full weekday names (%A)
|
|
day "<U0A10><U0A24><U0A35><U0A3E><U0A30>";/
|
|
"<U0A38><U0A4B><U0A2E><U0A35><U0A3E><U0A30>";/
|
|
"<U0A2E><U0A70><U0A17><U0A32><U0A35><U0A3E><U0A30>";/
|
|
"<U0A2C><U0A41><U0A71><U0A27><U0A35><U0A3E><U0A30>";/
|
|
"<U0A35><U0A40><U0A30><U0A35><U0A3E><U0A30>";/
|
|
"<U0A36><U0A41><U0A71><U0A15><U0A30><U0A35><U0A3E><U0A30>";/
|
|
"<U0A36><U0A28><U0A3F><U0A71><U0A1A><U0A30><U0A35><U0A3E><U0A30>"
|
|
|
|
|
|
% Abbreviated month names (%b)
|
|
abmon "<U0A1C><U0A28>";/
|
|
"<U0A2B><U0A3C><U0A30>";/
|
|
"<U0A2E><U0A3E><U0A30><U0A1A>";/
|
|
"<U0A05><U0A2A><U0A4D><U0A30><U0A48>";/
|
|
"<U0A2E><U0A08>";/
|
|
"<U0A1C><U0A42><U0A28>";/
|
|
"<U0A1C><U0A41><U0A32><U0A3E>";/
|
|
"<U0A05><U0A17>";/
|
|
"<U0A38><U0A24><U0A70>";/
|
|
"<U0A05><U0A15><U0A24><U0A42>";/
|
|
"<U0A28><U0A35><U0A70>";/
|
|
"<U0A26><U0A38><U0A70>"
|
|
%
|
|
% Full month names (%B)
|
|
mon "<U0A1C><U0A28><U0A35><U0A30><U0A40>";/
|
|
"<U0A2B><U0A3C><U0A30><U0A35><U0A30><U0A40>";/
|
|
"<U0A2E><U0A3E><U0A30><U0A1A>";/
|
|
"<U0A05><U0A2A><U0A4D><U0A30><U0A48><U0A32>";/
|
|
"<U0A2E><U0A08>";/
|
|
"<U0A1C><U0A42><U0A28>";/
|
|
"<U0A1C><U0A41><U0A32><U0A3E><U0A08>";/
|
|
"<U0A05><U0A17><U0A38><U0A24>";/
|
|
"<U0A38><U0A24><U0A70><U0A2C><U0A30>";/
|
|
"<U0A05><U0A15><U0A24><U0A42><U0A2C><U0A30>";/
|
|
"<U0A28><U0A35><U0A70><U0A2C><U0A30>";/
|
|
"<U0A26><U0A38><U0A70><U0A2C><U0A30>"
|
|
|
|
%
|
|
% Equivalent of AM PM
|
|
am_pm "<U0A38><U0A35><U0A47><U0A30><U0A47>";/
|
|
"<U0A36><U0A3E><U0A2E>"
|
|
|
|
%
|
|
% Appropriate date and time representation
|
|
d_t_fmt "%A %d %b %Y %I:%M:%S %p %Z"
|
|
%
|
|
% Appropriate date representation
|
|
d_fmt "%-d//%-m//%y"
|
|
%
|
|
% Appropriate time representation
|
|
t_fmt "%I:%M:%S %p %Z"
|
|
%
|
|
% Appropriate 12 h time representation (%r)
|
|
t_fmt_ampm "%I:%M:%S %p %Z"
|
|
week 7;19971130;1
|
|
END LC_TIME
|
|
|
|
|
|
LC_MESSAGES
|
|
yesexpr "^[+1yY<U0A39>]"
|
|
noexpr "^[-0nN<U0A28>]"
|
|
yesstr "<U0A39><U0A3E><U0A02>"
|
|
nostr "<U0A28><U0A39><U0A40><U0A02>"
|
|
END LC_MESSAGES
|
|
|
|
|
|
LC_PAPER
|
|
copy "hi_IN"
|
|
END LC_PAPER
|
|
|
|
|
|
LC_NAME
|
|
% This is the ISO_IEC TR14652 Locale definition for the
|
|
% LC_NAME category.
|
|
%
|
|
name_fmt "%p%t%f%t%g"
|
|
name_gen ""
|
|
name_mr "Mr."
|
|
name_mrs "Mrs."
|
|
name_miss "Miss."
|
|
name_ms "Ms."
|
|
|
|
END LC_NAME
|
|
|
|
|
|
LC_ADDRESS
|
|
% This is the ISO_IEC TR14652 Locale definition for the
|
|
% LC_ADDRESS
|
|
postal_fmt "%z%c%T%s%b%e%r"
|
|
country_name "<U0A2D><U0A3E><U0A30><U0A24>"
|
|
country_ab2 "IN"
|
|
country_ab3 "IND"
|
|
country_num 356
|
|
country_car "IND"
|
|
% ਪੰਜਾਬੀ
|
|
lang_name "<U0A2A><U0A70><U0A1C><U0A3E><U0A2C><U0A40>"
|
|
lang_ab "pa"
|
|
lang_term "pan"
|
|
lang_lib "pan"
|
|
END LC_ADDRESS
|
|
|
|
|
|
LC_TELEPHONE
|
|
copy "hi_IN"
|
|
END LC_TELEPHONE
|
|
|
|
|
|
LC_MEASUREMENT
|
|
copy "hi_IN"
|
|
END LC_MEASUREMENT
|