From b669bf26d6774706a61242d67fbfe24f05eb1760 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Mon, 2 Mar 2015 18:02:51 +0100
Subject: [PATCH] Fix the behaviour of getLanguageCode() to match the
expectation of the name
---
lib/private/l10n.php | 19 +++++--------------
lib/public/il10n.php | 12 +++---------
2 files changed, 8 insertions(+), 23 deletions(-)
diff --git a/lib/private/l10n.php b/lib/private/l10n.php
index 6c66bee3e79..4e9316c333e 100644
--- a/lib/private/l10n.php
+++ b/lib/private/l10n.php
@@ -358,24 +358,15 @@ class OC_L10N implements \OCP\IL10N {
self::$language = $lang;
}
-
/**
- * find the best language
- *
- * @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.
+ * The code (en, de, ...) of the language that is used for this OC_L10N object
*
- * 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);
}
}
diff --git a/lib/public/il10n.php b/lib/public/il10n.php
index 2c95ddfec18..c63c18209e4 100644
--- a/lib/public/il10n.php
+++ b/lib/public/il10n.php
@@ -75,15 +75,9 @@ interface IL10N {
/**
- * find the best language
- * @param array|string $app details below
- * @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.
+ * The code (en, de, ...) of the language that is used for this OC_L10N object
*
- * If nothing works it returns 'en'
+ * @return string language
*/
- public function getLanguageCode($app=null);
+ public function getLanguageCode();
}
--
GitLab