diff --git a/lib/SimpleSAML/Locale/Language.php b/lib/SimpleSAML/Locale/Language.php index 8cc20565102c2ea48986ab7bd4599b5b22447d56..dab816c949775987d747a17d9107cd9f4be2a98d 100644 --- a/lib/SimpleSAML/Locale/Language.php +++ b/lib/SimpleSAML/Locale/Language.php @@ -266,7 +266,6 @@ class Language $bestScore = -1.0; foreach ($languageScore as $language => $score) { - // apply the language map to the language code if (array_key_exists($language, $languageMap)) { $language = $languageMap[$language]; diff --git a/lib/SimpleSAML/Locale/Translate.php b/lib/SimpleSAML/Locale/Translate.php index c75c53143050dec1ebc6a78d81b1405578170bd4..3e6e4677080977d9940881e7e86286dc5716fbde 100644 --- a/lib/SimpleSAML/Locale/Translate.php +++ b/lib/SimpleSAML/Locale/Translate.php @@ -228,7 +228,7 @@ class Translate * * @return string The tag, unchanged. */ - static public function noop($tag) + public static function noop($tag) { return $tag; } @@ -251,7 +251,8 @@ class Translate * (language => text) mappings. The array version will go away in 2.0 * @param array $replacements An associative array of keys that should be replaced with values in the * translated string. - * @param boolean $fallbackdefault Default translation to use as a fallback if no valid translation was found. @deprecated Not used in twig, gettext + * @param boolean $fallbackdefault Default translation to use as a fallback if no valid translation was found. + * @deprecated Not used in twig, gettext * * @return string The translated tag, or a placeholder value if the tag wasn't found. */