Fixing catalog() to return 3 char matches

cakephp · Oct 30, 2009 · 7bead5d · 7bead5d
1 parent 80b1eb4
commit 7bead5d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/cake/libs/l10n.php b/cake/libs/l10n.php
@@ -474,6 +474,8 @@ function catalog($language = null) {
 		} else if (is_string($language)) {
 			if (isset($this->__l10nCatalog[$language])) {
 				return $this->__l10nCatalog[$language];
+			} else if (isset($this->__l10nMap[$language]) && isset($this->__l10nCatalog[$this->__l10nMap[$language]])) {
+				return $this->__l10nCatalog[$this->__l10nMap[$language]];
 			}
 			return false;
 		}

diff --git a/cake/tests/cases/libs/l10n.test.php b/cake/tests/cases/libs/l10n.test.php
@@ -981,6 +981,17 @@ function testCatalog() {
 			'pt-br' => array('language' => 'Portuguese (Brazil)', 'locale' => 'pt_br', 'localeFallback' => 'por', 'charset' => 'utf-8')
 		);
 		$this->assertEqual($result, $expected);
+
+		$result = $l10n->catalog(array('eng', 'deu', 'zho', 'rum', 'zul', 'yid'));
+		$expected = array(
+			'eng' => array('language' => 'English', 'locale' => 'eng', 'localeFallback' => 'eng', 'charset' => 'utf-8'),
+			'deu' => array('language' => 'German (Standard)', 'locale' => 'deu', 'localeFallback' => 'deu', 'charset' => 'utf-8'),
+			'zho' => array('language' => 'Chinese', 'locale' => 'chi', 'localeFallback' => 'chi', 'charset' => 'utf-8'),
+			'rum' => array('language' => 'Romanian', 'locale' => 'rum', 'localeFallback' => 'rum', 'charset' => 'utf-8'),
+			'zul' => array('language' => 'Zulu', 'locale' => 'zul', 'localeFallback' => 'zul', 'charset' => 'utf-8'),
+			'yid' => array('language' => 'Yiddish', 'locale' => 'yid', 'localeFallback' => 'yid', 'charset' => 'utf-8')
+		);
+		$this->assertEqual($result, $expected);
 	}
 }
 ?>