summaryrefslogtreecommitdiffstats
path: root/lib/private/util.php
diff options
context:
space:
mode:
authorVincent Petry <pvince81@owncloud.com>2014-10-17 19:47:37 +0200
committerThomas Müller <thomas.mueller@tmit.eu>2014-10-29 10:09:12 +0100
commitec1a73fab9aa6b71b502ee45f4d0dd4f20661930 (patch)
treef60269f9999cc94b66043b8ac87ac92f9014b4ed /lib/private/util.php
parentf67123c5a498e45a08900987b10779c7c60af601 (diff)
downloadnextcloud-server-ec1a73fab9aa6b71b502ee45f4d0dd4f20661930.tar.gz
nextcloud-server-ec1a73fab9aa6b71b502ee45f4d0dd4f20661930.zip
Added OC.L10N namespace with translation functions
Added addTranslations and fixed de.js file Fixed de.js to use OC.L10N.register() and use to correct expected format. Added JS unit tests for OC.L10N class Include translations JS script for all apps
Diffstat (limited to 'lib/private/util.php')
-rw-r--r--lib/private/util.php22
1 files changed, 20 insertions, 2 deletions
diff --git a/lib/private/util.php b/lib/private/util.php
index 6cd982c222e..5105bb22931 100644
--- a/lib/private/util.php
+++ b/lib/private/util.php
@@ -333,7 +333,7 @@ class OC_Util {
/**
* add a javascript file
*
- * @param string $application
+ * @param string $application application id
* @param string|null $file filename
* @return void
*/
@@ -350,9 +350,27 @@ class OC_Util {
}
/**
+ * add a translation JS file
+ *
+ * @param string $application application id
+ * @param string $languageCode language code, defaults to the current language
+ */
+ public static function addTranslations($application, $languageCode = null) {
+ if (is_null($languageCode)) {
+ $l = new \OC_L10N($application);
+ $languageCode = $l->getLanguageCode($application);
+ }
+ if (!empty($application)) {
+ self::$scripts[] = "$application/l10n/$languageCode";
+ } else {
+ self::$scripts[] = "js/$languageCode";
+ }
+ }
+
+ /**
* add a css file
*
- * @param string $application
+ * @param string $application application id
* @param string|null $file filename
* @return void
*/