wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #14674 from owncloud/fix-l10n-getlanguagecode-2

Browse source 
Jenkins #14650
This commit is contained in:
Joas Schilling 2015-03-03 18:33:08 +01:00
commit e12c83e3dc
4 changed files with 25 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
lib/private/l10n.php
View file

@ -358,24 +358,15 @@ class OC_L10N implements \OCP\IL10N {
self::$language = $lang;
}
/**
* find the best language
* The code (en, de, ...) of the language that is used for this OC_L10N object
*
* @param array|string $app details below
*
* If $app is an array, ownCloud assumes that these are the available
* languages. Otherwise ownCloud tries to find the files in the l10n
* folder.
*
* If nothing works it returns 'en'
* @return string language
*/
public function getLanguageCode($app=null) {
return self::findLanguage($app);
public function getLanguageCode() {
return $this->lang ? $this->lang : self::findLanguage();
}
/**
* find the best language
* @param array|string $app details below
@ -515,7 +506,7 @@ class OC_L10N implements \OCP\IL10N {
* @throws \Punic\Exception\ValueNotInList
*/
public function getDateFormat() {
$locale = self::findLanguage();
$locale = $this->getLanguageCode();
return Punic\Calendar::getDateFormat('short', $locale);
}
@ -523,7 +514,7 @@ class OC_L10N implements \OCP\IL10N {
* @return int
*/
public function getFirstWeekDay() {
$locale = self::findLanguage();
$locale = $this->getLanguageCode();
return Punic\Calendar::getFirstWeekday($locale);
}
}

3
lib/private/util.php
View file

@ -396,8 +396,7 @@ class OC_Util {
*/
public static function addTranslations($application, $languageCode = null) {
if (is_null($languageCode)) {
$l = new \OC_L10N($application);
$languageCode = $l->getLanguageCode($application);
$languageCode = \OC_L10N::findLanguage($application);
}
if (!empty($application)) {
$path = "$application/l10n/$languageCode";

12
lib/public/il10n.php
View file

@ -75,15 +75,9 @@ interface IL10N {
/**
* find the best language
* @param array|string $app details below
* The code (en, de, ...) of the language that is used for this OC_L10N object
*
* @return string language
*
* If $app is an array, ownCloud assumes that these are the available
* languages. Otherwise ownCloud tries to find the files in the l10n
* folder.
*
* If nothing works it returns 'en'
*/
public function getLanguageCode($app=null);
public function getLanguageCode();
}

16
tests/lib/l10n.php
View file

@ -173,4 +173,20 @@ class Test_L10n extends \Test\TestCase {
array(null, null, 'en'),
);
}
public function testGetLanguageCode() {
$l = OC_L10N::get('lib', 'de');
$this->assertEquals('de', $l->getLanguageCode());
}
public function testFactoryGetLanguageCode() {
$factory = new \OC\L10N\Factory();
$l = $factory->get('lib', 'de');
$this->assertEquals('de', $l->getLanguageCode());
}
public function testServiceGetLanguageCode() {
$l = \OC::$server->getL10N('lib', 'de');
$this->assertEquals('de', $l->getLanguageCode());
}
}