diff options
| -rwxr-xr-x | lib/app.php | 2 | ||||
| -rw-r--r-- | lib/files.php | 4 | ||||
| -rw-r--r-- | lib/json.php | 10 | ||||
| -rw-r--r-- | lib/template.php | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/lib/app.php b/lib/app.php index 006599e7dfc..261f0793994 100755 --- a/lib/app.php +++ b/lib/app.php @@ -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 diff --git a/lib/files.php b/lib/files.php index 0c71f6e5e42..a303c078728 100644 --- a/lib/files.php +++ b/lib/files.php @@ -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( diff --git a/lib/json.php b/lib/json.php index 32ae734e4a5..12442cc83d7 100644 --- a/lib/json.php +++ b/lib/json.php @@ -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(); } diff --git a/lib/template.php b/lib/template.php index fe8a3c79943..fa8d4192615 100644 --- a/lib/template.php +++ b/lib/template.php @@ -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); |