[Intl] Fixed small bugs in the resource bundle transformation

webmozart · webmozart · commit f47e60a6c66c · 2013-04-05T10:11:15.000+02:00
diff --git a/src/Symfony/Component/Intl/ResourceBundle/LanguageBundle.php b/src/Symfony/Component/Intl/ResourceBundle/LanguageBundle.php
@@ -28,7 +28,7 @@ public function getLanguageName($lang, $region = null, $locale = null)
         }
 
         if (null === ($languages = $this->readEntry($locale, array('Languages')))) {
-            return array();
+            return null;
         }
 
         // Some languages are translated together with their region,
diff --git a/src/Symfony/Component/Intl/ResourceBundle/Transformer/Rule/CurrencyBundleTransformationRule.php b/src/Symfony/Component/Intl/ResourceBundle/Transformer/Rule/CurrencyBundleTransformationRule.php
@@ -73,7 +73,7 @@ public function beforeCreateStub(StubbingContextInterface $context)
         foreach ($currencyBundle->getCurrencyNames('en') as $code => $name) {
             $currencies[$code] = array(
                 CurrencyBundle::INDEX_NAME => $name,
-                CurrencyBundle::INDEX_SYMBOL => $currencyBundle->getCurrencySymbol('en', $code),
+                CurrencyBundle::INDEX_SYMBOL => $currencyBundle->getCurrencySymbol($code, 'en'),
                 CurrencyBundle::INDEX_FRACTION_DIGITS => $currencyBundle->getFractionDigits($code),
                 CurrencyBundle::INDEX_ROUNDING_INCREMENT => $currencyBundle->getRoundingIncrement($code),
             );
diff --git a/src/Symfony/Component/Intl/ResourceBundle/Transformer/Rule/LocaleBundleTransformationRule.php b/src/Symfony/Component/Intl/ResourceBundle/Transformer/Rule/LocaleBundleTransformationRule.php
@@ -201,7 +201,7 @@ private function generateLocaleName($locale, $displayLocale)
 
         // Some languages are simply not translated
         // Example: "az" (Azerbaijani) has no translation in "af" (Afrikaans)
-        if (null === ($name = $this->languageBundle->getLanguageName($displayLocale, $lang))) {
+        if (null === ($name = $this->languageBundle->getLanguageName($lang, null, $displayLocale))) {
             return null;
         }
 
@@ -216,7 +216,7 @@ private function generateLocaleName($locale, $displayLocale)
         // i.e. in zh_Hans_MO, "Hans" is the script
         if ($script) {
             // Some scripts are not translated into every language
-            if (null === ($scriptName = $this->languageBundle->getScriptName($displayLocale, $script, $lang))) {
+            if (null === ($scriptName = $this->languageBundle->getScriptName($script, $lang, $displayLocale))) {
                 return null;
             }
 
@@ -227,7 +227,7 @@ private function generateLocaleName($locale, $displayLocale)
         // i.e. in de_AT, "AT" is the region
         if ($region) {
             // Some regions are not translated into every language
-            if (null === ($regionName = $this->regionBundle->getCountryName($displayLocale, $region))) {
+            if (null === ($regionName = $this->regionBundle->getCountryName($region, $displayLocale))) {
                 return null;
             }
 
diff --git a/src/Symfony/Component/Intl/Tests/ResourceBundle/LanguageBundleTest.php b/src/Symfony/Component/Intl/Tests/ResourceBundle/LanguageBundleTest.php
@@ -48,7 +48,7 @@ public function testGetLanguageName()
             ->with(self::RES_DIR, 'en', array('Languages'))
             ->will($this->returnValue($languages));
 
-        $this->assertSame('German', $this->bundle->getLanguageName('de', 'en'));
+        $this->assertSame('German', $this->bundle->getLanguageName('de', null, 'en'));
     }
 
     public function testGetLanguageNameWithRegion()
@@ -115,7 +115,7 @@ public function testGetScriptName()
             ->with(self::RES_DIR, 'en')
             ->will($this->returnValue($data));
 
-        $this->assertSame('latin', $this->bundle->getScriptName('Latn', 'en'));
+        $this->assertSame('latin', $this->bundle->getScriptName('Latn', null, 'en'));
     }
 
     public function testGetScriptNameIncludedInLanguage()
@@ -177,7 +177,7 @@ public function testGetScriptNameNoScriptsBlock()
             ->with(self::RES_DIR, 'en')
             ->will($this->returnValue($data));
 
-        $this->assertNull($this->bundle->getScriptName('Latn', 'en'));
+        $this->assertNull($this->bundle->getScriptName('Latn', null, 'en'));
     }
 
     public function testGetScriptNames()

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public function getLanguageName($lang, $region = null, $locale = null)`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`if (null === ($languages = $this->readEntry($locale, array('Languages')))) {`
`31`		`- return array();`
	`31`	`+ return null;`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`// Some languages are translated together with their region,`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ public function testGetLanguageName()`
`48`	`48`	`->with(self::RES_DIR, 'en', array('Languages'))`
`49`	`49`	`->will($this->returnValue($languages));`
`50`	`50`
`51`		`- $this->assertSame('German', $this->bundle->getLanguageName('de', 'en'));`
	`51`	`+ $this->assertSame('German', $this->bundle->getLanguageName('de', null, 'en'));`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`public function testGetLanguageNameWithRegion()`
`@@ -115,7 +115,7 @@ public function testGetScriptName()`
`115`	`115`	`->with(self::RES_DIR, 'en')`
`116`	`116`	`->will($this->returnValue($data));`
`117`	`117`
`118`		`- $this->assertSame('latin', $this->bundle->getScriptName('Latn', 'en'));`
	`118`	`+ $this->assertSame('latin', $this->bundle->getScriptName('Latn', null, 'en'));`
`119`	`119`	`}`
`120`	`120`
`121`	`121`	`public function testGetScriptNameIncludedInLanguage()`
`@@ -177,7 +177,7 @@ public function testGetScriptNameNoScriptsBlock()`
`177`	`177`	`->with(self::RES_DIR, 'en')`
`178`	`178`	`->will($this->returnValue($data));`
`179`	`179`
`180`		`- $this->assertNull($this->bundle->getScriptName('Latn', 'en'));`
	`180`	`+ $this->assertNull($this->bundle->getScriptName('Latn', null, 'en'));`
`181`	`181`	`}`
`182`	`182`
`183`	`183`	`public function testGetScriptNames()`