diff --git a/e107_admin/mailout.php b/e107_admin/mailout.php index 7641b7b65..64200ee84 100644 --- a/e107_admin/mailout.php +++ b/e107_admin/mailout.php @@ -234,7 +234,7 @@ class mailout_admin extends e_admin_dispatcher 'main/list' => array('caption'=> LAN_MANAGE, 'perm'=> 'W'), 'main/create' => array('caption'=> LAN_CREATE, 'perm' => 'W'), - 'recipients/list' => array('caption'=> "Recipients", 'perm' => 'W'), + 'recipients/list' => array('caption'=> Recipients, 'perm' => 'W'), // 'main/send' => array('caption'=> "Send", 'perm' => 'W'), 'other' => array('divider'=> true), // 'saved/list' => array('caption'=> LAN_MAILOUT_191, 'perm' => 'W'), @@ -244,7 +244,7 @@ class mailout_admin extends e_admin_dispatcher 'other2' => array('divider'=> true), 'prefs/prefs' => array('caption'=> LAN_PREFS, 'perm' => '0'), 'maint/maint' => array('caption'=> ADLAN_40, 'perm' => '0'), - 'main/templates' => array('caption'=> 'Template Preview', 'perm' => '0'), + 'main/templates' => array('caption'=> LAN_MAILOUT_262, 'perm' => '0'), ); @@ -290,7 +290,7 @@ class mailout_main_ui extends e_admin_ui 'mail_bcopy_to' => array('title' => LAN_MAILOUT_152,'tab'=>1, 'type'=>'method','data'=>false), 'mail_subject' => array('title' => LAN_MAILOUT_06, 'type'=>'text', 'forced' => TRUE,'data'=>'str', 'inline'=>true, 'writeParms'=>'size=xxlarge&required=1'), 'mail_content_status' => array('title' => LAN_MAILOUT_136, 'tab'=>1, 'type'=> 'dropdown', 'data'=>'int', 'filter'=>false, 'inline'=>false, 'thclass' => 'left', 'class'=>'left'), - 'mail_total_count' => array('title' => "Total Recipients", 'noedit'=>true, 'type'=>'number'), + 'mail_total_count' => array('title' => LAN_MAILOUT_263, 'noedit'=>true, 'type'=>'number'), 'mail_sent_count' => array('title' => LAN_MAILOUT_82, 'noedit'=>true, 'type'=>'number'), 'mail_togo_count' => array('title' => LAN_MAILOUT_83, 'noedit'=>true, 'type'=>'number'), @@ -307,7 +307,7 @@ class mailout_main_ui extends e_admin_ui 'mail_attach' => array('title' => LAN_MAILOUT_153, 'tab'=>1, 'type'=>'method','data'=>false), 'mail_include_images' => array('title' => LAN_MAILOUT_224, 'tab'=>1, 'type'=>'boolean','data'=>false, 'proc' => 'yesno'), 'mail_send_style' => array('title' => LAN_MAILOUT_154,'type'=>'method','data'=>false), - 'mail_media' => array('title' => 'Embed Media', 'type' => 'images', 'data' => 'array', 'width' => 'auto', 'help' => '', 'readParms' => '', 'writeParms' => 'video=1', 'class' => 'center', 'thclass' => 'center', ), + 'mail_media' => array('title' => LAN_MAILOUT_264, 'type' => 'images', 'data' => 'array', 'width' => 'auto', 'help' => '', 'readParms' => '', 'writeParms' => 'video=1', 'class' => 'center', 'thclass' => 'center', ), 'mail_body' => array('title' => LAN_MAILOUT_100, 'type'=>'bbarea', 'proc' => 'trunc200'), 'mail_body_templated' => array('title' => LAN_MAILOUT_257, 'noedit'=>true, 'proc' => 'chars'), @@ -404,7 +404,7 @@ class mailout_main_ui extends e_admin_ui define('MAIL_STATUS_TEMP', 22); // Tags entries which aren't yet in any list */ - $types = array(10=>'Pending',20=>"Saved", 21=>"Held", 0=>'Sent', 1=>'Bounced', 2=>'Cancelled', 3=> 'Partial', 5=>'Failed', 19 => "Max Active", 22=>"Temp"); + $types = array(10=>LAN_MAILOUT_265,20=>LAN_SAVED, 21=>LAN_MAILOUT_217, 0=>LAN_MAILOUT_211, 1=>LAN_MAILOUT_213, 2=>LAN_MAILOUT_218, 3=>LAN_MAILOUT_219, 5=>LAN_MAILOUT_212, 19 => LAN_MAILOUT_266, 22=>"Temp"); $qr = array('saved'=>20,'pending'=>10,'held'=>21,'sent'=>0); @@ -1174,8 +1174,8 @@ class mailout_main_ui extends e_admin_ui if(function_exists('openssl_pkey_new') && deftrue('e_DEVELOPER')) { - $text .= "DomainKeys Identified Mail (DKIM)".$frm->button('DKIM_generate',1,'primary','Generate Public/Private keys')." - Developer Mode Only"; + $text .= "DomainKeys Identified Mail (DKIM)".$frm->button('DKIM_generate',1,'primary',LAN_MAILOUT_267)." + ".LAN_MAILOUT_268.""; } @@ -1585,8 +1585,8 @@ class mailout_admin_form_ui extends e_admin_form_ui $link = e_SELF."?mode=main&action=send&id=".$id; $preview = e_SELF."?mode=main&action=preview&id=".$id; $text .= ""; - $text .= "".E_32_MAIL.""; - $text .= "".E_32_SEARCH.""; + $text .= "".E_32_MAIL.""; + $text .= "".E_32_SEARCH.""; $text .= $this->renderValue('options',$value,$attributes,$id); @@ -1600,8 +1600,8 @@ class mailout_admin_form_ui extends e_admin_form_ui $preview = e_SELF."?mode=main&action=preview&id=".$id.'&user='.$user; $text = ""; - $text .= "".E_32_USER.""; - $text .= "".E_32_SEARCH.""; + $text .= "".E_32_USER.""; + $text .= "".E_32_SEARCH.""; $attributes['readParms']['editClass'] = e_UC_NOBODY; $text .= $this->renderValue('options',$value,$attributes,$id); @@ -2636,4 +2636,4 @@ function headerjs() return $text; } -?> \ No newline at end of file +?> diff --git a/e107_core/shortcodes/batch/comment_shortcodes.php b/e107_core/shortcodes/batch/comment_shortcodes.php index ee13f69c5..3dfa6f40a 100644 --- a/e107_core/shortcodes/batch/comment_shortcodes.php +++ b/e107_core/shortcodes/batch/comment_shortcodes.php @@ -364,7 +364,7 @@ class comment_shortcodes extends e_shortcode if ($pref['allowCommentEdit'] && USER && $this->var['user_id'] == USERID && ($this->var['comment_lock'] < 1)) { - $adop_icon = (file_exists(THEME."images/commentedit.png") ? "".COMLAN_318."" : "Edit"); + $adop_icon = (file_exists(THEME."images/commentedit.png") ? "".COMLAN_318."" : LAN_EDIT); //Searching for '.' is BAD!!! It breaks mod rewritten requests. Why is this needed at all? if (strstr(e_QUERY, "&")) { diff --git a/e107_core/shortcodes/batch/news_shortcodes.php b/e107_core/shortcodes/batch/news_shortcodes.php index dfdac3578..62a6577e7 100644 --- a/e107_core/shortcodes/batch/news_shortcodes.php +++ b/e107_core/shortcodes/batch/news_shortcodes.php @@ -439,7 +439,7 @@ class news_shortcodes extends e_shortcode } // When news_allow_comments = 1 then it is disabled. Backward, but that's how it is in v1.x - $text = ($this->news_item['news_allow_comments'] ? $this->param['commentoffstring'] : "news_item)."'>".$this->param['commentlink'].''); + $text = ($this->news_item['news_allow_comments'] ? $this->param['commentoffstring'] : "news_item)."'>".$this->param['commentlink'].''); return $text; } diff --git a/e107_languages/English/admin/lan_mailout.php b/e107_languages/English/admin/lan_mailout.php index 35121df36..bb7432049 100644 --- a/e107_languages/English/admin/lan_mailout.php +++ b/e107_languages/English/admin/lan_mailout.php @@ -280,7 +280,13 @@ define("LAN_HOLD", "Hold"); define("LAN_MAILOUT_260", "User-Type"); define("LAN_MAILOUT_261", "SMTP Port"); - +define("LAN_MAILOUT_262", "Template Preview"); +define("LAN_MAILOUT_263", "Total Recipients"); +define("LAN_MAILOUT_264", "Embed Media"); +define("LAN_MAILOUT_265", "Pending"); +define("LAN_MAILOUT_266", "Max Active"); +define("LAN_MAILOUT_267", "Generate Public/Private keys"); +define("LAN_MAILOUT_268", "Developer Mode Only"); //define("LAN_SUBMIT", "Do it!"); LAN_RUN -?> \ No newline at end of file +?> diff --git a/e107_plugins/forum/forum_post.php b/e107_plugins/forum/forum_post.php index 3711c2482..03b00577b 100644 --- a/e107_plugins/forum/forum_post.php +++ b/e107_plugins/forum/forum_post.php @@ -1228,7 +1228,7 @@ class forum_post_handler if($postResult === -1 || $newPostId === -1) //Duplicate post { require_once(HEADERF); - $message = LAN_FORUM_3006."
Return"; + $message = LAN_FORUM_3006."
".LAN_FORUM_8028.""; $text = e107::getMessage()->addError($message)->render(); e107::getRender()->tablerender(LAN_PLUGIN_FORUM_NAME, $text); // change to forum-title pref. require_once(FOOTERF); @@ -1282,7 +1282,7 @@ class forum_post_handler $txt = e107::getParser()->parseTemplate($txt,true, $SHORTCODES); - e107::getRender()->tablerender('Forums', e107::getMessage()->render().$txt); + e107::getRender()->tablerender(e_PAGETITLE, e107::getMessage()->render().$txt); require_once(FOOTERF); exit; } diff --git a/e107_plugins/forum/languages/English/English_front.php b/e107_plugins/forum/languages/English/English_front.php index 5c63053ef..8e0247810 100644 --- a/e107_plugins/forum/languages/English/English_front.php +++ b/e107_plugins/forum/languages/English/English_front.php @@ -343,6 +343,8 @@ define("LAN_FORUM_8024", "Failed to open thread"); define("LAN_FORUM_8025", "Failed to stick thread"); define("LAN_FORUM_8026", "Failed to unstick thread"); define("LAN_FORUM_8027", "No action selected"); +define("LAN_FORUM_8028", "Return"); +define("LAN_FORUM_8029", "New topic created!"); /* THIS WILL BE DELETED ONCE THE REWRITE IS DONE ================================================== diff --git a/e107_plugins/forum/templates/forum_posted_template.php b/e107_plugins/forum/templates/forum_posted_template.php index 4763c727d..c8d7b74a2 100644 --- a/e107_plugins/forum/templates/forum_posted_template.php +++ b/e107_plugins/forum/templates/forum_posted_template.php @@ -66,13 +66,13 @@ $FORUMREPLYPOSTED = " $FORUM_POSTED_TEMPLATE['poll'] = $FORUMPOLLPOSTED; $FORUM_POSTED_TEMPLATE['thread'] = "
-

New topic created.

+

".LAN_FORUM_8029."

".LAN_FORUM_3048." ".LAN_FORUM_2022."
"; $FORUM_POSTED_TEMPLATE['reply'] = "
-

New reply created.

+

".LAN_FORUM_3049."

".LAN_FORUM_3048." ".LAN_FORUM_2022."
"; @@ -82,4 +82,4 @@ $FORUM_POSTED_TEMPLATE['reply'] = "
-?> \ No newline at end of file +?>