fix translations within subfolder /lib
This commit is contained in:
parent
6324daecc0
commit
58b1e841f1
|
@ -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
|
||||
|
|
|
@ -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(
|
||||
|
|
10
lib/json.php
10
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();
|
||||
}
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Reference in New Issue