Clean l10n code.

This commit is contained in:
Lars Jung 2015-05-03 20:44:05 +02:00
parent 675efd6cd3
commit 31fe4d1591
2 changed files with 5 additions and 10 deletions

View file

@ -52,7 +52,7 @@ class Api {
if (Util::get_boolean_request_param("l10n", false)) { if (Util::get_boolean_request_param("l10n", false)) {
$iso_codes = Util::get_request_param("l10nCodes"); $iso_codes = Util::get_request_param("l10nCodes");
$iso_codes = explode(":", $iso_codes); $iso_codes = array_filter(explode(":", $iso_codes));
$response["l10n"] = $this->app->get_l10n($iso_codes); $response["l10n"] = $this->app->get_l10n($iso_codes);
} }

View file

@ -320,18 +320,13 @@ class App {
public function get_l10n($iso_codes) { public function get_l10n($iso_codes) {
if (!is_array($iso_codes)) {
$iso_codes = func_get_args();
}
$results = array(); $results = array();
foreach ($iso_codes as $iso_code) { foreach ($iso_codes as $iso_code) {
if ($iso_code !== "") {
$file = APP_PATH . "/conf/l10n/" . $iso_code . ".json"; $file = APP_PATH . "/conf/l10n/" . $iso_code . ".json";
$results[$iso_code] = Util::load_commented_json($file); $results[$iso_code] = Util::load_commented_json($file);
$results[$iso_code]["isoCode"] = $iso_code; $results[$iso_code]["isoCode"] = $iso_code;
} }
}
return $results; return $results;
} }