in case a translation javascript is not found we no longer bail out
remove translation.php
This commit is contained in:
parent
ec1a73fab9
commit
a589d61b78
|
@ -1,30 +0,0 @@
|
||||||
<?php
|
|
||||||
|
|
||||||
/**
|
|
||||||
* ownCloud - ajax frontend
|
|
||||||
*
|
|
||||||
* @author Jakob Sack
|
|
||||||
* @copyright 2011 Jakob Sack kde@jakobsack.de
|
|
||||||
*
|
|
||||||
* This library is free software; you can redistribute it and/or
|
|
||||||
* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
|
|
||||||
* License as published by the Free Software Foundation; either
|
|
||||||
* version 3 of the License, or any later version.
|
|
||||||
*
|
|
||||||
* This library is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Affero General Public
|
|
||||||
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
$app = isset($_POST["app"]) ? $_POST["app"] : "";
|
|
||||||
|
|
||||||
$app = OC_App::cleanAppId($app);
|
|
||||||
|
|
||||||
$l = \OC::$server->getL10N($app);
|
|
||||||
|
|
||||||
OC_JSON::success(array('data' => $l->getTranslations(), 'plural_form' => $l->getPluralFormString()));
|
|
|
@ -30,9 +30,6 @@ $this->create('core_ajax_appconfig', '/core/ajax/appconfig.php')
|
||||||
// Share
|
// Share
|
||||||
$this->create('core_ajax_share', '/core/ajax/share.php')
|
$this->create('core_ajax_share', '/core/ajax/share.php')
|
||||||
->actionInclude('core/ajax/share.php');
|
->actionInclude('core/ajax/share.php');
|
||||||
// Translations
|
|
||||||
$this->create('core_ajax_translations', '/core/ajax/translations.php')
|
|
||||||
->actionInclude('core/ajax/translations.php');
|
|
||||||
// Tags
|
// Tags
|
||||||
$this->create('core_tags_tags', '/tags/{type}')
|
$this->create('core_tags_tags', '/tags/{type}')
|
||||||
->get()
|
->get()
|
||||||
|
|
|
@ -265,17 +265,6 @@ class OC_L10N implements \OCP\IL10N {
|
||||||
return $this->translations;
|
return $this->translations;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* getPluralFormString
|
|
||||||
* @return string containing the gettext "Plural-Forms"-string
|
|
||||||
*
|
|
||||||
* Returns a string like "nplurals=2; plural=(n != 1);"
|
|
||||||
*/
|
|
||||||
public function getPluralFormString() {
|
|
||||||
$this->init();
|
|
||||||
return $this->plural_form_string;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* getPluralFormFunction
|
* getPluralFormFunction
|
||||||
* @return string the plural form function
|
* @return string the plural form function
|
||||||
|
|
|
@ -35,6 +35,10 @@ class JSResourceLocator extends ResourceLocator {
|
||||||
) {
|
) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
// missing translations files fill be ignored
|
||||||
|
if (strpos($script, "l10n/") === 0) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
throw new \Exception('js file not found: script:'.$script);
|
throw new \Exception('js file not found: script:'.$script);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -363,7 +363,7 @@ class OC_Util {
|
||||||
if (!empty($application)) {
|
if (!empty($application)) {
|
||||||
self::$scripts[] = "$application/l10n/$languageCode";
|
self::$scripts[] = "$application/l10n/$languageCode";
|
||||||
} else {
|
} else {
|
||||||
self::$scripts[] = "js/$languageCode";
|
self::$scripts[] = "l10n/$languageCode";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue