diff --git a/e107_admin/banlist.php b/e107_admin/banlist.php
index 4e6c3f00a..b870716dd 100644
--- a/e107_admin/banlist.php
+++ b/e107_admin/banlist.php
@@ -411,7 +411,7 @@ class banlist_form_ui extends e_admin_form_ui
}
elseif($this->getController()->getAction() == 'create')
{
- return $this->hidden('banlist_bantype',eIPHandler::BAN_TYPE_MANUAL)."Blacklist entry"; //TODO LAN
+ return $this->hidden('banlist_bantype',eIPHandler::BAN_TYPE_MANUAL)."".BANLAN_121."";
}
diff --git a/e107_admin/cron.php b/e107_admin/cron.php
index 0288e3318..9b9a37f7a 100644
--- a/e107_admin/cron.php
+++ b/e107_admin/cron.php
@@ -175,10 +175,10 @@ class cron_admin_ui extends e_admin_ui
if(is_dir(e_BASE.".git"))
{
$cronDefaults['_system'][7] = array(
- 'name' => "Update this Git repository", //TODO LAN
+ 'name' => LAN_CRON_20_4,
'category' => 'update',
'function' => 'gitrepo',
- 'description' => "Update this e107 installation with the very latest files from github.
Recommended for developers only.
Warning! May cause site instability!", //TODO LAN
+ 'description' => LAN_CRON_20_5."
".LAN_CRON_20_6."
".LAN_CRON_20_7." ".LAN_CRON_20_8,
// 'available' => e107::getPref('ban_retrigger')
);
@@ -442,7 +442,8 @@ class cron_admin_ui extends e_admin_ui
$obj = new $class_name;
if (method_exists($obj, $method_name))
{
- $mes->add("Executing config function ".$class_name." : ".$method_name."()", E_MESSAGE_DEBUG);
+ $message = str_replace('[function]', $class_name." : ".$method_name, LAN_CRON_55);
+ $mes->add($message, E_MESSAGE_DEBUG);
if ($return == 'boolean')
{
call_user_func(array($obj, $method_name));
@@ -455,7 +456,8 @@ class cron_admin_ui extends e_admin_ui
}
else
{
- $mes->add("Config function ".$method_name."() NOT found.", E_MESSAGE_DEBUG);
+ $message = str_replace('[method]', $method_name."()", LAN_CRON_56);
+ $mes->add($message, E_MESSAGE_DEBUG);
}
}
return FALSE;
diff --git a/e107_admin/db.php b/e107_admin/db.php
index a140125d7..42b49246f 100644
--- a/e107_admin/db.php
+++ b/e107_admin/db.php
@@ -104,15 +104,15 @@ if(e_AJAX_REQUEST )
$zip = e107::getFile()->zip($data, e_BACKUP.$newFile.".zip");
- echo "File backup complete! (".$zip.")
";
+ echo DBLAN_60." (".$zip.")
";
- echo "Starting database backup...
";
+ echo DBLAN_61."
";
$dbfile = e107::getDb()->backup('*', $newFile.".sql", array('nologs'=>1, 'droptable'=>1));
- echo "Database backup complete! (".$dbfile.")";
+ echo DBLAN_62." (".$dbfile.")";
- e107::getAdminLog()->addSuccess($zip." ".$dbfile, false)->save('Full site backup completed.');
+ e107::getAdminLog()->addSuccess($zip." ".$dbfile, false)->save(DBLAN_63);
}
@@ -175,9 +175,9 @@ class system_tools
'importForm' => array('diz'=>DBLAN_59, 'label'=> DBLAN_59),
'exportForm' => array('diz'=>DBLAN_58, 'label'=> DBLAN_58),
'sc_override_scan' => array('diz'=>DBLAN_55, 'label'=> DBLAN_56),
- 'convert_to_utf8' => array('diz'=>'Check Database Charset','label'=>'Check Charset'),
- 'correct_perms' => array('diz'=>'Correct File and Directory permissions','label'=>'Correct Perms'),
- 'backup' => array('diz'=>'Backup Database, Files and Folders','label'=>'Backup Site')
+ 'convert_to_utf8' => array('diz'=>DBLAN_64,'label'=>DBLAN_65),
+ 'correct_perms' => array('diz'=>DBLAN_66,'label'=>DBLAN_67),
+ 'backup' => array('diz'=>DBLAN_68,'label'=>DBLAN_69)
);
if(vartrue($_SERVER['E_DEV']))
@@ -307,8 +307,8 @@ class system_tools
$mes = e107::getMessage();
- $message = "This will create a database dump and a zipped backup of all non-core plugins, your site theme, your media files and system logs";
- $message .= "
".LAN_CREATE."";
+ $message = DBLAN_70;
+ $message .= "
".LAN_CREATE."";
$mes->addInfo($message);
@@ -339,10 +339,10 @@ class system_tools
}
else
{
- $mes->addSuccess("Folder and File permissions have been updated");
+ $mes->addSuccess(DBLAN_72);
}
- e107::getRender()->tablerender(DBLAN_10.SEP."Correcting File and Directory Permissions", $mes->render());
+ e107::getRender()->tablerender(DBLAN_10.SEP.DBLAN_73, $mes->render());
}
@@ -359,14 +359,14 @@ class system_tools
if($connect = $sql->connect($server,$user, $pass, true))
{
- $mes->addSuccess("Connecting to server");
+ $mes->addSuccess(DBLAN_74);
if(vartrue($_POST['createdb']))
{
if($sql->gen("CREATE DATABASE ".$database." CHARACTER SET `utf8`"))
{
- $mes->addSuccess("Creating Database");
+ $mes->addSuccess(DBLAN_75);
// $sql->gen("CREATE USER ".$user."@'".$server."' IDENTIFIED BY '".$pass."';");
$sql->gen("GRANT ALL ON `".$database."`.* TO ".$user."@'".$server."';");
@@ -374,17 +374,17 @@ class system_tools
}
else
{
- $mes->addError("Creating Database");
+ $mes->addError(DBLAN_75);
return;
}
}
if(!$sql->database($database))
{
- $mes->addError("Selecting database");
+ $mes->addError(DBLAN_76);
}
- $mes->addSuccess("Selecting database");
+ $mes->addSuccess(DBLAN_76);
if($this->multiSiteCreateTables($sql, $prefix))
{
@@ -396,7 +396,7 @@ class system_tools
}
else
{
- $mes->addSuccess("Connecting to server");
+ $mes->addSuccess(DBLAN_74);
}
if($error = $sql->getLastErrorText())
@@ -418,7 +418,7 @@ class system_tools
if (!$sql_data)
{
- $mes->addError("Couldn't read core sql file");
+ $mes->addError(DBLAN_77);
}
preg_match_all("/create(.*?)(?:myisam|innodb);/si", $sql_data, $result );
@@ -455,16 +455,17 @@ class system_tools
if(!isset($POST['create_multisite']))
{
- $mes->addInfo("This will create a fresh installation of e107 at the domain you specify. Using your server administration software (eg. cPanel) - park your other domain on top of ".e_DOMAIN);
+ $info = str_replace('[domain]', e_DOMAIN, LANINS_133);
+ $mes->addInfo($info);
}
$text = $frm->open('multisite')."
+ | - - The parked domain which will become a new e107 website. + + ".LANINS_131." | ||||||||||||||||||
Table | -Engine | -Collation | -Status | +".DBLAN_78." | +".DBLAN_79." | +".DBLAN_80." | +".DBLAN_81." | ||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
Resize images during media import Leave empty to disable |
+ ".IMALAN_105." ".IMALAN_106." |
".$frm->text('img_import_resize_w', $img_import_w,4)."px X ".$frm->text('img_import_resize_h', $img_import_h,4)."px | @@ -1622,10 +1621,9 @@ class media_admin_ui extends e_admin_ui list($img_import_w,$img_import_h) = explode("x",$pref['img_import_resize']); - //TODO LANS - $text .= " + $text .= "|||||||||||||||||
Resize images during media import Leave empty to disable |
+ ".IMALAN_105." ".IMALAN_106." |
".$frm->text('img_import_resize_w', $img_import_w,4)."px X ".$frm->text('img_import_resize_h', $img_import_h,4)."px | @@ -1777,7 +1775,7 @@ class media_admin_ui extends e_admin_ui if(!$typePath = $this->getPath($upload['type'])) { - $mes->addError("Couldn't generated path from upload data"); + $mes->addError(IMALAN_107); return FALSE; } $mes->addDebug(print_a($upload,TRUE)); @@ -1788,7 +1786,10 @@ class media_admin_ui extends e_admin_ui if(!rename($oldpath, e_MEDIA.$newpath)) { - $mes->add("Couldn't move file from ".$oldpath." to ".$newpath, E_MESSAGE_ERROR); + $srch = array('[x]','[y]'); + $repl = array($oldpath,$newpath); + $text = str_replace($srch,$repl,IMALAN_108); + $mes->add($text, E_MESSAGE_ERROR); return FALSE; }; @@ -1819,7 +1820,7 @@ class media_admin_ui extends e_admin_ui if(!($typePath = $this->getPath($img_data['media_type']))) { - $mes->addError("Couldn't get path ".$typePath); + $mes->addError(IMALAN_109." ".$typePath); return FALSE; } @@ -1836,7 +1837,10 @@ class media_admin_ui extends e_admin_ui if(!rename($oldpath, $newpath)) { - $mes->add("Couldn't move file from ".$oldpath." to ".str_replace('../', '', $newpath), E_MESSAGE_ERROR); + $srch = array('[x]','[y]'); + $repl = array($oldpath,str_replace('../', '', $newpath)); + $text = str_replace($srch,$repl,IMALAN_110); + $mes->add($text, E_MESSAGE_ERROR); return FALSE; } $img_data['media_url'] = $tp->createConstants($newpath, 'rel'); @@ -1892,7 +1896,8 @@ class media_admin_ui extends e_admin_ui if(!vartrue($this->mimePaths[$pmime])) { - $mes->add("Couldn't detect mime-type($mime). Upload failed.", E_MESSAGE_ERROR); + $text = str_replace('[x]',$mime,IMALAN_111); + $mes->add($text, E_MESSAGE_ERROR); return FALSE; } @@ -1902,7 +1907,8 @@ class media_admin_ui extends e_admin_ui { if(!mkdir($dir, 0755)) { - $mes->add("Couldn't create folder ($dir).", E_MESSAGE_ERROR); + $text = str_replace('[x]',$dir,IMALAN_112); + $mes->add($text, E_MESSAGE_ERROR); return FALSE; }; } @@ -1931,14 +1937,14 @@ class media_admin_ui extends e_admin_ui if(!vartrue($_POST['batch_import_selected'])) { - $mes->add("Scanning for new media (images, videos, files) in folder: ".e_IMPORT."", E_MESSAGE_INFO); + $mes->add(IMALAN_113." ".e_IMPORT."", E_MESSAGE_INFO); } if(!count($files)) { if(!vartrue($_POST['batch_import_selected'])) { - $mes->add("No media Found! Please upload some files.", E_MESSAGE_INFO); + $mes->add(IMALAN_114, E_MESSAGE_INFO); } $text = $this->uploadTab(); @@ -1960,15 +1966,15 @@ class media_admin_ui extends e_admin_ui|||||||||||||||||
".e107::getForm()->checkbox_toggle('e-column-toggle', 'batch_selected')." | -Preview | +".IMALAN_121." | ".LAN_FILE." | -Title (internal use) | -Caption (seen by public) | -Author | -Mime Type | -File Size | +".IMALAN_115." | +".IMALAN_116." | +".IMALAN_117." | +".IMALAN_118." | +".IMALAN_119." | ".LAN_DATESTAMP." | -Dimensions | +".IMALAN_120." |