diff --git a/e107_admin/notify.php b/e107_admin/notify.php index e02eb1d62..2cfc8c5a8 100644 --- a/e107_admin/notify.php +++ b/e107_admin/notify.php @@ -192,7 +192,7 @@ class notify_config } $text .= ""; - $caption = str_replace("_menu","",ucfirst($k))." Events"; //TODO LAN + $caption = str_replace("_menu","",ucfirst($k))." ".LAN_NOTIFY_01; $tab[] = array('caption'=>$caption, 'text' => $text); } diff --git a/e107_admin/prefs.php b/e107_admin/prefs.php index 94e91fa0d..db4f4cee2 100644 --- a/e107_admin/prefs.php +++ b/e107_admin/prefs.php @@ -374,27 +374,27 @@ $text .= "
".$tp->parseTemplate("{IMAGESELECTOR={$parms $sLogo = siteinfo_shortcodes::sc_logo(); */ -$text .= $frm->imagepicker('sitebutton',$pref['sitebutton'],'','help=Used by Facebook and others. Should be a square image of at least 144px in width and height.'); +$text .= $frm->imagepicker('sitebutton',$pref['sitebutton'],'','help='.PRFLAN_225); $text .= " - ".$frm->imagepicker('sitelogo',$pref['sitelogo'],'','help=Used by some themes as the header image on some pages.')." + ".$frm->imagepicker('sitelogo',$pref['sitelogo'],'','help='.PRFLAN_226)." ".$frm->textarea('sitetag', $tp->toForm($pref['sitetag']), 3, 59)." -
Used by some themes. Place 'SITETAG' in your theme to use this value.
+
".PRFLAN_227."
".$frm->textarea('sitedescription', $tp->toForm($pref['sitedescription']), 3, 80)." -
Used by some themes. Place 'SITEDESCRIPTION' in your theme to use this value.
+
".PRFLAN_228."
@@ -402,7 +402,7 @@ $text .= " ".$frm->textarea('sitedisclaimer',$tp->toForm( $pref['sitedisclaimer']), 3, 80)." -
Used by some themes. Place 'SITEDISCLAIMER' in your theme to use this value.
+
".PRFLAN_229."
@@ -803,11 +803,10 @@ $text .= " - - // TODO LAN + $text .= " - + ".$frm->select('inputdate',$inputdate, e107::getPref('inputdate')); @@ -1527,7 +1526,6 @@ $text .= " // Key registration -// TODO LAN @@ -1547,13 +1545,13 @@ $text .= " $signup_option_names = array( // "signup_option_loginname" => "Login Name", - "signup_option_email_confirm" => "Email Confirmation", + "signup_option_email_confirm" => CUSTSIG_21, "signup_option_realname" => CUSTSIG_2, "signup_option_signature" => CUSTSIG_6, "signup_option_image" => CUSTSIG_7, "signup_option_class" => CUSTSIG_17, 'signup_option_customtitle' => CUSTSIG_20, - 'signup_option_hideemail' => 'Option to hide email' + 'signup_option_hideemail' => CUSTSIG_22 ); foreach($signup_option_names as $value => $key) @@ -2006,10 +2004,10 @@ $text .= " - + ".$frm->number('failed_login_limit', varset($pref['failed_login_limit'],10), 3, array('max'=>10, 'min'=>0))." -
Failed logins from the same IP will be banned after this many attempts.
+
".PRFLAN_232."
@@ -2074,22 +2072,22 @@ $text .= " - Moderate Comments made by: + ".PRFLAN_233." ". $frm->uc_select('comments_moderate', $pref['comments_moderate'],"nobody,guest,new,bots,public,admin,main,classes"). " -
Comments will require manual approval by an admin prior to being visible to other users
+
".PRFLAN_234."
- Comment Sorting: + ".PRFLAN_235." "; $comment_sort = array( - "desc" => "Most recent comments first", //default //TODO LAN - 'asc' => "Most recent comments last" + "desc" => PRFLAN_236, //default + 'asc' => PRFLAN_237 ); $text .= $frm->select('comments_sort',$comment_sort, $pref['comments_moderate'])." @@ -2132,7 +2130,7 @@ $text .= " $text .= "
- File Uploading"; + ".PRFLAN_238.""; $upload_max_filesize = ini_get('upload_max_filesize'); @@ -2143,7 +2141,7 @@ $text .= " if($maxINI < $pref['upload_maxfilesize']) { $text .= "
"; - $text .= "The maximum upload size imposed by your php.ini settings is: ".$maxINI."
"; + $text .= PRFLAN_239." ".$maxINI."
"; $pref['upload_maxfilesize'] = $maxINI; } @@ -2183,7 +2181,7 @@ $text .= "
".UPLLAN_38."
- Filetype upload limits + ".PRFLAN_240." @@ -2207,7 +2205,7 @@ $text .= " $text .= "
-
** For security reasons these values may only be changed manually in the following file: ".str_replace("../",'',e_SYSTEM).e_READ_FILETYPES."
+
".PRFLAN_241." ".str_replace("../",'',e_SYSTEM).e_READ_FILETYPES."
@@ -2225,10 +2223,9 @@ $text .= " // Javascript Control -//TODO LANS $text .= "
- Javascript Frameworks (for testing purposes only) + ".PRFLAN_242." @@ -2237,11 +2234,11 @@ $text .= " "; $js_options = array( - 'auto' => 'Auto (on-demand)', // load based on dependency - 'admin' => 'Admin Area', // Always load in admin - 'front' => 'Front-End', // Always load in front-end - 'all' => "Both", // Always load in admin and front-end - 'none' => 'Disabled' // disabled + 'auto' => PRFLAN_243, // load based on dependency + 'admin' => PRFLAN_244, // Always load in admin + 'front' => PRFLAN_245, // Always load in front-end + 'all' => PRFLAN_246, // Always load in admin and front-end + 'none' => PRFLAN_247 // disabled ); @@ -2281,31 +2278,31 @@ $text .= " - + - + - + - + "; @@ -2447,22 +2444,22 @@ function pref_submit($post_id = '') function prefs_adminmenu() { $var['core-prefs-main']['text'] = PRFLAN_1; - $var['core-prefs-email']['text'] = "Email & Contact Info"; + $var['core-prefs-email']['text'] = PRFLAN_254; $var['core-prefs-registration']['text'] = PRFLAN_28; $var['core-prefs-signup']['text'] = PRFLAN_19; // $var['core-prefs-sociallogin']['text'] = "Social Options"; // Moved into plugin. $var['core-prefs-comments']['text'] = PRFLAN_210; - $var['core-prefs-uploads']['text'] = "File Uploading"; // TODO LAN + $var['core-prefs-uploads']['text'] = PRFLAN_255; - $var['core-prefs-header1']['header'] = "Advanced Options"; + $var['core-prefs-header1']['header'] = PRFLAN_256; $var['core-prefs-display']['text'] = PRFLAN_13; $var['core-prefs-admindisp']['text'] = PRFLAN_77; $var['core-prefs-textpost']['text'] = PRFLAN_101; $var['core-prefs-security']['text'] = PRFLAN_47; $var['core-prefs-date']['text'] = PRFLAN_21; - $var['core-prefs-javascript']['text'] = "Javascript Framework"; // TODO LAN + $var['core-prefs-javascript']['text'] = PRFLAN_257; $var['core-prefs-advanced']['text'] = PRFLAN_149; e107::getNav()->admin("Basic ".LAN_OPTIONS.'--id--prev_nav', 'core-prefs-main', $var); diff --git a/e107_admin/update_routines.php b/e107_admin/update_routines.php index a49d50d68..a51fa17d6 100644 --- a/e107_admin/update_routines.php +++ b/e107_admin/update_routines.php @@ -781,11 +781,10 @@ function update_706_to_800($type='') } } } - //TODO LAN - + if(count($chgPath)) { - $log->addWarning('Before continuing, please manually delete the following outdated folders from your system: '); + $log->addWarning(LAN_UPDATE_57.' '); array_unique($chgPath); asort($chgPath); foreach($chgPath as $cgp) diff --git a/e107_languages/English/admin/lan_e107_update.php b/e107_languages/English/admin/lan_e107_update.php index 253d6f94e..b404983b5 100644 --- a/e107_languages/English/admin/lan_e107_update.php +++ b/e107_languages/English/admin/lan_e107_update.php @@ -54,6 +54,8 @@ define('LAN_UPDATE_54', 'Missing table --TABLE-- - cannot add index --INDEX--'); define('LAN_UPDATE_55', 'Description'); define('LAN_UPDATE_56', 'System Update'); +define('LAN_UPDATE_57', 'Before continuing, please manually delete the following outdated folders from your system:'); + define('LAN_UPDATE_CAPTION_PLUGIN', 'Plugin Updates'); // Unused define('LAN_UPDATE_CAPTION_CORE', 'Core Updates'); // Unused diff --git a/e107_languages/English/admin/lan_notify.php b/e107_languages/English/admin/lan_notify.php index 19586492b..b6de501c5 100644 --- a/e107_languages/English/admin/lan_notify.php +++ b/e107_languages/English/admin/lan_notify.php @@ -34,4 +34,6 @@ define('NM_LAN_2', 'Bulk email run complete'); define("NF_LAN_1", "File Events"); define("NF_LAN_2", "File uploaded by user"); +define("LAN_NOTIFY_01", "Events"); + ?> diff --git a/e107_languages/English/admin/lan_prefs.php b/e107_languages/English/admin/lan_prefs.php index af8e5288e..91937bbcd 100644 --- a/e107_languages/English/admin/lan_prefs.php +++ b/e107_languages/English/admin/lan_prefs.php @@ -88,6 +88,8 @@ define("CUSTSIG_17", "Subscribe to content/mailouts"); define("CUSTSIG_18", "Disallow usernames"); define("CUSTSIG_19", "usernames containing the following text will be rejected, separate entries by commas"); define("CUSTSIG_20", "User Custom Title"); +define("CUSTSIG_21", "Email Confirmation"); +define("CUSTSIG_22", "Option to hide email"); define("PRFLAN_91", "If someone is attacking your site by multiple requests to your server, his IP will be automatically banned ! Best done with server config if possible!!!"); define("PRFLAN_92", "Secure signup verification -- hide password in email?"); @@ -232,4 +234,43 @@ define("PRFLAN_223", "Completely Automated Public Turing test to tell Computers define("PRFLAN_224", "User registration system"); +define("PRFLAN_225", "Used by Facebook and others. Should be a square image of at least 144px in width and height."); +define("PRFLAN_226", "Used by some themes as the header image on some pages."); +define("PRFLAN_227", "Used by some themes. Place 'SITETAG' in your theme to use this value."); +define("PRFLAN_228", "Used by some themes. Place 'SITEDESCRIPTION' in your theme to use this value."); +define("PRFLAN_229", "Used by some themes. Place 'SITEDISCLAIMER' in your theme to use this value."); +define("PRFLAN_230", "Date/Time Input-Field format"); + +define("PRFLAN_231", "Maximum failed logins before ban:"); +define("PRFLAN_232", "Failed logins from the same IP will be banned after this many attempts."); +define("PRFLAN_233", "Moderate Comments made by:"); +define("PRFLAN_234", "Comments will require manual approval by an admin prior to being visible to other users"); +define("PRFLAN_235", "Comment Sorting:"); +define("PRFLAN_236", "Most recent comments first"); +define("PRFLAN_237", "Most recent comments last"); + +define("PRFLAN_238", "File Uploading"); +define("PRFLAN_239", "The maximum upload size imposed by your php.ini settings is:"); +define("PRFLAN_240", "Filetype upload limits"); +define("PRFLAN_241", "** For security reasons these values may only be changed manually in the following file:"); + +define("PRFLAN_242", "Javascript Frameworks (for testing purposes only)"); +define("PRFLAN_243", "Auto (on-demand)"); +define("PRFLAN_244", "Admin Area"); +define("PRFLAN_245", "Front-End"); +define("PRFLAN_246", "Both"); +define("PRFLAN_247", "Disabled"); + +define("PRFLAN_248", "Disable scripts consolidation"); +define("PRFLAN_249", "If disabled, scripts will be loaded in one consolidated file"); +define("PRFLAN_250", "Enable consolidated scripts zlib compression:"); +define("PRFLAN_251", "Used only when script consolidation is enabled"); +define("PRFLAN_252", "Disable consolidated scripts server cache:"); +define("PRFLAN_253", "Disable consolidated scripts browser cache:"); + +define("PRFLAN_254", "Email & Contact Info"); +define("PRFLAN_255", "File Uploading"); +define("PRFLAN_256", "Advanced Options"); +define("PRFLAN_257", "Javascript Framework"); + ?> \ No newline at end of file
Disable scripts consolidation".PRFLAN_248." ".$frm->radio_switch('e_jslib_nocombine', $pref['e_jslib_nocombine'], LAN_YES, LAN_NO)." -
If disabled, scripts will be loaded in one consolidated file
+
".PRFLAN_249."
Enable consolidated scripts zlib compression:".PRFLAN_250." ".$frm->radio_switch('e_jslib_gzip', $pref['e_jslib_gzip'], LAN_YES, LAN_NO)." -
Used only when script consolidation is enabled
+
".PRFLAN_251."
Disable consolidated scripts server cache:".PRFLAN_252." ".$frm->radio_switch('e_jslib_nocache', $pref['e_jslib_nocache'], LAN_YES, LAN_NO)." -
Used only when script consolidation is enabled
+
".PRFLAN_251."
Disable consolidated scripts browser cache:".PRFLAN_253." ".$frm->radio_switch('e_jslib_nobcache', $pref['e_jslib_nobcache'], LAN_YES, LAN_NO)." -
Used only when script consolidation is enabled
+
".PRFLAN_251."