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

[l10n] remove unused static methods

This commit is contained in:
Morris Jobke 2015-09-30 17:53:15 +02:00 committed by Thomas Müller
parent 4fb2ef3bac
commit 6b53f7c40e
2 changed files with 5 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
lib/private/l10n.php
View File

@ -389,29 +389,6 @@ class OC_L10N implements \OCP\IL10N {
} }
} }
/**
* Choose a language
* @param array $text Associative Array with possible strings
* @return String
*
* $text is an array 'de' => 'hallo welt', 'en' => 'hello world', ...
*
* This function is useful to avoid loading thousands of files if only one
* simple string is needed, for example in appinfo.php
*/
public static function selectLanguage($text) {
$lang = self::findLanguage(array_keys($text));
return $text[$lang];
}
/**
* The given language is forced to be used while executing the current request
* @param string $lang
*/
public static function forceLanguage($lang) {
self::$language = $lang;
}
/** /**
* The code (en, de, ...) of the language that is used for this OC_L10N object * The code (en, de, ...) of the language that is used for this OC_L10N object
* *
@ -423,17 +400,13 @@ class OC_L10N implements \OCP\IL10N {
/** /**
* find the best language * find the best language
* @param array|string $app details below * @param string $app
* @return string language * @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' * If nothing works it returns 'en'
*/ */
public static function findLanguage($app = null) { public static function findLanguage($app = null) {
if(!is_array($app) && self::$language != '') { if(self::$language != '') {
return self::$language; return self::$language;
} }
@ -443,13 +416,7 @@ class OC_L10N implements \OCP\IL10N {
if($userId && $config->getUserValue($userId, 'core', 'lang')) { if($userId && $config->getUserValue($userId, 'core', 'lang')) {
$lang = $config->getUserValue($userId, 'core', 'lang'); $lang = $config->getUserValue($userId, 'core', 'lang');
self::$language = $lang; self::$language = $lang;
if(is_array($app)) { if(self::languageExists($app, $lang)) {
$available = $app;
$lang_exists = array_search($lang, $available) !== false;
} else {
$lang_exists = self::languageExists($app, $lang);
}
if($lang_exists) {
return $lang; return $lang;
} }
} }

6
tests/lib/l10n.php
View File

@ -92,8 +92,7 @@ class Test_L10n extends \Test\TestCase {
* @dataProvider localizationDataProvider * @dataProvider localizationDataProvider
*/ */
public function testNumericStringLocalization($expectedDate, $lang, $type, $value) { public function testNumericStringLocalization($expectedDate, $lang, $type, $value) {
$l = new OC_L10N('test'); $l = new OC_L10N('test', $lang);
$l->forceLanguage($lang);
$this->assertSame($expectedDate, $l->l($type, $value)); $this->assertSame($expectedDate, $l->l($type, $value));
} }
@ -110,8 +109,7 @@ class Test_L10n extends \Test\TestCase {
* @param $lang * @param $lang
*/ */
public function testFirstWeekDay($expected, $lang) { public function testFirstWeekDay($expected, $lang) {
$l = new OC_L10N('test'); $l = new OC_L10N('test', $lang);
$l->forceLanguage($lang);
$this->assertSame($expected, $l->l('firstday', 'firstday')); $this->assertSame($expected, $l->l('firstday', 'firstday'));
} }