]> source.dussan.org Git - nextcloud-server.git/commitdiff
fix translations within subfolder /lib
authorThomas Mueller <thomas.mueller@tmit.eu>
Thu, 30 Aug 2012 21:51:44 +0000 (23:51 +0200)
committerThomas Mueller <thomas.mueller@tmit.eu>
Thu, 30 Aug 2012 21:51:44 +0000 (23:51 +0200)
lib/app.php
lib/files.php
lib/json.php
lib/template.php

index 006599e7dfc0fe260f1ae58403779a38590691fc..261f079399454a24ec33f8e2865a8cdbca600027 100755 (executable)
@@ -279,7 +279,7 @@ class OC_App{
         * entries are sorted by the key 'order' ascending.
         */
        public static function getSettingsNavigation(){
-               $l=OC_L10N::get('core');
+               $l=OC_L10N::get('lib');
 
                $settings = array();
                // by default, settings only contain the help menu
index 0c71f6e5e42f5083f53c7de9cef0ae338a84a2e5..a303c0787280b3d41e572f3cf9707d0e7d21add6 100644 (file)
@@ -268,7 +268,7 @@ class OC_Files {
        */
        static function validateZipDownload($dir, $files) {
                if(!OC_Config::getValue('allowZipDownload', true)) {
-                       $l = OC_L10N::get('files');
+                       $l = OC_L10N::get('lib');
                        header("HTTP/1.0 409 Conflict");
                        $tmpl = new OC_Template( '', 'error', 'user' );
                        $errors = array(
@@ -293,7 +293,7 @@ class OC_Files {
                                $totalsize += OC_Filesystem::filesize($dir.'/'.$files);
                        }
                        if($totalsize > $zipLimit) {
-                               $l = OC_L10N::get('files');
+                               $l = OC_L10N::get('lib');
                                header("HTTP/1.0 409 Conflict");
                                $tmpl = new OC_Template( '', 'error', 'user' );
                                $errors = array(
index 32ae734e4a5a355ba36cb0ddd73c1428a0d39682..12442cc83d78f7145219c5d709ca9e41086b96a6 100644 (file)
@@ -24,7 +24,7 @@ class OC_JSON{
        */
        public static function checkAppEnabled($app){
                if( !OC_App::isEnabled($app)){
-                       $l = OC_L10N::get('core');
+                       $l = OC_L10N::get('lib');
                        self::error(array( 'data' => array( 'message' => $l->t('Application is not enabled') )));
                        exit();
                }
@@ -35,7 +35,7 @@ class OC_JSON{
        */
        public static function checkLoggedIn(){
                if( !OC_User::isLoggedIn()){
-                       $l = OC_L10N::get('core');
+                       $l = OC_L10N::get('lib');
                        self::error(array( 'data' => array( 'message' => $l->t('Authentication error') )));
                        exit();
                }
@@ -47,7 +47,7 @@ class OC_JSON{
         */
        public static function callCheck(){
                if( !OC_Util::isCallRegistered()){
-                       $l = OC_L10N::get('core');
+                       $l = OC_L10N::get('lib');
                        self::error(array( 'data' => array( 'message' => $l->t('Token expired. Please reload page.') )));
                        exit();
                }
@@ -59,7 +59,7 @@ class OC_JSON{
        public static function checkAdminUser(){
                self::checkLoggedIn();
                if( !OC_Group::inGroup( OC_User::getUser(), 'admin' )){
-                       $l = OC_L10N::get('core');
+                       $l = OC_L10N::get('lib');
                        self::error(array( 'data' => array( 'message' => $l->t('Authentication error') )));
                        exit();
                }
@@ -71,7 +71,7 @@ class OC_JSON{
        public static function checkSubAdminUser(){
                self::checkLoggedIn();
                if(!OC_Group::inGroup(OC_User::getUser(),'admin') && !OC_SubAdmin::isSubAdmin(OC_User::getUser())){
-                       $l = OC_L10N::get('core');
+                       $l = OC_L10N::get('lib');
                        self::error(array( 'data' => array( 'message' => $l->t('Authentication error') )));
                        exit();
                }
index fe8a3c799431a12ffc531bf29d5b2140f09790e7..fa8d4192615e72d76318aae53c00d4f4187600af 100644 (file)
@@ -76,7 +76,7 @@ function simple_file_size($bytes) {
 }
 
 function relative_modified_date($timestamp) {
-    $l=OC_L10N::get('template');
+    $l=OC_L10N::get('lib');
        $timediff = time() - $timestamp;
        $diffminutes = round($timediff/60);
        $diffhours = round($diffminutes/60);