From e5af4affd129071762f08fea73c382566d22057a Mon Sep 17 00:00:00 2001 From: yuripv Date: Sun, 11 Nov 2018 13:41:32 +0000 Subject: [PATCH] Use blank am_pm and t_fmt_ampm for de_AT and de_DE locales as apparently they use 24-hour clock notation. The visible change is that w(1) now uses 24-hour clock format as it checks for t_fmt_ampm presence. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit PR: 231771 Submitted by: Christoph Schönweiler Reviewed by: bapt Approved by: kib (mentor, implicit) MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D17945 --- share/timedef/de_AT.ISO8859-15.src | 10 +++------- share/timedef/de_AT.UTF-8.src | 10 +++------- share/timedef/de_DE.ISO8859-15.src | 10 +++------- share/timedef/de_DE.UTF-8.src | 10 +++------- 4 files changed, 12 insertions(+), 28 deletions(-) diff --git a/share/timedef/de_AT.ISO8859-15.src b/share/timedef/de_AT.ISO8859-15.src index 457fc3d942d9..65e7d3fafca9 100644 --- a/share/timedef/de_AT.ISO8859-15.src +++ b/share/timedef/de_AT.ISO8859-15.src @@ -1,7 +1,3 @@ -# Warning: Do not edit. This file is automatically generated from the -# tools in /usr/src/tools/tools/locale. The data is obtained from the -# CLDR project, obtained from http://cldr.unicode.org/ -# ----------------------------------------------------------------------------- # # Short month names Jän. @@ -59,8 +55,8 @@ Samstag %a %e %b %X %Y # # AM/PM -vorm. -nachm. + + # # date_fmt %a %e %b %Y %X %Z @@ -83,5 +79,5 @@ Dezember dm # # ampm_fmt -%I:%M:%S %p + # EOF diff --git a/share/timedef/de_AT.UTF-8.src b/share/timedef/de_AT.UTF-8.src index 67ee9cd974a0..d8f1c7cd0a11 100644 --- a/share/timedef/de_AT.UTF-8.src +++ b/share/timedef/de_AT.UTF-8.src @@ -1,7 +1,3 @@ -# Warning: Do not edit. This file is automatically generated from the -# tools in /usr/src/tools/tools/locale. The data is obtained from the -# CLDR project, obtained from http://cldr.unicode.org/ -# ----------------------------------------------------------------------------- # # Short month names Jän. @@ -59,8 +55,8 @@ Samstag %a %e %b %X %Y # # AM/PM -vorm. -nachm. + + # # date_fmt %a %e %b %Y %X %Z @@ -83,5 +79,5 @@ Dezember dm # # ampm_fmt -%I:%M:%S %p + # EOF diff --git a/share/timedef/de_DE.ISO8859-15.src b/share/timedef/de_DE.ISO8859-15.src index e7de6b3fae97..311c30e60978 100644 --- a/share/timedef/de_DE.ISO8859-15.src +++ b/share/timedef/de_DE.ISO8859-15.src @@ -1,7 +1,3 @@ -# Warning: Do not edit. This file is automatically generated from the -# tools in /usr/src/tools/tools/locale. The data is obtained from the -# CLDR project, obtained from http://cldr.unicode.org/ -# ----------------------------------------------------------------------------- # # Short month names Jan. @@ -59,8 +55,8 @@ Samstag %a %e %b %X %Y # # AM/PM -vorm. -nachm. + + # # date_fmt %a %e %b %Y %X %Z @@ -83,5 +79,5 @@ Dezember dm # # ampm_fmt -%I:%M:%S %p + # EOF diff --git a/share/timedef/de_DE.UTF-8.src b/share/timedef/de_DE.UTF-8.src index f8708b265060..c1a481c6eab9 100644 --- a/share/timedef/de_DE.UTF-8.src +++ b/share/timedef/de_DE.UTF-8.src @@ -1,7 +1,3 @@ -# Warning: Do not edit. This file is automatically generated from the -# tools in /usr/src/tools/tools/locale. The data is obtained from the -# CLDR project, obtained from http://cldr.unicode.org/ -# ----------------------------------------------------------------------------- # # Short month names Jan. @@ -59,8 +55,8 @@ Samstag %a %e %b %X %Y # # AM/PM -vorm. -nachm. + + # # date_fmt %a %e %b %Y %X %Z @@ -83,5 +79,5 @@ Dezember dm # # ampm_fmt -%I:%M:%S %p + # EOF