about summary refs log tree commit diff
path: root/localedata
diff options
context:
space:
mode:
authorMike FABIAN <mfabian@redhat.com>2017-08-03 12:41:26 +0200
committerMike FABIAN <mfabian@redhat.com>2017-08-03 13:39:54 +0200
commit2aad4b04ad7b17a2e6b0e66d2cb4bc559376617b (patch)
tree174a9c88e73077a858f69ad78cab6e3659ddc18c /localedata
parent964263bb8d650f1681665c55704fb01a8e725621 (diff)
downloadglibc-2aad4b04ad7b17a2e6b0e66d2cb4bc559376617b.tar.gz
glibc-2aad4b04ad7b17a2e6b0e66d2cb4bc559376617b.tar.xz
glibc-2aad4b04ad7b17a2e6b0e66d2cb4bc559376617b.zip
Revert “Fix yesexpr in en_DK locale”
	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.
Diffstat (limited to 'localedata')
-rw-r--r--localedata/ChangeLog8
-rw-r--r--localedata/locales/en_DK14
2 files changed, 21 insertions, 1 deletions
diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index efe0b2c6b9..7bec433d08 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,5 +1,13 @@
 2017-08-03  Mike FABIAN  <mfabian@redhat.com>
 
+	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  <mfabian@redhat.com>
+
 	* locales/km_KH (LC_MESSAGES): drop redundant ([eE][sS])? and [oO]?
 	from yesexpr and noexpr
 
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