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.

diff --git a/ChangeLog b/ChangeLog
index a29f658d842df056017f64ff8f93ee904932ca4b..b093f83f98a15baed19c30a2995bc1596a780242 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+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.
+
 2013-05-02  David S. Miller  <davem@davemloft.net>
 
        * sysdeps/sparc/fpu/libm-test-ulps: Update.

diff --git a/localedata/locales/en_CA b/localedata/locales/en_CA
index 5e0ef2c32002d6a592ff64e4cbba32d2e03e03f4..52e9e3203965a8067cbbb334de69cb5445a0ce0a 100644 (file)
--- 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 c757638f7f127933431067409ab18214431a1938..27636e708349dd82fd1e2e0355732d02c174740d 100644 (file)
--- 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 fcf90cbdbc6f1ebbef99064cb12b5e61eda3eeb3..44c17a632886f53fdaf53d67220e1ee955e56497 100644 (file)
--- 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