mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix the behaviour of getLanguageCode() to match the expectation of the name

This commit is contained in:
Joas Schilling 2015-03-02 18:02:51 +01:00
parent ed4c05c7b5
commit b669bf26d6
2 changed files with 8 additions and 23 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);
}
}

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();
}