Commitf47e60a

committed

[Intl] Fixed small bugs in the resource bundle transformation

1 parent467cc93 commitf47e60aCopy full SHA for f47e60a

File tree

-8

lines changed

-8

lines changed

Lines changed: 1 addition & 1 deletion

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`		`-returnarray();`
	`31`	`+returnnull;`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`// Some languages are translated together with their region,`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ public function beforeCreateStub(StubbingContextInterface $context)`
`73`	`73`	`foreach ($currencyBundle->getCurrencyNames('en')as$code =>$name) {`
`74`	`74`	`$currencies[$code] =array(`
`75`	`75`	`CurrencyBundle::INDEX_NAME =>$name,`
`76`		`- CurrencyBundle::INDEX_SYMBOL =>$currencyBundle->getCurrencySymbol('en',$code),`
	`76`	`+ CurrencyBundle::INDEX_SYMBOL =>$currencyBundle->getCurrencySymbol($code,'en'),`
`77`	`77`	`CurrencyBundle::INDEX_FRACTION_DIGITS =>$currencyBundle->getFractionDigits($code),`
`78`	`78`	`CurrencyBundle::INDEX_ROUNDING_INCREMENT =>$currencyBundle->getRoundingIncrement($code),`
`79`	`79`	`);`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -201,7 +201,7 @@ private function generateLocaleName($locale, $displayLocale)`
`201`	`201`
`202`	`202`	`// Some languages are simply not translated`
`203`	`203`	`// Example: "az" (Azerbaijani) has no translation in "af" (Afrikaans)`
`204`		`-if (null === ($name =$this->languageBundle->getLanguageName($displayLocale,$lang))) {`
	`204`	`+if (null === ($name =$this->languageBundle->getLanguageName($lang,null,$displayLocale))) {`
`205`	`205`	`returnnull;`
`206`	`206`	`}`
`207`	`207`
`@@ -216,7 +216,7 @@ private function generateLocaleName($locale, $displayLocale)`
`216`	`216`	`// i.e. in zh_Hans_MO, "Hans" is the script`
`217`	`217`	`if ($script) {`
`218`	`218`	`// Some scripts are not translated into every language`
`219`		`-if (null === ($scriptName =$this->languageBundle->getScriptName($displayLocale,$script,$lang))) {`
	`219`	`+if (null === ($scriptName =$this->languageBundle->getScriptName($script,$lang,$displayLocale))) {`
`220`	`220`	`returnnull;`
`221`	`221`	`}`
`222`	`222`
`@@ -227,7 +227,7 @@ private function generateLocaleName($locale, $displayLocale)`
`227`	`227`	`// i.e. in de_AT, "AT" is the region`
`228`	`228`	`if ($region) {`
`229`	`229`	`// Some regions are not translated into every language`
`230`		`-if (null === ($regionName =$this->regionBundle->getCountryName($displayLocale,$region))) {`
	`230`	`+if (null === ($regionName =$this->regionBundle->getCountryName($region,$displayLocale))) {`
`231`	`231`	`returnnull;`
`232`	`232`	`}`
`233`	`233`

Lines changed: 3 additions & 3 deletions

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`	`publicfunctiontestGetLanguageNameWithRegion()`
`@@ -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`	`publicfunctiontestGetScriptNameIncludedInLanguage()`
`@@ -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`	`publicfunctiontestGetScriptNames()`

Comments

(0)