diff --git a/e107_admin/mailout.php b/e107_admin/mailout.php index e6b654e73..cd90040b3 100644 --- a/e107_admin/mailout.php +++ b/e107_admin/mailout.php @@ -1316,7 +1316,7 @@ class mailout_main_ui extends e_admin_ui "; - $bouncePrefs = array('mail_bounce_email'=>LAN_MAILOUT_32, 'mail_bounce_pop3'=>LAN_MAILOUT_33, 'mail_bounce_user'=>LAN_MAILOUT_34, 'mail_bounce_pass'=>LAN_MAILOUT_35); + $bouncePrefs = array('mail_bounce_email'=>LAN_MAILOUT_32, 'mail_bounce_pop3'=>LAN_MAILOUT_33, 'mail_bounce_user'=>LAN_MAILOUT_34, 'mail_bounce_pass'=>LAN_PASSWORD); foreach($bouncePrefs as $key =>$label) { @@ -1328,7 +1328,7 @@ class mailout_main_ui extends e_admin_ui ".LAN_MAILOUT_32." ".LAN_MAILOUT_33." ".LAN_MAILOUT_34." - ".LAN_MAILOUT_35." + ".LAN_PASSWORD." "; */ @@ -2627,7 +2627,7 @@ function show_prefs($mailAdmin) ".LAN_MAILOUT_32." ".LAN_MAILOUT_33." ".LAN_MAILOUT_34." - ".LAN_MAILOUT_35." + ".LAN_PASSWORD." ".LAN_MAILOUT_120."  \n".LOGIN_MENU_L2."  \n"; - $ret .= ($pref['user_tracking'] == "cookie") ? "".LOGIN_MENU_L6."  \n" : ""; - $ret .= ""; + $ret .= "
\n
\n".LAN_LOGINMENU_1."  \n".LAN_LOGINMENU_2."  \n"; + $ret .= ($pref['user_tracking'] == "cookie") ? "".LAN_LOGINMENU_6."  \n" : ""; + $ret .= ""; if($pref['user_reg']) { - $ret .= "  "; + $ret .= "  "; } $ret .= "
\n
"; } diff --git a/e107_handlers/sitelinks_class.php b/e107_handlers/sitelinks_class.php index 75526675d..d4683d321 100644 --- a/e107_handlers/sitelinks_class.php +++ b/e107_handlers/sitelinks_class.php @@ -672,7 +672,7 @@ class e_navigation $pref = e107::getPref(); - $this->admin_cat['title'][1] = ADLAN_CL_1; + $this->admin_cat['title'][1] = LAN_SETTINGS; $this->admin_cat['id'][1] = 'setMenu'; $this->admin_cat['img'][1] = $tp->toGlyph('e-settings-16'); $this->admin_cat['lrg_img'][1] = $tp->toGlyph('e-settings-32'); diff --git a/e107_languages/English/English.php b/e107_languages/English/English.php index daa1bd06d..06be8f499 100644 --- a/e107_languages/English/English.php +++ b/e107_languages/English/English.php @@ -78,6 +78,11 @@ define("LAN_CATEGORY", "Category"); define("LAN_GUEST", "Guest"); define("LAN_NEXT", "Next"); define("LAN_PREVIOUS", "Previous"); +define("LAN_LOGIN", "Login"); +define("LAN_LOGOUT", "Logout"); +define("LAN_SETTINGS", "Settings"); +define("LAN_PASSWORD", "Password"); + ?> \ No newline at end of file diff --git a/e107_languages/English/admin/lan_admin.php b/e107_languages/English/admin/lan_admin.php index 5c6f943fd..ebf437ee1 100644 --- a/e107_languages/English/admin/lan_admin.php +++ b/e107_languages/English/admin/lan_admin.php @@ -51,7 +51,7 @@ define("ADLAN_42", "Pages/Menus"); define("ADLAN_43", "Create custom menu items"); define("ADLAN_44", "Database"); define("ADLAN_45", "Database utilities"); -define("ADLAN_46", "Logout"); +// define("ADLAN_46", "Logout"); define("ADLAN_47", "Welcome"); define("ADLAN_48", "Logged in"); define("ADLAN_49", "main site administrator"); @@ -184,7 +184,7 @@ define("ADLAN_161", "Custom Fields?"); define("ADLAN_162", "A newer version of your site-theme is available:"); define("ADLAN_163", "A newer version of an installed plugin is available:"); -define("ADLAN_CL_1", "Settings"); +// define("ADLAN_CL_1", "Settings"); define("ADLAN_CL_2", "Users"); define("ADLAN_CL_3", "Content"); define("ADLAN_CL_4", "Coms"); diff --git a/e107_languages/English/admin/lan_mailout.php b/e107_languages/English/admin/lan_mailout.php index 131fcf0e8..b88f638e9 100644 --- a/e107_languages/English/admin/lan_mailout.php +++ b/e107_languages/English/admin/lan_mailout.php @@ -45,7 +45,7 @@ define("LAN_MAILOUT_31", "Bounced Email Processing"); define("LAN_MAILOUT_32", "Email address"); define("LAN_MAILOUT_33", "Incoming Mail server"); define("LAN_MAILOUT_34", "Account (user) Name"); -define("LAN_MAILOUT_35", "Password"); +// define("LAN_MAILOUT_35", "Password"); define("LAN_MAILOUT_36", "Delete Bounced Mails after checking"); define("LAN_MAILOUT_37", "Proceed"); define("LAN_MAILOUT_38", "Cancel"); diff --git a/e107_languages/English/lan_signup.php b/e107_languages/English/lan_signup.php index 8c20ca75e..2f10d475f 100644 --- a/e107_languages/English/lan_signup.php +++ b/e107_languages/English/lan_signup.php @@ -147,7 +147,7 @@ define('LAN_SIGNUP_106', 'Unable to action your request - do you already have an define("LAN_LOGINNAME", "Username"); -define("LAN_PASSWORD", "Password"); +//define("LAN_PASSWORD", "Password"); define("LAN_USERNAME", "Display Name"); define("LAN_SIGNUP_107", "Password must be a minimum of [x] characters and include at least one UPPERCASE letter and a digit"); diff --git a/e107_plugins/login_menu/config.php b/e107_plugins/login_menu/config.php index e9c8494a1..e3f6e8bed 100644 --- a/e107_plugins/login_menu/config.php +++ b/e107_plugins/login_menu/config.php @@ -127,23 +127,23 @@ $text = " /* - '.LOGIN_MENU_L42.' + '.LAN_LOGINMENU_42.' */ $text .= " - ".LOGIN_MENU_L31." + ".LAN_LOGINMENU_31." ".$frm->checkbox('pref[new_news]', 1, varset($loginPrefs['new_news'],0))." - ".LOGIN_MENU_L34." + ".LAN_LOGINMENU_34." ".$frm->checkbox('pref[new_comments]', 1, varset($loginPrefs['new_comments'],0))." - ".LOGIN_MENU_L36." + ".LAN_LOGINMENU_36." ".$frm->checkbox('pref[new_members]', 1, varset($loginPrefs['new_members'],0))." @@ -157,7 +157,7 @@ $text = " "; -$ns->tablerender(LOGIN_MENU_L41, $text); +$ns->tablerender(LAN_LOGINMENU_41, $text); require_once(e_ADMIN."footer.php"); diff --git a/e107_plugins/login_menu/languages/English.php b/e107_plugins/login_menu/languages/English.php index 20c014942..5844c3188 100644 --- a/e107_plugins/login_menu/languages/English.php +++ b/e107_plugins/login_menu/languages/English.php @@ -14,66 +14,66 @@ * $Author$ */ -define("LOGIN_MENU_L1", "Username: "); -define("LOGIN_MENU_L2", "Password: "); -define("LOGIN_MENU_L3", "Sign up"); -define("LOGIN_MENU_L4", "Forgot password?"); -define("LOGIN_MENU_L5", "Welcome"); -define("LOGIN_MENU_L6", "Remember me"); -define("LOGIN_MENU_L7", "Unique user ID not recognised (possible corrupted cookie). Please click the logout link below to destroy cookie."); -define("LOGIN_MENU_L8", "Logout"); -define("LOGIN_MENU_L9", "Login Error"); -define("LOGIN_MENU_L10", "The maintenance flag is true - this means normal visitors are being redirected to sitedown.php. To reset the flag go to admin/maintenance."); -define("LOGIN_MENU_L11", "Admin Area"); -define("LOGIN_MENU_L12", "Settings"); -define("LOGIN_MENU_L13", "Profile"); -define("LOGIN_MENU_L14", "news item"); -define("LOGIN_MENU_L15", "news items"); -define("LOGIN_MENU_L16", "chatbox post"); -define("LOGIN_MENU_L17", "chatbox posts"); -define("LOGIN_MENU_L18", "comment"); -define("LOGIN_MENU_L19", "comments"); -define("LOGIN_MENU_L20", "forum post"); -define("LOGIN_MENU_L21", "forum posts"); -define("LOGIN_MENU_L22", "new site member"); -define("LOGIN_MENU_L23", "new site members"); -define("LOGIN_MENU_L24", "Click here to see list of new items"); -define("LOGIN_MENU_L25", "Since your last visit there have been"); -define("LOGIN_MENU_L26", "no"); -define("LOGIN_MENU_L27", "and"); -define("LOGIN_MENU_L28", "Login"); +define("LAN_LOGINMENU_1", "Username: "); +define("LAN_LOGINMENU_2", "Password: "); +define("LAN_LOGINMENU_3", "Sign up"); +define("LAN_LOGINMENU_4", "Forgot password?"); +define("LAN_LOGINMENU_5", "Welcome"); +define("LAN_LOGINMENU_6", "Remember me"); +define("LAN_LOGINMENU_7", "Unique user ID not recognised (possible corrupted cookie). Please click the logout link below to destroy cookie."); +// define("LAN_LOGINMENU_8", "Logout"); +define("LAN_LOGINMENU_9", "Login Error"); +define("LAN_LOGINMENU_10", "The maintenance flag is true - this means normal visitors are being redirected to sitedown.php. To reset the flag go to admin/maintenance."); +define("LAN_LOGINMENU_11", "Admin Area"); +// define("LAN_LOGINMENU_12", "Settings"); +define("LAN_LOGINMENU_13", "Profile"); +define("LAN_LOGINMENU_14", "news item"); +define("LAN_LOGINMENU_15", "news items"); +define("LAN_LOGINMENU_16", "chatbox post"); +define("LAN_LOGINMENU_17", "chatbox posts"); +define("LAN_LOGINMENU_18", "comment"); +define("LAN_LOGINMENU_19", "comments"); +define("LAN_LOGINMENU_20", "forum post"); +define("LAN_LOGINMENU_21", "forum posts"); +define("LAN_LOGINMENU_22", "new site member"); +define("LAN_LOGINMENU_23", "new site members"); +define("LAN_LOGINMENU_24", "Click here to see list of new items"); +define("LAN_LOGINMENU_25", "Since your last visit there have been"); +define("LAN_LOGINMENU_26", "no"); +define("LAN_LOGINMENU_27", "and"); +// define("LAN_LOGINMENU_28", "Login"); -//define("LOGIN_MENU_L29", "new article"); -//define("LOGIN_MENU_L30", "new articles"); +//define("LAN_LOGINMENU_29", "new article"); +//define("LAN_LOGINMENU_30", "new articles"); // New config options -define('LOGIN_MENU_L31', 'Show New News Posts'); -//define('LOGIN_MENU_L32', 'Show New Article Posts'); -//define('LOGIN_MENU_L33', 'Show New Chatbox Posts'); -define('LOGIN_MENU_L34', 'Show New Comment Posts'); -//define('LOGIN_MENU_L35', 'Show New Forum Posts'); -define('LOGIN_MENU_L36', 'Show New Members'); +define('LAN_LOGINMENU_31', 'Show New News Posts'); +//define('LAN_LOGINMENU_32', 'Show New Article Posts'); +//define('LAN_LOGINMENU_33', 'Show New Chatbox Posts'); +define('LAN_LOGINMENU_34', 'Show New Comment Posts'); +//define('LAN_LOGINMENU_35', 'Show New Forum Posts'); +define('LAN_LOGINMENU_36', 'Show New Members'); -define('LOGIN_MENU_L39', 'Leave Admin'); -define("LOGIN_MENU_L40", "Resend Activation Email"); -define("LOGIN_MENU_L41", "Login Menu Settings"); +define('LAN_LOGINMENU_39', 'Leave Admin'); +define("LAN_LOGINMENU_40", "Resend Activation Email"); +define("LAN_LOGINMENU_41", "Login Menu Settings"); //new v0.8 -define('LOGIN_MENU_L37', 'Show'); -define('LOGIN_MENU_L38', 'Login menu - Additional Links'); +define('LAN_LOGINMENU_37', 'Show'); +define('LAN_LOGINMENU_38', 'Login menu - Additional Links'); -define('LOGIN_MENU_L42', 'Login menu - Recent core additions'); -define('LOGIN_MENU_L43', 'Position'); -define('LOGIN_MENU_L44', 'missing link title'); -define('LOGIN_MENU_L45', 'link(s) -'); -define('LOGIN_MENU_L45a', ''); //pre -define('LOGIN_MENU_L45b', 'plugin'); //post -define('LOGIN_MENU_L46', 'recent items -'); -define('LOGIN_MENU_L47', 'Login menu - Recent plugin additions'); -define('LOGIN_MENU_L48', 'Menu Config'); -define('LOGIN_MENU_L49', 'Email: '); -define('LOGIN_MENU_L50', 'Username or Email: '); -define("LOGIN_MENU_L51", "Sign In"); +define('LAN_LOGINMENU_42', 'Login menu - Recent core additions'); +define('LAN_LOGINMENU_43', 'Position'); +define('LAN_LOGINMENU_44', 'missing link title'); +define('LAN_LOGINMENU_45', 'link(s) -'); +define('LAN_LOGINMENU_45a', ''); //pre +define('LAN_LOGINMENU_45b', 'plugin'); //post +define('LAN_LOGINMENU_46', 'recent items -'); +define('LAN_LOGINMENU_47', 'Login menu - Recent plugin additions'); +define('LAN_LOGINMENU_48', 'Menu Config'); +define('LAN_LOGINMENU_49', 'Email: '); +define('LAN_LOGINMENU_50', 'Username or Email: '); +define("LAN_LOGINMENU_51", "Sign In"); ?> \ No newline at end of file diff --git a/e107_plugins/login_menu/login_menu.php b/e107_plugins/login_menu/login_menu.php index 345b5a013..14ccb84ab 100644 --- a/e107_plugins/login_menu/login_menu.php +++ b/e107_plugins/login_menu/login_menu.php @@ -45,9 +45,9 @@ else //Corrup cookie - template? - TODO if (defined('CORRUPT_COOKIE') && CORRUPT_COOKIE == TRUE) { - $text = "
".LOGIN_MENU_L7."

- {$bullet} ".LOGIN_MENU_L8."
"; - $ns->tablerender(LOGIN_MENU_L9, $text, 'login_error'); + $text = "
".LAN_LOGINMENU_7."

+ {$bullet} ".LAN_LOGOUT."
"; + $ns->tablerender(LAN_LOGINMENU_9, $text, 'login_error'); } //Image code @@ -146,9 +146,9 @@ if (USER == TRUE || ADMIN == TRUE) //menu caption if (file_exists(THEME.'images/login_menu.png')) { - $caption = ''.LOGIN_MENU_L5.' '.USERNAME; + $caption = ''.LAN_LOGINMENU_5.' '.USERNAME; } else { - $caption = LOGIN_MENU_L5.' '.USERNAME; + $caption = LAN_LOGINMENU_5.' '.USERNAME; } //render @@ -184,9 +184,9 @@ else $text .= ''; if (file_exists(THEME.'images/login_menu.png')) { - $caption = ''.LOGIN_MENU_L5; + $caption = ''.LAN_LOGINMENU_5; } else { - $caption = LOGIN_MENU_L5; + $caption = LAN_LOGINMENU_5; } $ns->tablerender($caption, $text, 'login'); } diff --git a/e107_plugins/login_menu/login_menu_class.php b/e107_plugins/login_menu/login_menu_class.php index 1210a04b5..0473c9946 100644 --- a/e107_plugins/login_menu/login_menu_class.php +++ b/e107_plugins/login_menu/login_menu_class.php @@ -177,10 +177,10 @@ class login_menu_class return array(); $lbox_stats = array(); - $lbox_stats[0]['stat_item'] = LOGIN_MENU_L20; - $lbox_stats[0]['stat_items'] = LOGIN_MENU_L21; + $lbox_stats[0]['stat_item'] = LAN_LOGINMENU_20; + $lbox_stats[0]['stat_items'] = LAN_LOGINMENU_21; $lbox_stats[0]['stat_new'] = 0; - $lbox_stats[0]['stat_nonew'] = LOGIN_MENU_L26.' '.LOGIN_MENU_L21; + $lbox_stats[0]['stat_nonew'] = LAN_LOGINMENU_26.' '.LAN_LOGINMENU_21; if($get_stats) { $nobody_regexp = "'(^|,)(".str_replace(",", "|", e_UC_NOBODY).")(,|$)'"; @@ -209,10 +209,10 @@ class login_menu_class if(!e107::isInstalled('chatbox_menu')) return array(); - $lbox_stats[0]['stat_item'] = LOGIN_MENU_L16; - $lbox_stats[0]['stat_items'] = LOGIN_MENU_L17; + $lbox_stats[0]['stat_item'] = LAN_LOGINMENU_16; + $lbox_stats[0]['stat_items'] = LAN_LOGINMENU_17; $lbox_stats[0]['stat_new'] = 0; - $lbox_stats[0]['stat_nonew'] = LOGIN_MENU_L26.' '.LOGIN_MENU_L17; + $lbox_stats[0]['stat_nonew'] = LAN_LOGINMENU_26.' '.LAN_LOGINMENU_17; if(vartrue($get_stats)) { $lbox_stats['chatbox_menu'][0]['stat_new'] = $sql->db_Count('chatbox', '(*)', 'WHERE `cb_datestamp` > '.USERLV); } @@ -234,7 +234,7 @@ class login_menu_class foreach ($lbox_infos['links'] as $id => $stack) { $links = array(); foreach ($stack as $value) { - $links[] = ''.vartrue($value['link_label'], '['.LOGIN_MENU_L44.']').''; + $links[] = ''.vartrue($value['link_label'], '['.LAN_LOGINMENU_44.']').''; } $plug_data = $this->get_plugin_data($id); @@ -243,7 +243,7 @@ class login_menu_class $ret .= ' - '.LOGIN_MENU_L37.' '.(varset($plug_data['eplug_name']) ? LOGIN_MENU_L45.LOGIN_MENU_L45a." {$plug_data['eplug_name']} ".LOGIN_MENU_L45b."
" : '').$links.' + '.LAN_LOGINMENU_37.' '.(varset($plug_data['eplug_name']) ? LAN_LOGINMENU_45.LAN_LOGINMENU_45a." {$plug_data['eplug_name']} ".LAN_LOGINMENU_45b."
" : '').$links.' @@ -252,7 +252,7 @@ class login_menu_class
- '.LOGIN_MENU_L43.': + '.LAN_LOGINMENU_43.':
@@ -265,7 +265,7 @@ class login_menu_class if($ret) { - $ret = ''.LOGIN_MENU_L38.''.$ret; + $ret = ''.LAN_LOGINMENU_38.''.$ret; } return $ret; @@ -292,7 +292,7 @@ class login_menu_class { $ret .= ' - '.LOGIN_MENU_L37.' '.LOGIN_MENU_L46.LOGIN_MENU_L45a." {$plug_data['eplug_name']} ".LOGIN_MENU_L45b.'
+ '.LAN_LOGINMENU_37.' '.LAN_LOGINMENU_46.LAN_LOGINMENU_45a." {$plug_data['eplug_name']} ".LAN_LOGINMENU_45b.'
@@ -304,7 +304,7 @@ class login_menu_class if($ret) { - $ret = ''.LOGIN_MENU_L47.''.$ret; + $ret = ''.LAN_LOGINMENU_47.''.$ret; } return $ret; diff --git a/e107_plugins/login_menu/login_menu_shortcodes.php b/e107_plugins/login_menu/login_menu_shortcodes.php index 62f634a5f..196fbb596 100755 --- a/e107_plugins/login_menu/login_menu_shortcodes.php +++ b/e107_plugins/login_menu/login_menu_shortcodes.php @@ -41,7 +41,7 @@ global $tp; private $use_imagecode =0; private $sec; - private $usernameLabel = LOGIN_MENU_L1; + private $usernameLabel = LAN_LOGINMENU_1; private $allowEmailLogin; function __construct() @@ -55,12 +55,12 @@ global $tp; if($pref['allowEmailLogin']==1) { - $this->usernameLabel = LOGIN_MENU_L49; + $this->usernameLabel = LAN_LOGINMENU_49; } if($pref['allowEmailLogin']==2) { - $this->usernameLabel = LOGIN_MENU_L50; + $this->usernameLabel = LAN_LOGINMENU_50; } } @@ -93,7 +93,7 @@ global $tp; function sc_lm_password_label($parm='') { - return LOGIN_MENU_L2; + return LAN_LOGINMENU_2; } @@ -133,7 +133,7 @@ global $tp; function sc_lm_loginbutton($parm='') { - return ""; + return ""; } function sc_lm_rememberme($parm='') @@ -144,7 +144,7 @@ global $tp; } if($pref['user_tracking'] != "session") { - return "".($parm ? $parm : ""); + return "".($parm ? $parm : ""); } return ''; } @@ -156,7 +156,7 @@ global $tp; { if (!$pref['auth_method'] || $pref['auth_method'] == 'e107') { - return $parm == 'href' ? e_SIGNUP : "".LOGIN_MENU_L3.""; + return $parm == 'href' ? e_SIGNUP : "".LAN_LOGINMENU_3.""; } } return ''; @@ -167,7 +167,7 @@ global $tp; $pref = e107::getPref(); if (!$pref['auth_method'] || $pref['auth_method'] == 'e107') { - return $parm == 'href' ? SITEURL.'fpw.php' : "".LOGIN_MENU_L4.""; + return $parm == 'href' ? SITEURL.'fpw.php' : "".LAN_LOGINMENU_4.""; } return ''; } @@ -182,7 +182,7 @@ global $tp; { if (!$pref['auth_method'] || $pref['auth_method'] == 'e107' ) { - return $parm == 'href' ? e_SIGNUP.'?resend' : "".LOGIN_MENU_L40.""; + return $parm == 'href' ? e_SIGNUP.'?resend' : "".LAN_LOGINMENU_40.""; } } } @@ -195,7 +195,7 @@ global $tp; if(ADMIN && varset($pref['maintainance_flag'])) { - return LOGIN_MENU_L10; + return LAN_LOGINMENU_10; } return ''; } @@ -213,7 +213,7 @@ global $tp; function sc_lm_adminlink($parm='') { if(ADMIN == TRUE) { - return $parm == 'href' ? e_ADMIN_ABS.'admin.php' : ''.LOGIN_MENU_L11.''; + return $parm == 'href' ? e_ADMIN_ABS.'admin.php' : ''.LAN_LOGINMENU_11.''; } return ''; } @@ -221,7 +221,7 @@ global $tp; function sc_lm_admin_configure($parm='') { if(ADMIN == TRUE) { - return $parm == 'href' ? e_PLUGIN_ABS.'login_menu/config.php' : ''.LOGIN_MENU_L48.''; + return $parm == 'href' ? e_PLUGIN_ABS.'login_menu/config.php' : ''.LAN_LOGINMENU_48.''; } return ''; } @@ -234,7 +234,7 @@ global $tp; function sc_lm_usersettings($parm='') { - $text = ($parm) ? $parm : LOGIN_MENU_L12; + $text = ($parm) ? $parm : LAN_SETTINGS; $url = $this->sc_lm_usersettings_href(); return ''.$text.''; } @@ -247,7 +247,7 @@ global $tp; function sc_lm_profile($parm='') { - $text = ($parm) ? $parm : LOGIN_MENU_L13; + $text = ($parm) ? $parm : LAN_LOGINMENU_13; $url = $this->sc_lm_profile_href(); return ''.$text.''; } @@ -260,7 +260,7 @@ global $tp; function sc_lm_logout($parm='') { - $text = ($parm) ? $parm : LOGIN_MENU_L8; + $text = ($parm) ? $parm : LAN_LOGOUT; return ''.$text.''; } @@ -295,13 +295,13 @@ global $tp; function sc_lm_external_link($parm='') { $lbox_item = getcachedvars('login_menu_linkdata'); - return $parm == 'href' ? $lbox_item['link_url'] : ''.vartrue($lbox_item['link_label'], '['.LOGIN_MENU_L44.']').''; + return $parm == 'href' ? $lbox_item['link_url'] : ''.vartrue($lbox_item['link_label'], '['.LAN_LOGINMENU_44.']').''; } function sc_lm_external_link_label($parm='') { $lbox_item = getcachedvars('login_menu_linkdata'); - return vartrue($lbox_item['link_label'], '['.LOGIN_MENU_L44.']'); + return vartrue($lbox_item['link_label'], '['.LAN_LOGINMENU_44.']'); } function sc_lm_stats($parm='') @@ -322,12 +322,12 @@ global $tp; $tmp = array(); if($data['new_news']){ $tmp['LM_STAT_NEW'] = $data['new_news']; - $tmp['LM_STAT_LABEL'] = $data['new_news'] == 1 ? LOGIN_MENU_L14 : LOGIN_MENU_L15; + $tmp['LM_STAT_LABEL'] = $data['new_news'] == 1 ? LAN_LOGINMENU_14 : LAN_LOGINMENU_15; $tmp['LM_STAT_EMPTY'] = ''; } else { $tmp['LM_STAT_NEW'] = ''; $tmp['LM_STAT_LABEL'] = ''; - $tmp['LM_STAT_EMPTY'] = LOGIN_MENU_L26." ".LOGIN_MENU_L15; + $tmp['LM_STAT_EMPTY'] = LAN_LOGINMENU_26." ".LAN_LOGINMENU_15; } return $tp -> parseTemplate($LOGIN_MENU_STATITEM, false, $tmp); } @@ -340,12 +340,12 @@ global $tp; $tmp = array(); if($data['new_comments']){ $tmp['LM_STAT_NEW'] = $data['new_comments']; - $tmp['LM_STAT_LABEL'] = $data['new_comments'] == 1 ? LOGIN_MENU_L18 : LOGIN_MENU_L19; + $tmp['LM_STAT_LABEL'] = $data['new_comments'] == 1 ? LAN_LOGINMENU_18 : LAN_LOGINMENU_19; $tmp['LM_STAT_EMPTY'] = ''; } else { $tmp['LM_STAT_NEW'] = ''; $tmp['LM_STAT_LABEL'] = ''; - $tmp['LM_STAT_EMPTY'] = LOGIN_MENU_L26." ".LOGIN_MENU_L19; + $tmp['LM_STAT_EMPTY'] = LAN_LOGINMENU_26." ".LAN_LOGINMENU_19; } return $tp -> parseTemplate($LOGIN_MENU_STATITEM, false, $tmp); } @@ -358,12 +358,12 @@ global $tp; $tmp = array(); if($data['new_users']){ $tmp['LM_STAT_NEW'] = $data['new_users']; - $tmp['LM_STAT_LABEL'] = $data['new_users'] == 1 ? LOGIN_MENU_L22 : LOGIN_MENU_L23; + $tmp['LM_STAT_LABEL'] = $data['new_users'] == 1 ? LAN_LOGINMENU_22 : LAN_LOGINMENU_23; $tmp['LM_STAT_EMPTY'] = ''; } else { $tmp['LM_STAT_NEW'] = ''; $tmp['LM_STAT_LABEL'] = ''; - $tmp['LM_STAT_EMPTY'] = LOGIN_MENU_L26." ".LOGIN_MENU_L23; + $tmp['LM_STAT_EMPTY'] = LAN_LOGINMENU_26." ".LAN_LOGINMENU_23; } return $tp -> parseTemplate($LOGIN_MENU_STATITEM, false, $tmp); } @@ -403,7 +403,7 @@ global $tp; { $data = getcachedvars('login_menu_data'); if($parm == 'href') return $data['listnew_link']; - return $data['listnew_link'] ? ''.LOGIN_MENU_L24.'' : ''; + return $data['listnew_link'] ? ''.LAN_LOGINMENU_24.'' : ''; } diff --git a/e107_plugins/login_menu/login_menu_template.php b/e107_plugins/login_menu/login_menu_template.php index b8355def1..94aca250a 100644 --- a/e107_plugins/login_menu/login_menu_template.php +++ b/e107_plugins/login_menu/login_menu_template.php @@ -178,7 +178,7 @@ if ( ! isset($LOGIN_MENU_LOGGED)) $sc_style['LM_EXTERNAL_LINKS']['pre'] = '
  • '; $sc_style['LM_EXTERNAL_LINKS']['post'] = '
    • '; - $sc_style['LM_STATS']['pre'] = '
  • '.LOGIN_MENU_L25.':
  • '; + $sc_style['LM_STATS']['pre'] = '
  • '.LAN_LOGINMENU_25.':
  • '; $sc_style['LM_STATS']['post'] = '
    • '; $sc_style['LM_LISTNEW_LINK']['pre'] = '
  • '; diff --git a/e107_themes/bootstrap/theme_shortcodes.php b/e107_themes/bootstrap/theme_shortcodes.php index fee1d600e..e44772266 100644 --- a/e107_themes/bootstrap/theme_shortcodes.php +++ b/e107_themes/bootstrap/theme_shortcodes.php @@ -46,8 +46,8 @@ class theme_shortcodes extends e_shortcode '; $text .= ' - '.LOGIN_MENU_L4.' - '.LOGIN_MENU_L40.' + '.LAN_LOGINMENU_4.' + '.LAN_LOGINMENU_40.' '; diff --git a/e107_themes/bootstrap3/theme_shortcodes.php b/e107_themes/bootstrap3/theme_shortcodes.php index 840b3a676..0f16a9742 100644 --- a/e107_themes/bootstrap3/theme_shortcodes.php +++ b/e107_themes/bootstrap3/theme_shortcodes.php @@ -92,7 +92,7 @@ class theme_shortcodes extends e_shortcode if($userReg==1) { $text .= ' -
  • '.LOGIN_MENU_L3.'
    • +
  • '.LAN_LOGINMENU_3.'
    • '; // Signup } @@ -105,7 +105,7 @@ class theme_shortcodes extends e_shortcode
  • - '.LOGIN_MENU_L51.' + '.LAN_LOGINMENU_51.'
    {SOCIAL_LOGIN: size=2x} @@ -137,15 +137,15 @@ class theme_shortcodes extends e_shortcode
    + '.LAN_LOGINMENU_6.'
    - + '; $text .= ' - '.LOGIN_MENU_L4.' - '.LOGIN_MENU_L40.' + '.LAN_LOGINMENU_4.' + '.LAN_LOGINMENU_40.' ';