From 47a8356221f29df5ab5647d49d38efb4dee3446b Mon Sep 17 00:00:00 2001 From: Hajimu UMEMOTO Date: Sun, 19 Jun 2016 03:44:32 +0000 Subject: [PATCH] - Prefer to use %d over %e where the day of the month should be zero filled. - Since %e means the day of the month as well, regard %e as same as %d in md_order. Reported by: vangyzen Approved by: re (gjb) --- share/timedef/ar_JO.UTF-8.src | 2 +- share/timedef/ar_MA.UTF-8.src | 2 +- share/timedef/ar_SA.UTF-8.src | 2 +- share/timedef/be_BY.CP1131.src | 4 ++-- share/timedef/be_BY.CP1251.src | 4 ++-- share/timedef/be_BY.ISO8859-5.src | 4 ++-- share/timedef/be_BY.UTF-8.src | 4 ++-- share/timedef/bg_BG.CP1251.src | 4 ++-- share/timedef/bg_BG.UTF-8.src | 4 ++-- share/timedef/ca_IT.ISO8859-15.src | 4 ++-- share/timedef/ca_IT.UTF-8.src | 4 ++-- share/timedef/el_GR.ISO8859-7.src | 4 ++-- share/timedef/el_GR.UTF-8.src | 4 ++-- share/timedef/en_SG.UTF-8.src | 4 ++-- share/timedef/en_US.UTF-8.src | 4 ++-- share/timedef/es_AR.ISO8859-1.src | 4 ++-- share/timedef/es_CR.UTF-8.src | 4 ++-- share/timedef/es_ES.ISO8859-15.src | 4 ++-- share/timedef/es_ES.UTF-8.src | 4 ++-- share/timedef/fi_FI.ISO8859-15.src | 4 ++-- share/timedef/fi_FI.UTF-8.src | 4 ++-- share/timedef/fr_BE.ISO8859-15.src | 4 ++-- share/timedef/fr_BE.UTF-8.src | 4 ++-- share/timedef/he_IL.UTF-8.src | 4 ++-- share/timedef/hi_IN.ISCII-DEV.src | 4 ++-- share/timedef/hi_IN.UTF-8.src | 4 ++-- share/timedef/is_IS.ISO8859-15.src | 4 ++-- share/timedef/is_IS.UTF-8.src | 4 ++-- share/timedef/ko_KR.UTF-8.src | 2 +- share/timedef/ko_KR.eucKR.src | 2 +- share/timedef/nl_BE.UTF-8.src | 4 ++-- share/timedef/sl_SI.ISO8859-2.src | 2 +- share/timedef/sl_SI.UTF-8.src | 2 +- share/timedef/sr_Cyrl_RS.ISO8859-5.src | 4 ++-- share/timedef/sr_Latn_RS.ISO8859-2.src | 4 ++-- share/timedef/sr_Latn_RS.UTF-8.src | 4 ++-- share/timedef/tr_TR.ISO8859-9.src | 4 ++-- share/timedef/tr_TR.UTF-8.src | 4 ++-- share/timedef/zh_Hans_CN.GB2312.src | 4 ++-- share/timedef/zh_Hans_CN.GBK.src | 4 ++-- share/timedef/zh_Hans_CN.UTF-8.src | 4 ++-- share/timedef/zh_Hans_CN.eucCN.src | 4 ++-- share/timedef/zh_Hant_HK.UTF-8.src | 4 ++-- share/timedef/zh_Hant_TW.Big5.src | 4 ++-- share/timedef/zh_Hant_TW.UTF-8.src | 4 ++-- tools/tools/locale/tools/cldr2def.pl | 15 ++++++++++++--- 46 files changed, 95 insertions(+), 86 deletions(-) diff --git a/share/timedef/ar_JO.UTF-8.src b/share/timedef/ar_JO.UTF-8.src index b2a07235c3d..8fb1f54329a 100644 --- a/share/timedef/ar_JO.UTF-8.src +++ b/share/timedef/ar_JO.UTF-8.src @@ -80,7 +80,7 @@ كانون الأول # # md_order -m +dm # # ampm_fmt %OI:%OM:%OS %p diff --git a/share/timedef/ar_MA.UTF-8.src b/share/timedef/ar_MA.UTF-8.src index 41252a2b849..12e9b8780b0 100644 --- a/share/timedef/ar_MA.UTF-8.src +++ b/share/timedef/ar_MA.UTF-8.src @@ -80,7 +80,7 @@ دجنبر # # md_order -m +dm # # ampm_fmt %I:%M:%S %p diff --git a/share/timedef/ar_SA.UTF-8.src b/share/timedef/ar_SA.UTF-8.src index 142bdd45c10..58528917a77 100644 --- a/share/timedef/ar_SA.UTF-8.src +++ b/share/timedef/ar_SA.UTF-8.src @@ -80,7 +80,7 @@ ديسمبر # # md_order -m +dm # # ampm_fmt %OI:%OM:%OS %p diff --git a/share/timedef/be_BY.CP1131.src b/share/timedef/be_BY.CP1131.src index 1430d6997c1..148add2096e 100644 --- a/share/timedef/be_BY.CP1131.src +++ b/share/timedef/be_BY.CP1131.src @@ -53,7 +53,7 @@ %H.%M.%S # # x_fmt -%e.%m.%y +%d.%m.%y # # c_fmt %A %e %B %Y %H.%M.%S @@ -80,7 +80,7 @@ ᭥ # # md_order -m +dm # # ampm_fmt %I.%M.%S %p diff --git a/share/timedef/be_BY.CP1251.src b/share/timedef/be_BY.CP1251.src index 37829892fa0..e8d688d7a8f 100644 --- a/share/timedef/be_BY.CP1251.src +++ b/share/timedef/be_BY.CP1251.src @@ -53,7 +53,7 @@ %H.%M.%S # # x_fmt -%e.%m.%y +%d.%m.%y # # c_fmt %A %e %B %Y %H.%M.%S @@ -80,7 +80,7 @@ # # md_order -m +dm # # ampm_fmt %I.%M.%S %p diff --git a/share/timedef/be_BY.ISO8859-5.src b/share/timedef/be_BY.ISO8859-5.src index 3d8037dbd16..fa19cb5c06e 100644 --- a/share/timedef/be_BY.ISO8859-5.src +++ b/share/timedef/be_BY.ISO8859-5.src @@ -53,7 +53,7 @@ %H.%M.%S # # x_fmt -%e.%m.%y +%d.%m.%y # # c_fmt %A %e %B %Y %H.%M.%S @@ -80,7 +80,7 @@ # # md_order -m +dm # # ampm_fmt %I.%M.%S %p diff --git a/share/timedef/be_BY.UTF-8.src b/share/timedef/be_BY.UTF-8.src index ee0552fa819..987716b4e32 100644 --- a/share/timedef/be_BY.UTF-8.src +++ b/share/timedef/be_BY.UTF-8.src @@ -53,7 +53,7 @@ %H.%M.%S # # x_fmt -%e.%m.%y +%d.%m.%y # # c_fmt %A %e %B %Y %H.%M.%S @@ -80,7 +80,7 @@ снежань # # md_order -m +dm # # ampm_fmt %I.%M.%S %p diff --git a/share/timedef/bg_BG.CP1251.src b/share/timedef/bg_BG.CP1251.src index 1cef47911e3..1e1a6a5d943 100644 --- a/share/timedef/bg_BG.CP1251.src +++ b/share/timedef/bg_BG.CP1251.src @@ -53,7 +53,7 @@ %H:%M:%S # # x_fmt -%e.%m.%y г. +%d.%m.%y г. # # c_fmt %A %e %B %Y . %H:%M:%S @@ -80,7 +80,7 @@ # # md_order -m +dm # # ampm_fmt %I:%M:%S %p diff --git a/share/timedef/bg_BG.UTF-8.src b/share/timedef/bg_BG.UTF-8.src index e80a7fba7b5..e543fde0e70 100644 --- a/share/timedef/bg_BG.UTF-8.src +++ b/share/timedef/bg_BG.UTF-8.src @@ -53,7 +53,7 @@ %H:%M:%S # # x_fmt -%e.%m.%y г. +%d.%m.%y г. # # c_fmt %A %e %B %Y г. %H:%M:%S @@ -80,7 +80,7 @@ декември # # md_order -m +dm # # ampm_fmt %I:%M:%S %p diff --git a/share/timedef/ca_IT.ISO8859-15.src b/share/timedef/ca_IT.ISO8859-15.src index fdfb05e354c..fa6deed541b 100644 --- a/share/timedef/ca_IT.ISO8859-15.src +++ b/share/timedef/ca_IT.ISO8859-15.src @@ -53,7 +53,7 @@ dissabte %H:%M:%S # # x_fmt -%e/%m/%y +%d/%m/%y # # c_fmt %A %e %B de %Y, %H:%M:%S @@ -80,7 +80,7 @@ de novembre de desembre # # md_order -m +dm # # ampm_fmt %I:%M:%S %p diff --git a/share/timedef/ca_IT.UTF-8.src b/share/timedef/ca_IT.UTF-8.src index 4d983581e5a..58e4c180eb4 100644 --- a/share/timedef/ca_IT.UTF-8.src +++ b/share/timedef/ca_IT.UTF-8.src @@ -53,7 +53,7 @@ dissabte %H:%M:%S # # x_fmt -%e/%m/%y +%d/%m/%y # # c_fmt %A %e %B de %Y, %H:%M:%S @@ -80,7 +80,7 @@ de novembre de desembre # # md_order -m +dm # # ampm_fmt %I:%M:%S %p diff --git a/share/timedef/el_GR.ISO8859-7.src b/share/timedef/el_GR.ISO8859-7.src index 13b25eea20d..15d005554a0 100644 --- a/share/timedef/el_GR.ISO8859-7.src +++ b/share/timedef/el_GR.ISO8859-7.src @@ -53,7 +53,7 @@ %I:%M:%S %p # # x_fmt -%e/%m/%y +%d/%m/%y # # c_fmt %A %e %B %Y - %I:%M:%S %p @@ -80,7 +80,7 @@ # # md_order -m +dm # # ampm_fmt %I:%M:%S %p diff --git a/share/timedef/el_GR.UTF-8.src b/share/timedef/el_GR.UTF-8.src index 13f217b379e..e38342f5ffe 100644 --- a/share/timedef/el_GR.UTF-8.src +++ b/share/timedef/el_GR.UTF-8.src @@ -53,7 +53,7 @@ %I:%M:%S %p # # x_fmt -%e/%m/%y +%d/%m/%y # # c_fmt %A %e %B %Y - %I:%M:%S %p @@ -80,7 +80,7 @@ Δεκέμβριος # # md_order -m +dm # # ampm_fmt %I:%M:%S %p diff --git a/share/timedef/en_SG.UTF-8.src b/share/timedef/en_SG.UTF-8.src index 3fde7c6e312..3dcc2c4c875 100644 --- a/share/timedef/en_SG.UTF-8.src +++ b/share/timedef/en_SG.UTF-8.src @@ -53,7 +53,7 @@ Saturday %I:%M:%S %p # # x_fmt -%e/%m/%y +%d/%m/%y # # c_fmt %A %e %B %Y at %I:%M:%S %p @@ -80,7 +80,7 @@ November December # # md_order -m +dm # # ampm_fmt %I:%M:%S %p diff --git a/share/timedef/en_US.UTF-8.src b/share/timedef/en_US.UTF-8.src index a956cb3b126..d7e47f775af 100644 --- a/share/timedef/en_US.UTF-8.src +++ b/share/timedef/en_US.UTF-8.src @@ -53,7 +53,7 @@ Saturday %I:%M:%S %p # # x_fmt -%m/%e/%y +%m/%d/%y # # c_fmt %A, %B %e, %Y at %I:%M:%S %p @@ -80,7 +80,7 @@ November December # # md_order -m +md # # ampm_fmt %I:%M:%S %p diff --git a/share/timedef/es_AR.ISO8859-1.src b/share/timedef/es_AR.ISO8859-1.src index 592382e86e2..b8e9fdb5e09 100644 --- a/share/timedef/es_AR.ISO8859-1.src +++ b/share/timedef/es_AR.ISO8859-1.src @@ -53,7 +53,7 @@ s %I:%M:%S %p # # x_fmt -%e/%m/%y +%d/%m/%y # # c_fmt %e de %B de %Y, %I:%M:%S %p @@ -80,7 +80,7 @@ noviembre diciembre # # md_order -m +dm # # ampm_fmt %I:%M:%S %p diff --git a/share/timedef/es_CR.UTF-8.src b/share/timedef/es_CR.UTF-8.src index c01dabcf8c6..31727a6de23 100644 --- a/share/timedef/es_CR.UTF-8.src +++ b/share/timedef/es_CR.UTF-8.src @@ -53,7 +53,7 @@ sábado %I:%M:%S %p # # x_fmt -%e/%m/%y +%d/%m/%y # # c_fmt %e de %B de %Y, %I:%M:%S %p @@ -80,7 +80,7 @@ noviembre diciembre # # md_order -m +dm # # ampm_fmt %I:%M:%S %p diff --git a/share/timedef/es_ES.ISO8859-15.src b/share/timedef/es_ES.ISO8859-15.src index a6d0325f470..e41398af46c 100644 --- a/share/timedef/es_ES.ISO8859-15.src +++ b/share/timedef/es_ES.ISO8859-15.src @@ -53,7 +53,7 @@ s %H:%M:%S # # x_fmt -%e/%m/%y +%d/%m/%y # # c_fmt %e de %B de %Y, %H:%M:%S @@ -80,7 +80,7 @@ noviembre diciembre # # md_order -m +dm # # ampm_fmt %I:%M:%S %p diff --git a/share/timedef/es_ES.UTF-8.src b/share/timedef/es_ES.UTF-8.src index 91273311be5..cd70a086f75 100644 --- a/share/timedef/es_ES.UTF-8.src +++ b/share/timedef/es_ES.UTF-8.src @@ -53,7 +53,7 @@ sábado %H:%M:%S # # x_fmt -%e/%m/%y +%d/%m/%y # # c_fmt %e de %B de %Y, %H:%M:%S @@ -80,7 +80,7 @@ noviembre diciembre # # md_order -m +dm # # ampm_fmt %I:%M:%S %p diff --git a/share/timedef/fi_FI.ISO8859-15.src b/share/timedef/fi_FI.ISO8859-15.src index e58c9a6ccec..8cac9269701 100644 --- a/share/timedef/fi_FI.ISO8859-15.src +++ b/share/timedef/fi_FI.ISO8859-15.src @@ -53,7 +53,7 @@ lauantaina %H.%M.%S # # x_fmt -%e.%m.%Y +%d.%m.%Y # # c_fmt %e. %B %Y klo %H.%M.%S @@ -80,7 +80,7 @@ marraskuuta joulukuuta # # md_order -m +dm # # ampm_fmt %I.%M.%S %p diff --git a/share/timedef/fi_FI.UTF-8.src b/share/timedef/fi_FI.UTF-8.src index 7dcc1ae1a4c..8d496ae04b2 100644 --- a/share/timedef/fi_FI.UTF-8.src +++ b/share/timedef/fi_FI.UTF-8.src @@ -53,7 +53,7 @@ lauantaina %H.%M.%S # # x_fmt -%e.%m.%Y +%d.%m.%Y # # c_fmt %e. %B %Y klo %H.%M.%S @@ -80,7 +80,7 @@ marraskuuta joulukuuta # # md_order -m +dm # # ampm_fmt %I.%M.%S %p diff --git a/share/timedef/fr_BE.ISO8859-15.src b/share/timedef/fr_BE.ISO8859-15.src index 7e976a4b1b9..abc1bd12130 100644 --- a/share/timedef/fr_BE.ISO8859-15.src +++ b/share/timedef/fr_BE.ISO8859-15.src @@ -53,7 +53,7 @@ samedi %H:%M:%S # # x_fmt -%e/%m/%y +%d/%m/%y # # c_fmt %A %e %B %Y %H:%M:%S @@ -80,7 +80,7 @@ novembre dcembre # # md_order -m +dm # # ampm_fmt %I:%M:%S %p diff --git a/share/timedef/fr_BE.UTF-8.src b/share/timedef/fr_BE.UTF-8.src index c1d393ddca6..00e49c96788 100644 --- a/share/timedef/fr_BE.UTF-8.src +++ b/share/timedef/fr_BE.UTF-8.src @@ -53,7 +53,7 @@ samedi %H:%M:%S # # x_fmt -%e/%m/%y +%d/%m/%y # # c_fmt %A %e %B %Y %H:%M:%S @@ -80,7 +80,7 @@ novembre décembre # # md_order -m +dm # # ampm_fmt %I:%M:%S %p diff --git a/share/timedef/he_IL.UTF-8.src b/share/timedef/he_IL.UTF-8.src index 688045ae823..277cddc959c 100644 --- a/share/timedef/he_IL.UTF-8.src +++ b/share/timedef/he_IL.UTF-8.src @@ -53,7 +53,7 @@ %H:%M:%S # # x_fmt -%e.%m.%Y +%d.%m.%Y # # c_fmt %e ב%B %Y בשעה %H:%M:%S @@ -80,7 +80,7 @@ דצמבר # # md_order -m +dm # # ampm_fmt %I:%M:%S %p diff --git a/share/timedef/hi_IN.ISCII-DEV.src b/share/timedef/hi_IN.ISCII-DEV.src index 6da687f502a..b28947e74ef 100644 --- a/share/timedef/hi_IN.ISCII-DEV.src +++ b/share/timedef/hi_IN.ISCII-DEV.src @@ -53,7 +53,7 @@ %I:%M:%S %p # # x_fmt -%e/%m/%y +%d/%m/%y # # c_fmt %A %e %B %Y %I:%M:%S %p @@ -80,7 +80,7 @@ ע # # md_order -m +dm # # ampm_fmt %I:%M:%S %p diff --git a/share/timedef/hi_IN.UTF-8.src b/share/timedef/hi_IN.UTF-8.src index f7c17d21af2..a3d3f7cc945 100644 --- a/share/timedef/hi_IN.UTF-8.src +++ b/share/timedef/hi_IN.UTF-8.src @@ -53,7 +53,7 @@ %I:%M:%S %p # # x_fmt -%e/%m/%y +%d/%m/%y # # c_fmt %A %e %B %Y को %I:%M:%S %p @@ -80,7 +80,7 @@ दिसंबर # # md_order -m +dm # # ampm_fmt %I:%M:%S %p diff --git a/share/timedef/is_IS.ISO8859-15.src b/share/timedef/is_IS.ISO8859-15.src index eea023b3f3c..567fbf0888d 100644 --- a/share/timedef/is_IS.ISO8859-15.src +++ b/share/timedef/is_IS.ISO8859-15.src @@ -53,7 +53,7 @@ laugardagur %H:%M:%S # # x_fmt -%e.%m.%Y +%d.%m.%Y # # c_fmt %e. %B %Y kl. %H:%M:%S @@ -80,7 +80,7 @@ n desember # # md_order -m +dm # # ampm_fmt %I:%M:%S %p diff --git a/share/timedef/is_IS.UTF-8.src b/share/timedef/is_IS.UTF-8.src index 8e3b255bb66..0363d131371 100644 --- a/share/timedef/is_IS.UTF-8.src +++ b/share/timedef/is_IS.UTF-8.src @@ -53,7 +53,7 @@ laugardagur %H:%M:%S # # x_fmt -%e.%m.%Y +%d.%m.%Y # # c_fmt %e. %B %Y kl. %H:%M:%S @@ -80,7 +80,7 @@ nóvember desember # # md_order -m +dm # # ampm_fmt %I:%M:%S %p diff --git a/share/timedef/ko_KR.UTF-8.src b/share/timedef/ko_KR.UTF-8.src index cce1aa7b670..ac63d44500d 100644 --- a/share/timedef/ko_KR.UTF-8.src +++ b/share/timedef/ko_KR.UTF-8.src @@ -80,7 +80,7 @@ 12월 # # md_order -m +md # # ampm_fmt %p %I:%M:%S diff --git a/share/timedef/ko_KR.eucKR.src b/share/timedef/ko_KR.eucKR.src index c72ae4bd87a..cf610c4f619 100644 --- a/share/timedef/ko_KR.eucKR.src +++ b/share/timedef/ko_KR.eucKR.src @@ -80,7 +80,7 @@ 12 # # md_order -m +md # # ampm_fmt %p %I:%M:%S diff --git a/share/timedef/nl_BE.UTF-8.src b/share/timedef/nl_BE.UTF-8.src index 09ca5223020..ba98f7db0ee 100644 --- a/share/timedef/nl_BE.UTF-8.src +++ b/share/timedef/nl_BE.UTF-8.src @@ -53,7 +53,7 @@ zaterdag %H:%M:%S # # x_fmt -%e/%m/%y +%d/%m/%y # # c_fmt %A %e %B %Y %H:%M:%S @@ -80,7 +80,7 @@ november december # # md_order -m +dm # # ampm_fmt %I:%M:%S %p diff --git a/share/timedef/sl_SI.ISO8859-2.src b/share/timedef/sl_SI.ISO8859-2.src index 6e4fb277f3f..ecfe8a4ffec 100644 --- a/share/timedef/sl_SI.ISO8859-2.src +++ b/share/timedef/sl_SI.ISO8859-2.src @@ -80,7 +80,7 @@ november december # # md_order -m +dm # # ampm_fmt %I:%M:%S %p diff --git a/share/timedef/sl_SI.UTF-8.src b/share/timedef/sl_SI.UTF-8.src index f5ff11e92d3..9cb78bf4aff 100644 --- a/share/timedef/sl_SI.UTF-8.src +++ b/share/timedef/sl_SI.UTF-8.src @@ -80,7 +80,7 @@ november december # # md_order -m +dm # # ampm_fmt %I:%M:%S %p diff --git a/share/timedef/sr_Cyrl_RS.ISO8859-5.src b/share/timedef/sr_Cyrl_RS.ISO8859-5.src index 2d352a85f7f..7a1d5ed9f93 100644 --- a/share/timedef/sr_Cyrl_RS.ISO8859-5.src +++ b/share/timedef/sr_Cyrl_RS.ISO8859-5.src @@ -87,7 +87,7 @@ subota %H.%M.%S""%H.%M.%S # # x_fmt -%e.%m.%y.""%e.%m.%y. +%d.%m.%y.""%e.%m.%y. # # c_fmt %d. %B %Y. %H.%M.%S""%d. %B %Y. %H.%M.%S %Z @@ -126,7 +126,7 @@ novembar decembar # # md_order -mm +dmdm # # ampm_fmt %I.%M.%S %p""%I.%M.%S %p diff --git a/share/timedef/sr_Latn_RS.ISO8859-2.src b/share/timedef/sr_Latn_RS.ISO8859-2.src index 298d00bd73d..6df2706d28b 100644 --- a/share/timedef/sr_Latn_RS.ISO8859-2.src +++ b/share/timedef/sr_Latn_RS.ISO8859-2.src @@ -87,7 +87,7 @@ subota %H.%M.%S""%H.%M.%S # # x_fmt -%e.%m.%y.""%e.%m.%y. +%d.%m.%y.""%d.%m.%y. # # c_fmt %d. %B %Y. %H.%M.%S""%d. %B %Y. %H.%M.%S %Z @@ -126,7 +126,7 @@ novembar decembar # # md_order -mm +dmdm # # ampm_fmt %I.%M.%S %p""%I.%M.%S %p diff --git a/share/timedef/sr_Latn_RS.UTF-8.src b/share/timedef/sr_Latn_RS.UTF-8.src index 077514c937d..e7a399249a8 100644 --- a/share/timedef/sr_Latn_RS.UTF-8.src +++ b/share/timedef/sr_Latn_RS.UTF-8.src @@ -87,7 +87,7 @@ subota %H.%M.%S""%H.%M.%S # # x_fmt -%e.%m.%y.""%e.%m.%y. +%d.%m.%y.""%d.%m.%y. # # c_fmt %d. %B %Y. %H.%M.%S""%d. %B %Y. %H.%M.%S %Z @@ -126,7 +126,7 @@ novembar decembar # # md_order -mm +dmdm # # ampm_fmt %I.%M.%S %p""%I.%M.%S %p diff --git a/share/timedef/tr_TR.ISO8859-9.src b/share/timedef/tr_TR.ISO8859-9.src index 603f1331ac9..538fea0029b 100644 --- a/share/timedef/tr_TR.ISO8859-9.src +++ b/share/timedef/tr_TR.ISO8859-9.src @@ -53,7 +53,7 @@ Cumartesi %H:%M:%S # # x_fmt -%e.%m.%Y +%d.%m.%Y # # c_fmt %A %e %B %Y %H:%M:%S @@ -80,7 +80,7 @@ Kas Aralk # # md_order -m +dm # # ampm_fmt %p %I:%M:%S diff --git a/share/timedef/tr_TR.UTF-8.src b/share/timedef/tr_TR.UTF-8.src index ce70fcf01ae..15f8fed5088 100644 --- a/share/timedef/tr_TR.UTF-8.src +++ b/share/timedef/tr_TR.UTF-8.src @@ -53,7 +53,7 @@ Cumartesi %H:%M:%S # # x_fmt -%e.%m.%Y +%d.%m.%Y # # c_fmt %A %e %B %Y %H:%M:%S @@ -80,7 +80,7 @@ Kasım Aralık # # md_order -m +dm # # ampm_fmt %p %I:%M:%S diff --git a/share/timedef/zh_Hans_CN.GB2312.src b/share/timedef/zh_Hans_CN.GB2312.src index 8fb3026f1a9..efa11cd40e1 100644 --- a/share/timedef/zh_Hans_CN.GB2312.src +++ b/share/timedef/zh_Hans_CN.GB2312.src @@ -53,7 +53,7 @@ PGFZAy %p%I:%M:%S # # x_fmt -%y#/%m#/%e +%y#/%m#/%d # # c_fmt %YDj%mTB%eHU %p%I:%M:%S @@ -80,7 +80,7 @@ J.R;TB J.6~TB # # md_order -m +md # # ampm_fmt %p%I:%M:%S diff --git a/share/timedef/zh_Hans_CN.GBK.src b/share/timedef/zh_Hans_CN.GBK.src index af4552b5be6..9f5dd0f5a37 100644 --- a/share/timedef/zh_Hans_CN.GBK.src +++ b/share/timedef/zh_Hans_CN.GBK.src @@ -53,7 +53,7 @@ %p%I:%M:%S # # x_fmt -%y/%m/%e +%y/%m/%d # # c_fmt %Y%m%e %p%I:%M:%S @@ -80,7 +80,7 @@ ʮ # # md_order -m +md # # ampm_fmt %p%I:%M:%S diff --git a/share/timedef/zh_Hans_CN.UTF-8.src b/share/timedef/zh_Hans_CN.UTF-8.src index 2b54f711afa..9c994d445b3 100644 --- a/share/timedef/zh_Hans_CN.UTF-8.src +++ b/share/timedef/zh_Hans_CN.UTF-8.src @@ -53,7 +53,7 @@ %p%I:%M:%S # # x_fmt -%y/%m/%e +%y/%m/%d # # c_fmt %Y年%m月%e日 %p%I:%M:%S @@ -80,7 +80,7 @@ 十二月 # # md_order -m +md # # ampm_fmt %p%I:%M:%S diff --git a/share/timedef/zh_Hans_CN.eucCN.src b/share/timedef/zh_Hans_CN.eucCN.src index 39884d344c5..5589bf91888 100644 --- a/share/timedef/zh_Hans_CN.eucCN.src +++ b/share/timedef/zh_Hans_CN.eucCN.src @@ -53,7 +53,7 @@ %p%I:%M:%S # # x_fmt -%y%m%e +%y%m%d # # c_fmt %Y%m%e %p%I:%M:%S @@ -80,7 +80,7 @@ ʮ # # md_order -m +md # # ampm_fmt %p%I:%M:%S diff --git a/share/timedef/zh_Hant_HK.UTF-8.src b/share/timedef/zh_Hant_HK.UTF-8.src index 9fa990c5787..afd32174da9 100644 --- a/share/timedef/zh_Hant_HK.UTF-8.src +++ b/share/timedef/zh_Hant_HK.UTF-8.src @@ -53,7 +53,7 @@ %p%I:%M:%S # # x_fmt -%e/%m/%y +%d/%m/%y # # c_fmt %Y年%m月%e日 %p%I:%M:%S [%Z] @@ -80,7 +80,7 @@ 12月 # # md_order -m +dm # # ampm_fmt %p%I:%M:%S diff --git a/share/timedef/zh_Hant_TW.Big5.src b/share/timedef/zh_Hant_TW.Big5.src index 7f19a1fbf39..012b8702ea2 100644 --- a/share/timedef/zh_Hant_TW.Big5.src +++ b/share/timedef/zh_Hant_TW.Big5.src @@ -53,7 +53,7 @@ %p%I:%M:%S # # x_fmt -%YA%mA%e +%YA%mA%d # # c_fmt %Y~%m%e %p%I:%M:%S [%Z] @@ -80,7 +80,7 @@ # # md_order -m +md # # ampm_fmt %p%I:%M:%S diff --git a/share/timedef/zh_Hant_TW.UTF-8.src b/share/timedef/zh_Hant_TW.UTF-8.src index 654df5bbb70..9b848655640 100644 --- a/share/timedef/zh_Hant_TW.UTF-8.src +++ b/share/timedef/zh_Hant_TW.UTF-8.src @@ -53,7 +53,7 @@ %p%I:%M:%S # # x_fmt -%Y/%m/%e +%Y/%m/%d # # c_fmt %Y年%m月%e日 %p%I:%M:%S [%Z] @@ -80,7 +80,7 @@ 12月 # # md_order -m +md # # ampm_fmt %p%I:%M:%S diff --git a/tools/tools/locale/tools/cldr2def.pl b/tools/tools/locale/tools/cldr2def.pl index 2dbdf2cc0df..11a109260fa 100755 --- a/tools/tools/locale/tools/cldr2def.pl +++ b/tools/tools/locale/tools/cldr2def.pl @@ -68,6 +68,7 @@ my %callback = ( mdorder => \&callback_mdorder, altmon => \&callback_altmon, cformat => \&callback_cformat, + dformat => \&callback_dformat, dtformat => \&callback_dtformat, cbabmon => \&callback_abmon, cbampm => \&callback_ampm, @@ -183,10 +184,9 @@ if ($TYPE eq "timedef") { "abday" => "as", "day" => "as", "t_fmt" => "s", - "d_fmt" => "s", + "d_fmt" => " " " "s", "d_t_fmt" => " " "|[-.]))%e/$1%d/; + $s =~ s/%e((|[-.])%m)/%d$1/; + return $s; +}; + sub callback_dtformat { my $s = shift; my $nl = $callback{data}{l} . "_" . $callback{data}{c}; @@ -241,7 +249,8 @@ sub callback_dtformat { sub callback_mdorder { my $s = shift; return undef if (!defined $s); - $s =~ s/[^dm]//g; + $s =~ s/[^dem]//g; + $s =~ s/e/d/g; return $s; };