about summary refs log tree commit diff
path: root/localedata
diff options
context:
space:
mode:
authorCarlos O'Donell <carlos@redhat.com>2013-05-02 23:24:21 -0400
committerCarlos O'Donell <carlos@redhat.com>2013-05-02 23:24:21 -0400
commit9df02941c2e18d66ff15830cdb4670b9b47600e3 (patch)
tree668b18afe9e28105a994cadaacbaf428eda8429a /localedata
parentbb5f27adcae1ae05ce61139d058ac88813ef410b (diff)
downloadglibc-9df02941c2e18d66ff15830cdb4670b9b47600e3.tar.gz
glibc-9df02941c2e18d66ff15830cdb4670b9b47600e3.tar.xz
glibc-9df02941c2e18d66ff15830cdb4670b9b47600e3.zip
Add yesstr and nostr to en_CA, es_AR, and es_ES
We add yesstr and nostr to three more locales.
We ignore the issue of capitalization of the first
character in yesstr and nostr. All locales will need
to be revisited to make this uniform policy change.

---

2013-05-02  Carlos O'Donell  <carlos@redhat.com>

	[BZ #15264]
	* localedata/locales/en_CA (LC_MESSAGES): Define yesstr and nostr.
	* localedata/locales/es_AR (LC_MESSAGES): Copy es_ES.
	* localedata/locales/es_ES (LC_MESSAGES): Define yesstr and nostr.
Diffstat (limited to 'localedata')
-rw-r--r--localedata/locales/en_CA9
-rw-r--r--localedata/locales/es_AR3
-rw-r--r--localedata/locales/es_ES6
3 files changed, 16 insertions, 2 deletions
diff --git a/localedata/locales/en_CA b/localedata/locales/en_CA
index 5e0ef2c320..52e9e32039 100644
--- a/localedata/locales/en_CA
+++ b/localedata/locales/en_CA
@@ -135,7 +135,16 @@ date_fmt	"<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
 END LC_TIME
 
 LC_MESSAGES
+% Yes - Display only the English "Yes." While Canada is bilingual it would be
+%       difficult to display two words e.g. Yes|Oui, where one word is expected.
+%       Thus given that the majority of the population is Anglophone we use only
+%       the English word for yesstr.
+yesstr      "<U0059><U0065><U0073>"
+% No - Display only the English "No." See the rationale for yesstr.
+nostr       "<U004E><U006F>"
+% ^[yYoO].* - Accept both English "Yes" and French "Oui" as Canada is bilingual.
 yesexpr     "<U005E><U005B><U0079><U0059><U006F><U004F><U005D><U002E><U002A>"
+% ^[nN].* - Accept both Engish "No" and French "Non" as Canada is bilingual.
 noexpr      "<U005E><U005B><U006E><U004E><U005D><U002E><U002A>"
 END LC_MESSAGES
 
diff --git a/localedata/locales/es_AR b/localedata/locales/es_AR
index c757638f7f..27636e7083 100644
--- a/localedata/locales/es_AR
+++ b/localedata/locales/es_AR
@@ -56,8 +56,7 @@ copy "es_ES"
 END LC_CTYPE
 
 LC_MESSAGES
-yesexpr "<U005E><U005B><U0073><U0053><U0079><U0059><U005D><U002E><U002A>"
-noexpr  "<U005E><U005B><U006E><U004E><U005D><U002E><U002A>"
+copy "es_ES"
 END LC_MESSAGES
 
 LC_MONETARY
diff --git a/localedata/locales/es_ES b/localedata/locales/es_ES
index fcf90cbdbc..44c17a6328 100644
--- a/localedata/locales/es_ES
+++ b/localedata/locales/es_ES
@@ -61,7 +61,13 @@ translit_end
 END LC_CTYPE
 
 LC_MESSAGES
+% Si - Display only the Spanish "Yes."
+yesstr  "<U0053><U0069>"
+% No - Spanish and English "No" have the same spelling.
+nostr   "<U004E><U006F>"
+% ^[sSyY].* - Spanish or English answer is appropriate.
 yesexpr "<U005E><U005B><U0073><U0053><U0079><U0059><U005D><U002E><U002A>"
+% ^[nN].* - Spanish or English answer have the same spelling.
 noexpr  "<U005E><U005B><U006E><U004E><U005D><U002E><U002A>"
 END LC_MESSAGES