From: Rafal Luzynski Date: Mon, 8 Oct 2018 23:16:36 +0000 (+0200) Subject: Multiple locales: Use the correct 12-hour time formats (bug 10496). X-Git-Tag: glibc-2.29~93 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=989182c40a54c3022ff75c3c313479231dd36602;p=thirdparty%2Fglibc.git Multiple locales: Use the correct 12-hour time formats (bug 10496). 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%M%S %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%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%M%S %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. --- diff --git a/ChangeLog b/ChangeLog index 2693fb2c720..63ceb48de69 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,135 @@ +2018-12-28 Rafal Luzynski + + [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%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%M%S %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. + 2018-12-28 Rafal Luzynski [BZ #10496] diff --git a/localedata/locales/aa_DJ b/localedata/locales/aa_DJ index fcb9af8abc5..98e1505404d 100644 --- a/localedata/locales/aa_DJ +++ b/localedata/locales/aa_DJ @@ -220,10 +220,10 @@ am_pm "saaku";"carra" d_fmt "%d.%m.%Y" % % Appropriate time representation (%X) -t_fmt "%l:%M:%S" +t_fmt "%l:%M:%S %p" % % Appropriate AM/PM time representation (%r) -t_fmt_ampm "%X %p" +t_fmt_ampm "%l:%M:%S %p" % % Appropriate date and time representation (%c) d_t_fmt "%a %d %b %Y %r %Z" diff --git a/localedata/locales/aa_ER b/localedata/locales/aa_ER index 1c6ce6b0810..6d20ae907ba 100644 --- a/localedata/locales/aa_ER +++ b/localedata/locales/aa_ER @@ -194,10 +194,10 @@ am_pm "saaku";"carra" d_fmt "%d//%m//%Y" % % Appropriate time representation (%X) -t_fmt "%l:%M:%S" +t_fmt "%l:%M:%S %p" % % Appropriate AM/PM time representation (%r) -t_fmt_ampm "%X %p" +t_fmt_ampm "%l:%M:%S %p" % % Appropriate date and time representation (%c) d_t_fmt "%A, %B %e, %Y %r %Z" diff --git a/localedata/locales/aa_ER@saaho b/localedata/locales/aa_ER@saaho index ac1124ef48e..1a2b16676fb 100644 --- a/localedata/locales/aa_ER@saaho +++ b/localedata/locales/aa_ER@saaho @@ -179,10 +179,10 @@ am_pm "saaku";"carra" d_fmt "%d//%m//%Y" % % Appropriate time representation (%X) -t_fmt "%l:%M:%S" +t_fmt "%l:%M:%S %p" % % Appropriate AM/PM time representation (%r) -t_fmt_ampm "%X %p" +t_fmt_ampm "%l:%M:%S %p" % % Appropriate date and time representation (%c) d_t_fmt "%A, %B %e, %Y %r %Z" diff --git a/localedata/locales/aa_ET b/localedata/locales/aa_ET index 770820d5833..93fcdb7ff9f 100644 --- a/localedata/locales/aa_ET +++ b/localedata/locales/aa_ET @@ -196,10 +196,10 @@ am_pm "saaku";"carra" d_fmt "%d//%m//%Y" % % Appropriate time representation (%X) -t_fmt "%l:%M:%S" +t_fmt "%l:%M:%S %p" % % Appropriate AM/PM time representation (%r) -t_fmt_ampm "%X %p" +t_fmt_ampm "%l:%M:%S %p" % % Appropriate date and time representation (%c) d_t_fmt "%A, %B %e, %Y %r %Z" diff --git a/localedata/locales/am_ET b/localedata/locales/am_ET index e5fe88a4cd7..7846d6278c4 100644 --- a/localedata/locales/am_ET +++ b/localedata/locales/am_ET @@ -1039,10 +1039,10 @@ am_pm "";/ d_fmt "%d//%m//%Y" % % Appropriate time representation (%X) -t_fmt "%l:%M:%S" +t_fmt "%l:%M:%S %p" % % Appropriate AM/PM time representation (%r) -t_fmt_ampm "%X %p" +t_fmt_ampm "%l:%M:%S %p" % % Appropriate date and time representation (%c) % "%A፣ %B %e ቀን %Y %r %Z diff --git a/localedata/locales/anp_IN b/localedata/locales/anp_IN index b65c8732bd6..eb3f35a19c3 100644 --- a/localedata/locales/anp_IN +++ b/localedata/locales/anp_IN @@ -130,7 +130,7 @@ d_t_fmt "%A %d %b %Y %I:%M:%S %p %Z" d_fmt "%-d//%-m//%y" % % Appropriate time representation -t_fmt "%I:%M:%S %Z" +t_fmt "%I:%M:%S %p %Z" % % Appropriate 12 h time representation (%r) t_fmt_ampm "%I:%M:%S %p %Z" diff --git a/localedata/locales/ar_AE b/localedata/locales/ar_AE index be1caf4aab2..3701909dd04 100644 --- a/localedata/locales/ar_AE +++ b/localedata/locales/ar_AE @@ -133,7 +133,7 @@ d_t_fmt "%d %b, %Y %Z %I:%M:%S %p" d_fmt "%d %b, %Y" % % Appropriate time representation -t_fmt "%Z %I:%M:%S " +t_fmt "%Z %I:%M:%S %p" % % Appropriate 12 h time representation (%r) t_fmt_ampm "%Z %I:%M:%S %p" diff --git a/localedata/locales/ar_BH b/localedata/locales/ar_BH index ff744dfc9dd..94a6f8b746e 100644 --- a/localedata/locales/ar_BH +++ b/localedata/locales/ar_BH @@ -137,7 +137,7 @@ d_t_fmt "%d %b, %Y %Z %I:%M:%S %p" d_fmt "%d %b, %Y" % % Appropriate time representation -t_fmt "%Z %I:%M:%S " +t_fmt "%Z %I:%M:%S %p" % % Appropriate 12 h time representation (%r) t_fmt_ampm "%Z %I:%M:%S %p" diff --git a/localedata/locales/ar_DZ b/localedata/locales/ar_DZ index 2b744fca28d..420076cf726 100644 --- a/localedata/locales/ar_DZ +++ b/localedata/locales/ar_DZ @@ -142,7 +142,7 @@ d_t_fmt "%d %b, %Y %Z %I:%M:%S %p" d_fmt "%d %b, %Y" % % Appropriate time representation -t_fmt "%Z %I:%M:%S " +t_fmt "%Z %I:%M:%S %p" % % Appropriate 12 h time representation (%r) t_fmt_ampm "%Z %I:%M:%S %p" diff --git a/localedata/locales/ar_EG b/localedata/locales/ar_EG index c8cb3180bfb..2ec46b10d2e 100644 --- a/localedata/locales/ar_EG +++ b/localedata/locales/ar_EG @@ -140,7 +140,7 @@ d_t_fmt "%d %b, %Y %Z %I:%M:%S %p" d_fmt "%d %b, %Y" % % Appropriate time representation -t_fmt "%Z %I:%M:%S " +t_fmt "%Z %I:%M:%S %p" % % Appropriate 12 h time representation (%r) t_fmt_ampm "%Z %I:%M:%S %p" diff --git a/localedata/locales/ar_IN b/localedata/locales/ar_IN index 82fa3a6fff0..85116e5e9cf 100644 --- a/localedata/locales/ar_IN +++ b/localedata/locales/ar_IN @@ -106,7 +106,7 @@ d_t_fmt "%A %d %B %Y %I:%M:%S %p %Z" d_fmt "%-d//%-m//%y" % % Appropriate time representation -t_fmt "%I:%M:%S %Z" +t_fmt "%I:%M:%S %p %Z" % % Appropriate 12 h time representation (%r) t_fmt_ampm "%I:%M:%S %p %Z" diff --git a/localedata/locales/ar_IQ b/localedata/locales/ar_IQ index 333871c4ad1..2483b041675 100644 --- a/localedata/locales/ar_IQ +++ b/localedata/locales/ar_IQ @@ -142,7 +142,7 @@ d_t_fmt "%d %b, %Y %Z %I:%M:%S %p" d_fmt "%d %b, %Y" % % Appropriate time representation -t_fmt "%Z %I:%M:%S " +t_fmt "%Z %I:%M:%S %p" % % Appropriate 12 h time representation (%r) t_fmt_ampm "%Z %I:%M:%S %p" diff --git a/localedata/locales/ar_JO b/localedata/locales/ar_JO index 748515e0bc5..5d532b4ac46 100644 --- a/localedata/locales/ar_JO +++ b/localedata/locales/ar_JO @@ -154,7 +154,7 @@ d_t_fmt "%d %b, %Y %Z %I:%M:%S %p" d_fmt "%d %b, %Y" % % Appropriate time representation -t_fmt "%Z %I:%M:%S " +t_fmt "%Z %I:%M:%S %p" % % Appropriate 12 h time representation (%r) t_fmt_ampm "%Z %I:%M:%S %p" diff --git a/localedata/locales/ar_KW b/localedata/locales/ar_KW index 617df5df899..bec97f3dadf 100644 --- a/localedata/locales/ar_KW +++ b/localedata/locales/ar_KW @@ -136,7 +136,7 @@ d_t_fmt "%d %b, %Y %Z %I:%M:%S %p" d_fmt "%d %b, %Y" % % Appropriate time representation -t_fmt "%Z %I:%M:%S " +t_fmt "%Z %I:%M:%S %p" % % Appropriate 12 h time representation (%r) t_fmt_ampm "%Z %I:%M:%S %p" diff --git a/localedata/locales/ar_LB b/localedata/locales/ar_LB index 85a38c2a274..0c1405b37ab 100644 --- a/localedata/locales/ar_LB +++ b/localedata/locales/ar_LB @@ -153,7 +153,7 @@ d_t_fmt "%d %b, %Y %Z %I:%M:%S %p" d_fmt "%d %b, %Y" % % Appropriate time representation -t_fmt "%Z %I:%M:%S " +t_fmt "%Z %I:%M:%S %p" % % Appropriate 12 h time representation (%r) t_fmt_ampm "%Z %I:%M:%S %p" diff --git a/localedata/locales/ar_LY b/localedata/locales/ar_LY index bcf04f05034..c6bbee43bc1 100644 --- a/localedata/locales/ar_LY +++ b/localedata/locales/ar_LY @@ -136,7 +136,7 @@ d_t_fmt "%d %b, %Y %Z %I:%M:%S %p" d_fmt "%d %b, %Y" % % Appropriate time representation -t_fmt "%Z %I:%M:%S " +t_fmt "%Z %I:%M:%S %p" % % Appropriate 12 h time representation (%r) t_fmt_ampm "%Z %I:%M:%S %p" diff --git a/localedata/locales/ar_MA b/localedata/locales/ar_MA index 78e10ab415a..88890f71e63 100644 --- a/localedata/locales/ar_MA +++ b/localedata/locales/ar_MA @@ -136,16 +136,16 @@ mon "";/ am_pm "";"" % % Appropriate date and time representation -d_t_fmt "%d %b, %Y %Z %I:%M:%S %p" +d_t_fmt "%d %b, %Y %Z %H:%M:%S" % % Appropriate date representation d_fmt "%d %b, %Y" % % Appropriate time representation -t_fmt "%Z %I:%M:%S " +t_fmt "%Z %H:%M:%S" % % Appropriate 12 h time representation (%r) -t_fmt_ampm "%Z %I:%M:%S %p" +t_fmt_ampm "" week 7;19971130;1 first_weekday 7 first_workday 1 diff --git a/localedata/locales/ar_OM b/localedata/locales/ar_OM index 950f60c6806..00fae2b94ea 100644 --- a/localedata/locales/ar_OM +++ b/localedata/locales/ar_OM @@ -136,7 +136,7 @@ d_t_fmt "%d %b, %Y %Z %I:%M:%S %p" d_fmt "%d %b, %Y" % % Appropriate time representation -t_fmt "%Z %I:%M:%S " +t_fmt "%Z %I:%M:%S %p" % % Appropriate 12 h time representation (%r) t_fmt_ampm "%Z %I:%M:%S %p" diff --git a/localedata/locales/ar_QA b/localedata/locales/ar_QA index f0f2e0cf19e..cedfedcdf34 100644 --- a/localedata/locales/ar_QA +++ b/localedata/locales/ar_QA @@ -136,7 +136,7 @@ d_t_fmt "%d %b, %Y %Z %I:%M:%S %p" d_fmt "%d %b, %Y" % % Appropriate time representation -t_fmt "%Z %I:%M:%S " +t_fmt "%Z %I:%M:%S %p" % % Appropriate 12 h time representation (%r) t_fmt_ampm "%Z %I:%M:%S %p" diff --git a/localedata/locales/ar_SD b/localedata/locales/ar_SD index d5d89b1e6e3..d8e9112d56e 100644 --- a/localedata/locales/ar_SD +++ b/localedata/locales/ar_SD @@ -142,7 +142,7 @@ d_t_fmt "%d %b, %Y %Z %I:%M:%S %p" d_fmt "%d %b, %Y" % % Appropriate time representation -t_fmt "%Z %I:%M:%S " +t_fmt "%Z %I:%M:%S %p" % % Appropriate 12 h time representation (%r) t_fmt_ampm "%Z %I:%M:%S %p" diff --git a/localedata/locales/ar_SS b/localedata/locales/ar_SS index 24b859549df..cfd3ea45d01 100644 --- a/localedata/locales/ar_SS +++ b/localedata/locales/ar_SS @@ -141,7 +141,7 @@ d_t_fmt "%d %b, %Y %Z %I:%M:%S %p" d_fmt "%d %b, %Y" % % Appropriate time representation -t_fmt "%Z %I:%M:%S " +t_fmt "%Z %I:%M:%S %p" % % Appropriate 12 h time representation (%r) t_fmt_ampm "%Z %I:%M:%S %p" diff --git a/localedata/locales/ar_SY b/localedata/locales/ar_SY index 996df663f53..b786f685c61 100644 --- a/localedata/locales/ar_SY +++ b/localedata/locales/ar_SY @@ -153,7 +153,7 @@ d_t_fmt "%d %b, %Y %Z %I:%M:%S %p" d_fmt "%d %b, %Y" % % Appropriate time representation -t_fmt "%Z %I:%M:%S " +t_fmt "%Z %I:%M:%S %p" % % Appropriate 12 h time representation (%r) t_fmt_ampm "%Z %I:%M:%S %p" diff --git a/localedata/locales/ar_TN b/localedata/locales/ar_TN index e0033f9e38a..d4daf2c9e97 100644 --- a/localedata/locales/ar_TN +++ b/localedata/locales/ar_TN @@ -142,7 +142,7 @@ d_t_fmt "%d %b, %Y %Z %I:%M:%S %p" d_fmt "%d %b, %Y" % % Appropriate time representation -t_fmt "%Z %I:%M:%S " +t_fmt "%Z %I:%M:%S %p" % % Appropriate 12 h time representation (%r) t_fmt_ampm "%Z %I:%M:%S %p" diff --git a/localedata/locales/ar_YE b/localedata/locales/ar_YE index ba4d9f95b08..a0ad9ca130a 100644 --- a/localedata/locales/ar_YE +++ b/localedata/locales/ar_YE @@ -136,7 +136,7 @@ d_t_fmt "%d %b, %Y %Z %I:%M:%S %p" d_fmt "%d %b, %Y" % % Appropriate time representation -t_fmt "%Z %I:%M:%S " +t_fmt "%Z %I:%M:%S %p" % % Appropriate 12 h time representation (%r) t_fmt_ampm "%Z %I:%M:%S %p" diff --git a/localedata/locales/bg_BG b/localedata/locales/bg_BG index 7a9cfa0a5d4..f2136cdb163 100644 --- a/localedata/locales/bg_BG +++ b/localedata/locales/bg_BG @@ -276,7 +276,7 @@ d_t_fmt "%x (%a) %X %Z" d_fmt "%e.%m.%Y" t_fmt "%k:%M:%S" am_pm "";"" -t_fmt_ampm "%l:%M:%S" +t_fmt_ampm "" % week 7;19971130;4 first_weekday 2 diff --git a/localedata/locales/bhb_IN b/localedata/locales/bhb_IN index 42b95c68440..df723360c90 100644 --- a/localedata/locales/bhb_IN +++ b/localedata/locales/bhb_IN @@ -111,7 +111,7 @@ d_t_fmt "%A %d %b %Y %I:%M:%S %p %Z" d_fmt "%-d//%-m//%y" % % Appropriate time representation -t_fmt "%I:%M:%S %Z" +t_fmt "%I:%M:%S %p %Z" % % Appropriate 12 h time representation (%r) t_fmt_ampm "%I:%M:%S %p %Z" diff --git a/localedata/locales/bho_IN b/localedata/locales/bho_IN index d96cc4a9022..851e4b5ace4 100644 --- a/localedata/locales/bho_IN +++ b/localedata/locales/bho_IN @@ -117,7 +117,7 @@ d_t_fmt "%A %d %b %Y %I:%M:%S %p %Z" d_fmt "%-d//%-m//%y" % % Appropriate time representation -t_fmt "%I:%M:%S %Z" +t_fmt "%I:%M:%S %p %Z" % % Appropriate 12 h time representation (%r) t_fmt_ampm "%I:%M:%S %p %Z" diff --git a/localedata/locales/bi_VU b/localedata/locales/bi_VU index 88bf70a61b6..15787b93f98 100644 --- a/localedata/locales/bi_VU +++ b/localedata/locales/bi_VU @@ -102,7 +102,7 @@ d_t_fmt "%A %d %b %Y %I:%M:%S %p %Z" d_fmt "%A %d %b %Y" % % Appropriate time representation -t_fmt "%I:%M:%S %Z" +t_fmt "%I:%M:%S %p %Z" % Equivalent of AM PM am_pm "AM";"PM" % diff --git a/localedata/locales/bn_BD b/localedata/locales/bn_BD index 73efd1cbc3e..214c805c839 100644 --- a/localedata/locales/bn_BD +++ b/localedata/locales/bn_BD @@ -137,7 +137,7 @@ mon "";/ am_pm "";"" d_t_fmt "%A %d %b %Y %I:%M:%S %p %Z" d_fmt "%-d//%-m//%y" -t_fmt "%I:%M:%S %Z" +t_fmt "%I:%M:%S %p %Z" t_fmt_ampm "%I:%M:%S %p %Z" week 7;19971130;1 first_weekday 6 diff --git a/localedata/locales/bn_IN b/localedata/locales/bn_IN index 72bbae68f79..ad22b893d4e 100644 --- a/localedata/locales/bn_IN +++ b/localedata/locales/bn_IN @@ -124,7 +124,7 @@ d_t_fmt "%A %d %b %Y %I:%M:%S %p %Z" d_fmt "%-d//%-m//%y" % % Appropriate time representation -t_fmt "%I:%M:%S %Z" +t_fmt "%I:%M:%S %p %Z" % % Appropriate 12 h time representation (%r) t_fmt_ampm "%I:%M:%S %p %Z" diff --git a/localedata/locales/brx_IN b/localedata/locales/brx_IN index 7d253effcc1..db775705ca7 100644 --- a/localedata/locales/brx_IN +++ b/localedata/locales/brx_IN @@ -120,7 +120,7 @@ d_t_fmt "%A %d %b %Y %I:%M:%S %p %Z" d_fmt "%-m//%-d//%y" % % Appropriate time representation -t_fmt "%I:%M:%S %Z" +t_fmt "%I:%M:%S %p %Z" % % Appropriate 12 h time representation (%r) t_fmt_ampm "%I:%M:%S %p %Z" diff --git a/localedata/locales/byn_ER b/localedata/locales/byn_ER index 53ed9597deb..608378d205a 100644 --- a/localedata/locales/byn_ER +++ b/localedata/locales/byn_ER @@ -196,11 +196,11 @@ d_fmt "%d//%m//%Y" % % Appropriate time representation (%X) % -t_fmt "%l:%M:%S" +t_fmt "%l:%M:%S %p" % % Appropriate AM/PM time representation (%r) % -t_fmt_ampm "%X %p" +t_fmt_ampm "%l:%M:%S %p" % % Appropriate date and time representation (%c) % "%A፡ %B %e ዮም %Y %r %Z diff --git a/localedata/locales/cs_CZ b/localedata/locales/cs_CZ index 41fbd2be934..f6b97313901 100644 --- a/localedata/locales/cs_CZ +++ b/localedata/locales/cs_CZ @@ -367,7 +367,7 @@ d_fmt "%-d.%-m.%Y" t_fmt "%H:%M:%S" -t_fmt_ampm "%I:%M:%S" +t_fmt_ampm "" am_pm "";"" diff --git a/localedata/locales/doi_IN b/localedata/locales/doi_IN index 02dce6bbfea..f6288679b09 100644 --- a/localedata/locales/doi_IN +++ b/localedata/locales/doi_IN @@ -119,7 +119,7 @@ d_t_fmt "%A %d %b %Y %I:%M:%S %p %Z" d_fmt "%-d//%-m//%y" % % Appropriate time representation -t_fmt "%I:%M:%S %Z" +t_fmt "%I:%M:%S %p %Z" % % Appropriate 12 h time representation (%r) t_fmt_ampm "%I:%M:%S %p %Z" diff --git a/localedata/locales/en_HK b/localedata/locales/en_HK index 2caf8dec56c..547c0a10d6a 100644 --- a/localedata/locales/en_HK +++ b/localedata/locales/en_HK @@ -127,10 +127,10 @@ d_t_fmt "%A, %B %d, %Y %p%I:%M:%S %Z" d_fmt "%A, %B %d, %Y" % % Appropriate time representation -t_fmt "%I:%M:%S %Z" +t_fmt "%I:%M:%S %p %Z" % % Appropriate 12 h time representation (%r) -t_fmt_ampm "%p%I:%M:%S %Z" +t_fmt_ampm "%I:%M:%S %p %Z" % week 7;19971130;1 END LC_TIME diff --git a/localedata/locales/en_IN b/localedata/locales/en_IN index 32cfe85b0c5..e932931f5d5 100644 --- a/localedata/locales/en_IN +++ b/localedata/locales/en_IN @@ -108,7 +108,7 @@ d_t_fmt "%A %d %B %Y %I:%M:%S %p %Z" d_fmt "%d//%m//%y" % % Appropriate time representation -t_fmt "%I:%M:%S %Z" +t_fmt "%I:%M:%S %p %Z" % % Appropriate 12 h time representation (%r) t_fmt_ampm "%I:%M:%S %p %Z" diff --git a/localedata/locales/en_PH b/localedata/locales/en_PH index 074c9a5b22d..e73fce98ff9 100644 --- a/localedata/locales/en_PH +++ b/localedata/locales/en_PH @@ -130,7 +130,7 @@ d_t_fmt "%A, %d %B, %Y %I:%M:%S %p %Z" d_fmt "%A, %d %B, %Y" % % Appropriate time representation -t_fmt "%I:%M:%S %Z" +t_fmt "%I:%M:%S %p %Z" % % Appropriate 12 h time representation (%r) t_fmt_ampm "%I:%M:%S %p %Z" diff --git a/localedata/locales/gez_ER b/localedata/locales/gez_ER index 351c8e9fc7a..261f9da0aab 100644 --- a/localedata/locales/gez_ER +++ b/localedata/locales/gez_ER @@ -192,11 +192,11 @@ d_fmt "%d//%m//%Y" % % Appropriate time representation (%X) % -t_fmt "%l:%M:%S" +t_fmt "%l:%M:%S%p" % % Appropriate AM/PM time representation (%r) % -t_fmt_ampm "%X%p" +t_fmt_ampm "%l:%M:%S%p" % % Appropriate date and time representation (%c) % "%A፥%B፡%e፡መዓልት፡%Y፡%r፡%Z" diff --git a/localedata/locales/gez_ET b/localedata/locales/gez_ET index ae38783827d..bc8e0d392eb 100644 --- a/localedata/locales/gez_ET +++ b/localedata/locales/gez_ET @@ -193,11 +193,11 @@ d_fmt "%d//%m//%Y" % % Appropriate time representation (%X) % -t_fmt "%l:%M:%S" +t_fmt "%l:%M:%S%p" % % Appropriate AM/PM time representation (%r) % -t_fmt_ampm "%X%p" +t_fmt_ampm "%l:%M:%S%p" % % Appropriate date and time representation (%c) % "%A፥%B፡%e፡መዓልት፡%Y፡%r፡%Z" diff --git a/localedata/locales/gu_IN b/localedata/locales/gu_IN index cd7e23a4bec..e80d5516135 100644 --- a/localedata/locales/gu_IN +++ b/localedata/locales/gu_IN @@ -151,7 +151,7 @@ d_t_fmt "%A %d %b %Y %I:%M:%S %p %Z" d_fmt "%-d//%-m//%y" % % Appropriate time representation -t_fmt "%I:%M:%S %Z" +t_fmt "%I:%M:%S %p %Z" % % Appropriate 12 h time representation (%r) t_fmt_ampm "%I:%M:%S %p %Z" diff --git a/localedata/locales/hi_IN b/localedata/locales/hi_IN index a94365519fe..a7614fbaa6e 100644 --- a/localedata/locales/hi_IN +++ b/localedata/locales/hi_IN @@ -167,7 +167,7 @@ d_t_fmt "%A %d %b %Y %I:%M:%S %p %Z" d_fmt "%-d//%-m//%y" % % Appropriate time representation -t_fmt "%I:%M:%S %Z" +t_fmt "%I:%M:%S %p %Z" % % Appropriate 12 h time representation (%r) t_fmt_ampm "%I:%M:%S %p %Z" diff --git a/localedata/locales/hif_FJ b/localedata/locales/hif_FJ index 5433bb4a2a5..4d61d1d6222 100644 --- a/localedata/locales/hif_FJ +++ b/localedata/locales/hif_FJ @@ -96,13 +96,16 @@ mon "January";/ am_pm "Purvahan";"Aparaahna" % % Appropriate date and time representation -d_t_fmt "%A %d %b %Y %I:%M:%S %Z" +d_t_fmt "%A %d %b %Y %I:%M:%S %p" +% +% Appropriate date and time representation for date(1) +date_fmt "%A %d %b %Y %I:%M:%S %p %Z" % % Appropriate date representation d_fmt "%A %d %b %Y" % % Appropriate time representation -t_fmt "%I:%M:%S %Z" +t_fmt "%I:%M:%S %p %Z" % % Appropriate 12 h time representation (%r) t_fmt_ampm "%I:%M:%S %p %Z" diff --git a/localedata/locales/hne_IN b/localedata/locales/hne_IN index 3de008e001e..61fc7fa2c3a 100644 --- a/localedata/locales/hne_IN +++ b/localedata/locales/hne_IN @@ -117,7 +117,7 @@ d_t_fmt "%A %d %b %Y %I:%M:%S %p %Z" d_fmt "%-d//%-m//%y" % % Appropriate time representation -t_fmt "%I:%M:%S %Z" +t_fmt "%I:%M:%S %p %Z" % % Appropriate 12 h time representation (%r) t_fmt_ampm "%I:%M:%S %p %Z" diff --git a/localedata/locales/kn_IN b/localedata/locales/kn_IN index b6443d12c8c..4b3b5cff754 100644 --- a/localedata/locales/kn_IN +++ b/localedata/locales/kn_IN @@ -154,7 +154,7 @@ d_t_fmt "%A %d %b %Y %I:%M:%S %p %Z" d_fmt "%-d//%-m//%y" % % Appropriate time representation -t_fmt "%I:%M:%S %Z" +t_fmt "%I:%M:%S %p %Z" % % Appropriate 12 h time representation (%r) t_fmt_ampm "%I:%M:%S %p %Z" diff --git a/localedata/locales/kok_IN b/localedata/locales/kok_IN index 5eed1af0e39..ed0090ae768 100644 --- a/localedata/locales/kok_IN +++ b/localedata/locales/kok_IN @@ -117,7 +117,7 @@ d_t_fmt "%A %d %b %Y %I:%M:%S %p %Z" d_fmt "%-d-%-m-%y" % % Appropriate time representation -t_fmt "%I:%M:%S %Z" +t_fmt "%I:%M:%S %p %Z" % % Appropriate 12 h time representation (%r) t_fmt_ampm "%I:%M:%S %p %Z" diff --git a/localedata/locales/ks_IN b/localedata/locales/ks_IN index 9ab87079228..4ab05a79dc7 100644 --- a/localedata/locales/ks_IN +++ b/localedata/locales/ks_IN @@ -127,7 +127,7 @@ d_t_fmt "%A %d %b %Y %I:%M:%S %p %Z" d_fmt "%-m//%-d//%y" % % Appropriate time representation -t_fmt "%I:%M:%S %Z" +t_fmt "%I:%M:%S %p %Z" % % Appropriate 12 h time representation (%r) t_fmt_ampm "%I:%M:%S %p %Z" diff --git a/localedata/locales/ks_IN@devanagari b/localedata/locales/ks_IN@devanagari index 72841eb6c2a..3273affedd3 100644 --- a/localedata/locales/ks_IN@devanagari +++ b/localedata/locales/ks_IN@devanagari @@ -119,7 +119,7 @@ d_t_fmt "%A %d %b %Y %I:%M:%S %p %Z" d_fmt "%-m//%-d//%y" % % Appropriate time representation -t_fmt "%I:%M:%S %Z" +t_fmt "%I:%M:%S %p %Z" % % Appropriate 12 h time representation (%r) t_fmt_ampm "%I:%M:%S %p %Z" diff --git a/localedata/locales/mag_IN b/localedata/locales/mag_IN index 93282a98784..09c169bd1c2 100644 --- a/localedata/locales/mag_IN +++ b/localedata/locales/mag_IN @@ -118,7 +118,7 @@ d_t_fmt "%A %d %b %Y %I:%M:%S %p %Z" d_fmt "%-d//%-m//%y" % % Appropriate time representation -t_fmt "%I:%M:%S %Z" +t_fmt "%I:%M:%S %p %Z" % % Appropriate 12 h time representation (%r) t_fmt_ampm "%I:%M:%S %p %Z" diff --git a/localedata/locales/mai_IN b/localedata/locales/mai_IN index a8fdc86ebc2..50ba5aa4348 100644 --- a/localedata/locales/mai_IN +++ b/localedata/locales/mai_IN @@ -120,7 +120,7 @@ d_t_fmt "%A %d %b %Y %I:%M:%S %p %Z" d_fmt "%-d//%-m//%y" % % Appropriate time representation -t_fmt "%I:%M:%S %Z" +t_fmt "%I:%M:%S %p %Z" % % Appropriate 12 h time representation (%r) t_fmt_ampm "%I:%M:%S %p %Z" diff --git a/localedata/locales/mjw_IN b/localedata/locales/mjw_IN index cc573cf8c19..5c7629f704f 100644 --- a/localedata/locales/mjw_IN +++ b/localedata/locales/mjw_IN @@ -92,7 +92,7 @@ d_t_fmt "%A %d %B %Y %I:%M:%S %p %Z" d_fmt "%-d//%-m//%y" % Appropriate time representation -t_fmt "%I:%M:%S %Z" +t_fmt "%I:%M:%S %p %Z" % Appropriate 12 h time representation (%r) t_fmt_ampm "%I:%M:%S %p %Z" diff --git a/localedata/locales/ml_IN b/localedata/locales/ml_IN index d7a8f43f1e5..2857a975549 100644 --- a/localedata/locales/ml_IN +++ b/localedata/locales/ml_IN @@ -298,7 +298,7 @@ d_t_fmt "%A %d %B %Y %I:%M:%S %p %Z" d_fmt "%-d//%-m//%y" % % Appropriate time representation -t_fmt "%I:%M:%S %Z" +t_fmt "%I:%M:%S %p %Z" % % Appropriate 12 h time representation (%r) t_fmt_ampm "%I:%M:%S %p %Z" diff --git a/localedata/locales/mni_IN b/localedata/locales/mni_IN index 256c8db8324..831eff09105 100644 --- a/localedata/locales/mni_IN +++ b/localedata/locales/mni_IN @@ -119,7 +119,7 @@ d_t_fmt "%A %d %b %Y %I:%M:%S %p %Z" d_fmt "%-d//%-m//%y" % % Appropriate time representation -t_fmt "%I:%M:%S %Z" +t_fmt "%I:%M:%S %p %Z" % % Appropriate 12 h time representation (%r) t_fmt_ampm "%I:%M:%S %p %Z" diff --git a/localedata/locales/mr_IN b/localedata/locales/mr_IN index 0ad08f7b3bd..fc75268a332 100644 --- a/localedata/locales/mr_IN +++ b/localedata/locales/mr_IN @@ -194,7 +194,7 @@ d_t_fmt "%A %d %b %Y %I:%M:%S %p %Z" d_fmt "%-d//%-m//%y" % % Appropriate time representation -t_fmt "%I:%M:%S %Z" +t_fmt "%I:%M:%S %p %Z" % % Appropriate 12 h time representation (%r) t_fmt_ampm "%I:%M:%S %p %Z" diff --git a/localedata/locales/ms_MY b/localedata/locales/ms_MY index 66b5dd98e99..275cfbcf273 100644 --- a/localedata/locales/ms_MY +++ b/localedata/locales/ms_MY @@ -138,7 +138,7 @@ d_t_fmt "%A %d %b %Y %I:%M:%S %p %Z" d_fmt "%A %d %b %Y" % % Appropriate time representation -t_fmt "%I:%M:%S %Z" +t_fmt "%I:%M:%S %p %Z" % % Appropriate 12 h time representation (%r) t_fmt_ampm "%I:%M:%S %p %Z" diff --git a/localedata/locales/mt_MT b/localedata/locales/mt_MT index a6ab7b1dadb..b56b6baab40 100644 --- a/localedata/locales/mt_MT +++ b/localedata/locales/mt_MT @@ -212,16 +212,16 @@ mon "Jannar";/ am_pm "";"" % % Appropriate date and time representation -d_t_fmt "%A, %d ta %b, %Y %I:%M:%S %p %Z" +d_t_fmt "%A, %d ta %b, %Y %H:%M:%S %Z" % % Appropriate date representation d_fmt "%A, %d ta %b, %Y" % % Appropriate time representation -t_fmt "%I:%M:%S %Z" +t_fmt "%H:%M:%S %Z" % % Appropriate 12 h time representation (%r) -t_fmt_ampm "%I:%M:%S %p %Z" +t_fmt_ampm "" week 7;19971130;1 END LC_TIME diff --git a/localedata/locales/om_ET b/localedata/locales/om_ET index dcef30e385f..881b43fb176 100644 --- a/localedata/locales/om_ET +++ b/localedata/locales/om_ET @@ -208,10 +208,10 @@ am_pm "WD";"WB" d_fmt "%d//%m//%Y" % % Appropriate time representation (%X) -t_fmt "%l:%M:%S" +t_fmt "%l:%M:%S %p" % % Appropriate AM/PM time representation (%r) -t_fmt_ampm "%X %p" +t_fmt_ampm "%l:%M:%S %p" % % Appropriate date and time representation (%c) d_t_fmt "%A, %B %e, %Y %r %Z" diff --git a/localedata/locales/pa_IN b/localedata/locales/pa_IN index ca28f21162d..a1ef516251e 100644 --- a/localedata/locales/pa_IN +++ b/localedata/locales/pa_IN @@ -146,7 +146,7 @@ d_t_fmt "%A %d %b %Y %I:%M:%S %p %Z" d_fmt "%-d//%-m//%y" % % Appropriate time representation -t_fmt "%I:%M:%S %Z" +t_fmt "%I:%M:%S %p %Z" % % Appropriate 12 h time representation (%r) t_fmt_ampm "%I:%M:%S %p %Z" diff --git a/localedata/locales/raj_IN b/localedata/locales/raj_IN index e4d30b7d6f5..9dd10267c28 100644 --- a/localedata/locales/raj_IN +++ b/localedata/locales/raj_IN @@ -129,7 +129,7 @@ d_t_fmt "%A %d %b %Y %I:%M:%S %p %Z" d_fmt "%-d//%-m//%y" % % Appropriate time representation -t_fmt "%I:%M:%S %Z" +t_fmt "%I:%M:%S %p %Z" % % Appropriate 12 h time representation (%r) t_fmt_ampm "%I:%M:%S %p %Z" diff --git a/localedata/locales/sa_IN b/localedata/locales/sa_IN index 4eaf6fe1fe3..362294af5a3 100644 --- a/localedata/locales/sa_IN +++ b/localedata/locales/sa_IN @@ -155,7 +155,7 @@ d_t_fmt "%A %d %b %Y %I:%M:%S %p %Z" d_fmt "%-d-%m-%y" % % Appropriate time representation -t_fmt "%I:%M:%S %Z" +t_fmt "%I:%M:%S %p %Z" % % Appropriate 12 h time representation (%r) t_fmt_ampm "%I:%M:%S %p %Z" diff --git a/localedata/locales/sat_IN b/localedata/locales/sat_IN index d7b92f69b32..f73d4ac121a 100644 --- a/localedata/locales/sat_IN +++ b/localedata/locales/sat_IN @@ -119,7 +119,7 @@ d_t_fmt "%A %d %b %Y %I:%M:%S %p %Z" d_fmt "%-d//%-m//%y" % % Appropriate time representation -t_fmt "%I:%M:%S %Z" +t_fmt "%I:%M:%S %p %Z" % % Appropriate 12 h time representation (%r) t_fmt_ampm "%I:%M:%S %p %Z" diff --git a/localedata/locales/sd_IN b/localedata/locales/sd_IN index e5ab80b062c..08a9ba1071b 100644 --- a/localedata/locales/sd_IN +++ b/localedata/locales/sd_IN @@ -127,7 +127,7 @@ d_t_fmt "%A %d %b %Y %I:%M:%S %p %Z" d_fmt "%-d//%-m//%y" % % Appropriate time representation -t_fmt "%I:%M:%S %Z" +t_fmt "%I:%M:%S %p %Z" % % Appropriate 12 h time representation (%r) t_fmt_ampm "%I:%M:%S %p %Z" diff --git a/localedata/locales/sd_IN@devanagari b/localedata/locales/sd_IN@devanagari index d57cea639b3..509845132ec 100644 --- a/localedata/locales/sd_IN@devanagari +++ b/localedata/locales/sd_IN@devanagari @@ -124,7 +124,7 @@ d_t_fmt "%A %d %b %Y %I:%M:%S %p %Z" d_fmt "%-d//%-m//%y" % % Appropriate time representation -t_fmt "%I:%M:%S %Z" +t_fmt "%I:%M:%S %p %Z" % % Appropriate 12 h time representation (%r) t_fmt_ampm "%I:%M:%S %p %Z" diff --git a/localedata/locales/sid_ET b/localedata/locales/sid_ET index ce67a7ad545..fd564453af9 100644 --- a/localedata/locales/sid_ET +++ b/localedata/locales/sid_ET @@ -202,11 +202,11 @@ d_fmt "%d//%m//%Y" % % Appropriate time representation (%X) % -t_fmt "%l:%M:%S" +t_fmt "%l:%M:%S %p" % % Appropriate AM/PM time representation (%r) % -t_fmt_ampm "%X %p" +t_fmt_ampm "%l:%M:%S %p" % % Appropriate date and time representation (%c) % diff --git a/localedata/locales/sk_SK b/localedata/locales/sk_SK index 94e6e12bb24..b923741cbe0 100644 --- a/localedata/locales/sk_SK +++ b/localedata/locales/sk_SK @@ -172,7 +172,7 @@ d_fmt "%d.%m.%Y" t_fmt "%H:%M:%S" -t_fmt_ampm "%I:%M:%S" +t_fmt_ampm "" am_pm "";"" diff --git a/localedata/locales/so_DJ b/localedata/locales/so_DJ index 3fd5cc030d1..a21297731e1 100644 --- a/localedata/locales/so_DJ +++ b/localedata/locales/so_DJ @@ -202,11 +202,11 @@ d_fmt "%d.%m.%Y" % % Appropriate time representation (%X) % -t_fmt "%l:%M:%S" +t_fmt "%l:%M:%S %p" % % Appropriate AM/PM time representation (%r) % -t_fmt_ampm "%X %p" +t_fmt_ampm "%l:%M:%S %p" % % Appropriate date and time representation (%c) % diff --git a/localedata/locales/so_ET b/localedata/locales/so_ET index 4da4f15726a..2f8fe420ccc 100644 --- a/localedata/locales/so_ET +++ b/localedata/locales/so_ET @@ -199,11 +199,11 @@ d_fmt "%d//%m//%Y" % % Appropriate time representation (%X) % -t_fmt "%l:%M:%S" +t_fmt "%l:%M:%S %p" % % Appropriate AM/PM time representation (%r) % -t_fmt_ampm "%X %p" +t_fmt_ampm "%l:%M:%S %p" % % Appropriate date and time representation (%c) % diff --git a/localedata/locales/so_KE b/localedata/locales/so_KE index d434f37cbe7..18ef57adbea 100644 --- a/localedata/locales/so_KE +++ b/localedata/locales/so_KE @@ -199,19 +199,19 @@ d_fmt "%d//%m//%Y" % % Appropriate time representation (%X) % -t_fmt "%l:%M:%S" +t_fmt "%T" % % Appropriate AM/PM time representation (%r) % -t_fmt_ampm "%X %p" +t_fmt_ampm "" % % Appropriate date and time representation (%c) % -d_t_fmt "%A, %B %e, %Y %r %Z" +d_t_fmt "%A, %B %e, %Y %X %Z" % % Appropriate date representation (date(1)) % -date_fmt "%A, %B %e, %r %Z %Y" +date_fmt "%A, %B %e, %X %Z %Y" % week 7;19971130;1 END LC_TIME diff --git a/localedata/locales/so_SO b/localedata/locales/so_SO index 713bf79608a..b0a935ee713 100644 --- a/localedata/locales/so_SO +++ b/localedata/locales/so_SO @@ -247,11 +247,11 @@ d_fmt "%d//%m//%Y" % % Appropriate time representation (%X) % -t_fmt "%l:%M:%S" +t_fmt "%l:%M:%S %p" % % Appropriate AM/PM time representation (%r) % -t_fmt_ampm "%X %p" +t_fmt_ampm "%l:%M:%S %p" % % Appropriate date and time representation (%c) % diff --git a/localedata/locales/ta_IN b/localedata/locales/ta_IN index 5a083d26589..5e40629ff1f 100644 --- a/localedata/locales/ta_IN +++ b/localedata/locales/ta_IN @@ -127,16 +127,16 @@ mon "";"< am_pm "";"" % % Appropriate date and time representation -d_t_fmt "%A %d %B %Y %I:%M:%S %p %Z" +d_t_fmt "%A %d %B %Y %p %I:%M:%S %Z" % % Appropriate date representation d_fmt "%-d//%-m//%y" % % Appropriate time representation -t_fmt "%I:%M:%S %Z" +t_fmt "%p %I:%M:%S %Z" % % Appropriate 12 h time representation (%r) -t_fmt_ampm "%I:%M:%S %p %Z" +t_fmt_ampm "%p %I:%M:%S %Z" % week 7;19971130;1 END LC_TIME diff --git a/localedata/locales/ta_LK b/localedata/locales/ta_LK index c843f892ce3..ca5c1165c24 100644 --- a/localedata/locales/ta_LK +++ b/localedata/locales/ta_LK @@ -85,10 +85,10 @@ mon "";"< "";"";/ "";"" am_pm "";"" -d_t_fmt "%A %d %B %Y %I:%M:%S %p %Z" +d_t_fmt "%A %d %B %Y %H:%M:%S %Z" d_fmt "%-d//%-m//%y" -t_fmt "%I:%M:%S %Z" -t_fmt_ampm "%I:%M:%S %p %Z" +t_fmt "%H:%M:%S %Z" +t_fmt_ampm "" week 7;19971130;1 first_weekday 2 diff --git a/localedata/locales/tcy_IN b/localedata/locales/tcy_IN index ba93d673c8f..a356801352b 100644 --- a/localedata/locales/tcy_IN +++ b/localedata/locales/tcy_IN @@ -130,7 +130,7 @@ d_t_fmt "%A %d %b %Y %I:%M:%S %p %Z" d_fmt "%-d//%-m//%y" % % Appropriate time representation -t_fmt "%I:%M:%S %Z" +t_fmt "%I:%M:%S %p %Z" % % Appropriate 12 h time representation (%r) t_fmt_ampm "%I:%M:%S %p %Z" diff --git a/localedata/locales/the_NP b/localedata/locales/the_NP index 993e62fbfc5..037ffa97f58 100644 --- a/localedata/locales/the_NP +++ b/localedata/locales/the_NP @@ -121,7 +121,7 @@ d_t_fmt "%A %d %b %Y %I:%M:%S %p %Z" d_fmt "%A %d %b %Y" % % Appropriate time representation -t_fmt "%I:%M:%S %Z" +t_fmt "%I:%M:%S %p %Z" % % Appropriate 12 h time representation (%r) t_fmt_ampm "%I:%M:%S %p %Z" diff --git a/localedata/locales/ti_ER b/localedata/locales/ti_ER index 77b9666c5e3..890bbb6d3cd 100644 --- a/localedata/locales/ti_ER +++ b/localedata/locales/ti_ER @@ -239,11 +239,11 @@ d_fmt "%d//%m//%Y" % % Appropriate time representation (%X) % -t_fmt "%l:%M:%S" +t_fmt "%l:%M:%S %p" % % Appropriate AM/PM time representation (%r) % -t_fmt_ampm "%X %p" +t_fmt_ampm "%l:%M:%S %p" % % Appropriate date and time representation (%c) % "%A፡ %B %e መዓልቲ %Y %r %Z diff --git a/localedata/locales/ti_ET b/localedata/locales/ti_ET index 6c387604e91..e7c8ec362b9 100644 --- a/localedata/locales/ti_ET +++ b/localedata/locales/ti_ET @@ -1040,11 +1040,11 @@ d_fmt "%d//%m//%Y" % % Appropriate time representation (%X) % -t_fmt "%l:%M:%S" +t_fmt "%l:%M:%S %p" % % Appropriate AM/PM time representation (%r) % -t_fmt_ampm "%X %p" +t_fmt_ampm "%l:%M:%S %p" % % Appropriate date and time representation (%c) % "%A፣ %B %e መዓልቲ %Y %r %Z diff --git a/localedata/locales/tig_ER b/localedata/locales/tig_ER index d6afaf147d6..403a919580e 100644 --- a/localedata/locales/tig_ER +++ b/localedata/locales/tig_ER @@ -196,11 +196,11 @@ d_fmt "%d//%m//%Y" % % Appropriate time representation (%X) % -t_fmt "%l:%M:%S" +t_fmt "%l:%M:%S %p" % % Appropriate AM/PM time representation (%r) % -t_fmt_ampm "%X %p" +t_fmt_ampm "%l:%M:%S %p" % % Appropriate date and time representation (%c) % "%A፡ %B %e ዮም %Y %r %Z diff --git a/localedata/locales/to_TO b/localedata/locales/to_TO index 7abe8685df8..afffb619ca7 100644 --- a/localedata/locales/to_TO +++ b/localedata/locales/to_TO @@ -91,7 +91,6 @@ abday "Sp";/ "Fal";/ "Tok" % Equivalent of AM PM -% hengihengi, efiafi am_pm "hengihengi";"efiafi" % @@ -102,10 +101,9 @@ d_t_fmt "%A %d %b %Y %I:%M:%S %p %Z" d_fmt "%A %d %b %Y" % % Appropriate time representation -t_fmt "%I:%M:%S %Z" +t_fmt "%I:%M:%S %p %Z" % % Appropriate 12 h time representation (%r) -% %I:%M:%S %p %Z t_fmt_ampm "%I:%M:%S %p %Z" END LC_TIME % diff --git a/localedata/locales/ur_IN b/localedata/locales/ur_IN index 062cbf09372..26a9142bb56 100644 --- a/localedata/locales/ur_IN +++ b/localedata/locales/ur_IN @@ -127,7 +127,7 @@ d_t_fmt "%A %d %b %Y %I:%M:%S %p %Z" d_fmt "%-d//%-m//%y" % % Appropriate time representation -t_fmt "%I:%M:%S %Z" +t_fmt "%I:%M:%S %p %Z" % % Appropriate 12 h time representation (%r) t_fmt_ampm "%I:%M:%S %p %Z" diff --git a/localedata/locales/wal_ET b/localedata/locales/wal_ET index 4811bd8eaf6..65b8e5f5bef 100644 --- a/localedata/locales/wal_ET +++ b/localedata/locales/wal_ET @@ -206,11 +206,11 @@ d_fmt "%d//%m//%Y" % % Appropriate time representation (%X) % -t_fmt "%l:%M:%S" +t_fmt "%l:%M:%S %p" % % Appropriate AM/PM time representation (%r) % -t_fmt_ampm "%X %p" +t_fmt_ampm "%l:%M:%S %p" % % Appropriate date and time representation (%c) % "%A፣ %B %e ጋላሳ %Y %r %Z diff --git a/localedata/locales/zh_HK b/localedata/locales/zh_HK index c130878f3d6..5085c69c395 100644 --- a/localedata/locales/zh_HK +++ b/localedata/locales/zh_HK @@ -133,8 +133,8 @@ d_t_fmt "%Y%m%d %A %H:%M:%S" d_fmt "%Y%m%d %A" % % Appropriate time representation -% %I時%M分%S秒 %Z -t_fmt "%I%M%S %Z" +% %p %I時%M分%S秒 %Z +t_fmt "%p %I%M%S %Z" % % Appropriate 12 h time representation (%r) % Update by Roger So