Permalink
Browse files

Adding Welsh to the supported lists of locales in l10n. Thanks to 'Da…

…nAbel' for the 'patch'. Fixes #714

Conflicts:

	cake/libs/l10n.php
  • Loading branch information...
1 parent 332bbcf commit 3d4fb10e20a03c5c36e6a4ebb685e39220df2d7d @markstory markstory committed May 14, 2010
Showing with 3 additions and 1 deletion.
  1. +2 −0 cake/libs/l10n.php
  2. +1 −1 cake/tests/cases/libs/l10n.test.php
View
2 cake/libs/l10n.php
@@ -163,6 +163,7 @@ class L10n extends Object {
/* Urdu */ 'urd' => 'ur',
/* Venda */ 'ven' => 've',
/* Vietnamese */ 'vie' => 'vi',
+ /* Welsh */ 'cym' => 'cy',
/* Xhosa */ 'xho' => 'xh',
/* Yiddish */ 'yid' => 'yi',
/* Zulu */ 'zul' => 'zu');
@@ -306,6 +307,7 @@ class L10n extends Object {
've' => array('language' => 'Venda', 'locale' => 'ven', 'localeFallback' => 'ven', 'charset' => 'utf-8'),
'vi' => array('language' => 'Vietnamese', 'locale' => 'vie', 'localeFallback' => 'vie', 'charset' => 'utf-8'),
'xh' => array('language' => 'Xhosa', 'locale' => 'xho', 'localeFallback' => 'xho', 'charset' => 'utf-8'),
+ 'cy' => array('language' => 'Welsh', 'locale' => 'cym', 'localeFallback' => 'cym', 'charset' => 'utf-8'),
'yi' => array('language' => 'Yiddish', 'locale' => 'yid', 'localeFallback' => 'yid', 'charset' => 'utf-8'),
'zh' => array('language' => 'Chinese', 'locale' => 'chi', 'localeFallback' => 'chi', 'charset' => 'utf-8'),
'zh-cn' => array('language' => 'Chinese (PRC)', 'locale' => 'zh_cn', 'localeFallback' => 'chi', 'charset' => 'GB2312'),
View
2 cake/tests/cases/libs/l10n.test.php
@@ -821,7 +821,7 @@ function testCatalog() {
$result = $l10n->catalog(array('sv', 'sv-fi'));
$expected = array(
'sv' => array('language' => 'Swedish', 'locale' => 'swe', 'localeFallback' => 'swe', 'charset' => 'utf-8'),
- 'sv-fi' => array('language' => 'Swedish (Findland)', 'locale' => 'sv_fi', 'localeFallback' => 'swe', 'charset' => 'utf-8')
+ 'sv-fi' => array('language' => 'Swedish (Finland)', 'locale' => 'sv_fi', 'localeFallback' => 'swe', 'charset' => 'utf-8')
);
$this->assertEqual($result, $expected);

0 comments on commit 3d4fb10

Please sign in to comment.