From 2aad4b04ad7b17a2e6b0e66d2cb4bc559376617b Mon Sep 17 00:00:00 2001 From: Mike FABIAN Date: Thu, 3 Aug 2017 12:41:26 +0200 Subject: Revert “Fix yesexpr in en_DK locale” MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 8f75515080ee099030547ba5bcae59e800a2cc08 Revert “Fix yesexpr in en_DK locale”. * locales/en_DK (LC_MESSAGES): Restore original yesexpr, noexpr, yesstr, nostr. Convert them to ASCII and add a comment why we want to have them like this. --- localedata/ChangeLog | 8 ++++++++ localedata/locales/en_DK | 14 +++++++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/localedata/ChangeLog b/localedata/ChangeLog index efe0b2c6b9..7bec433d08 100644 --- a/localedata/ChangeLog +++ b/localedata/ChangeLog @@ -1,3 +1,11 @@ +2017-08-03 Mike FABIAN + + Revert “Fix yesexpr in en_DK locale”. + + * locales/en_DK (LC_MESSAGES): Restore original yesexpr, noexpr, + yesstr, nostr. Convert them to ASCII and add a comment why + we want to have them like this. + 2017-08-03 Mike FABIAN * locales/km_KH (LC_MESSAGES): drop redundant ([eE][sS])? and [oO]? diff --git a/localedata/locales/en_DK b/localedata/locales/en_DK index 2087786c07..6473ce38ac 100644 --- a/localedata/locales/en_DK +++ b/localedata/locales/en_DK @@ -128,7 +128,19 @@ first_weekday 2 END LC_TIME LC_MESSAGES -copy "en_US" +% en_DK is used outside Denmark, as some sort of generic continental +% European English locale. Therefore, it makes sense to have matches +% for more than just English in yesexpr: +% + is ised in many applications for yes (- for no) +% 1 is common yes, 0 is common no, - langage neutral +% Jj is Danish/German/Swedish/Norwegian/Dutch "ja" +% sS is Spanish/Italian "si" +% yY is English "yes" +% oO is French "oui" +yesexpr "^[+1yYjJsSoO]" +noexpr "^[-0nN]" +yesstr "yes" +nostr "no" END LC_MESSAGES LC_PAPER -- cgit 1.4.1