mirror of
https://github.com/e107inc/e107.git
synced 2025-04-22 13:41:52 +02:00
Merge pull request #2412 from MikeyGMT/20170211
More Duplicate LANS #6 in Submit News, Cron, Mailout
This commit is contained in:
commit
2421efdcb1
@ -2,7 +2,7 @@
|
||||
/*
|
||||
* e107 website system
|
||||
*
|
||||
* Copyright (C) 2008-2016 e107 Inc (e107.org)
|
||||
* Copyright (C) 2008-2017 e107 Inc (e107.org)
|
||||
* Released under the terms and conditions of the
|
||||
* GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
|
||||
*
|
||||
@ -168,7 +168,7 @@ class cron_admin_ui extends e_admin_ui
|
||||
'name' => LAN_CRON_20_4,
|
||||
'category' => 'update',
|
||||
'function' => 'gitrepo',
|
||||
'description' => LAN_CRON_20_5."<br />".LAN_CRON_20_6."<br /><span class='label label-warning'>".LAN_CRON_20_7."</span> ".LAN_CRON_20_8,
|
||||
'description' => LAN_CRON_20_5."<br />".LAN_CRON_20_6."<br /><span class='label label-warning'>".LAN_WARNING."</span> ".LAN_CRON_20_8,
|
||||
// 'available' => e107::getPref('ban_retrigger')
|
||||
);
|
||||
|
||||
|
@ -1,8 +1,10 @@
|
||||
<?php
|
||||
/*
|
||||
* Copyright (C) 2008-2013 e107 Inc (e107.org), Licensed under GNU GPL (http://www.gnu.org/licenses/gpl.txt)
|
||||
* e107 website system
|
||||
*
|
||||
* Admin Language File
|
||||
* Copyright (C) 2008-2017 e107 Inc (e107.org)
|
||||
* Released under the terms and conditions of the
|
||||
* GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
|
||||
*
|
||||
*/
|
||||
|
||||
@ -61,7 +63,7 @@ define("LAN_CRON_20_3", "Recommended to keep system up to date.");
|
||||
define("LAN_CRON_20_4", "Update this Git repository");
|
||||
define("LAN_CRON_20_5", "Update this e107 installation with the very latest files from github.");
|
||||
define("LAN_CRON_20_6", "Recommended for developers only.");
|
||||
define("LAN_CRON_20_7", "Warning!");
|
||||
//define("LAN_CRON_20_7", "Warning!");//LAN_WARNING
|
||||
define("LAN_CRON_20_8", "May cause site instability!");
|
||||
|
||||
define("LAN_CRON_30", "Every Minute");
|
||||
|
@ -52,7 +52,7 @@ define("LAN_MAILOUT_38", "Cancel");
|
||||
define("LAN_MAILOUT_39", "Emailing");
|
||||
define("LAN_MAILOUT_40", "You need to rename <b>e107.htaccess</b> to <b>.htaccess</b> in");
|
||||
define("LAN_MAILOUT_41", "before sending mail from this page.");
|
||||
define("LAN_MAILOUT_42", "Warning");
|
||||
//define("LAN_MAILOUT_42", "Warning");//NOT_USED
|
||||
define("LAN_MAILOUT_43", "Username");
|
||||
define("LAN_MAILOUT_44", "User Login");
|
||||
define("LAN_MAILOUT_45", "User Email");
|
||||
|
@ -1,23 +1,21 @@
|
||||
<?php
|
||||
/*
|
||||
+ ----------------------------------------------------------------------------+
|
||||
| e107 website system - Language File.
|
||||
|
|
||||
| $Source: /cvs_backup/e107_0.8/e107_languages/English/lan_submitnews.php,v $
|
||||
| $Revision$
|
||||
| $Date$
|
||||
| $Author$
|
||||
+----------------------------------------------------------------------------+
|
||||
*/
|
||||
* e107 website system
|
||||
*
|
||||
* Copyright (C) 2008-2017 e107 Inc (e107.org)
|
||||
* Released under the terms and conditions of the
|
||||
* GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
|
||||
*
|
||||
*/
|
||||
define("PAGE_NAME", "Submit News");
|
||||
define("LAN_7", "Name: ");
|
||||
//define("LAN_7", "Name: ");//LAN_NAME
|
||||
//define("LAN_62", "News Title: ");//LAN_TITLE
|
||||
define("LAN_112", "Email Address: ");
|
||||
define("LAN_133", "Thank you");
|
||||
//define("LAN_112", "Email Address: ");//LAN_EMAIL
|
||||
//define("LAN_133", "Thank you");//LAN_THANK_YOU//NOT USED
|
||||
define("LAN_134", "Your item has been submitted for review by one of the site administrators.");
|
||||
define("LAN_135", "News Item: ");
|
||||
define("LAN_135", "News Item");
|
||||
define("LAN_136", "Submit News Item");
|
||||
define("NWSLAN_6", "Category");
|
||||
//define("NWSLAN_6", "Category");//LAN_CATEGORY
|
||||
define("NWSLAN_10", "No news categories");
|
||||
define("NWSLAN_11", "You do not have access to this area or you are currently not logged in.");
|
||||
define("NWSLAN_12", "Access Denied.");
|
||||
@ -31,7 +29,7 @@ define("SUBNEWSLAN_6", "(jpg, gif or png)");
|
||||
define("SUBNEWSLAN_7", "You must give your name and email address");
|
||||
define("SUBNEWSLAN_8", "Error uploading image");
|
||||
define("SUBNEWSLAN_9", "Keywords");
|
||||
define("SUBNEWSLAN_10", "Summary");
|
||||
//define("SUBNEWSLAN_10", "Summary");//LAN_SUMMARY
|
||||
define("SUBNEWSLAN_11", "Meta Description");
|
||||
define("SUBNEWSLAN_12", "Used by Facebook etc.");
|
||||
define("SUBNEWSLAN_13", "Media URLs");
|
||||
|
@ -2,7 +2,7 @@
|
||||
/*
|
||||
* e107 website system
|
||||
*
|
||||
* Copyright (C) 2008-2013 e107 Inc (e107.org)
|
||||
* Copyright (C) 2008-2017 e107 Inc (e107.org)
|
||||
* Released under the terms and conditions of the
|
||||
* GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
|
||||
*
|
||||
@ -211,7 +211,7 @@ class submitNews
|
||||
// echo $mes->render();
|
||||
unset($_POST);
|
||||
|
||||
// $ns->tablerender(LAN_133, "<div style='text-align:center'>".LAN_134."</div>");
|
||||
// $ns->tablerender(LAN_THANK_YOU, "<div style='text-align:center'>".LAN_134."</div>");
|
||||
|
||||
}
|
||||
else
|
||||
@ -250,13 +250,13 @@ class submitNews
|
||||
{
|
||||
$text .= "
|
||||
<tr>
|
||||
<td style='width:20%' class='forumheader3'>".LAN_7."</td>
|
||||
<td style='width:20%' class='forumheader3'>".LAN_NAME."</td>
|
||||
<td style='width:80%' class='forumheader3'>
|
||||
<input class='tbox' type='text' name='submitnews_name' size='60' value='".$tp->toHTML($_POST['submitnew_name'],FALSE,'USER_TITLE')."' maxlength='100' required />
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td style='width:20%' class='forumheader3'>".LAN_112."</td>
|
||||
<td style='width:20%' class='forumheader3'>".LAN_EMAIL."</td>
|
||||
<td style='width:80%' class='forumheader3'>
|
||||
<input class='tbox' type='text' name='submitnews_email' size='60' value='".$tp->filter($_POST['submitnews_email'], 'email')."' maxlength='100' required />
|
||||
</td>
|
||||
@ -265,7 +265,7 @@ class submitNews
|
||||
|
||||
$text .= "
|
||||
<tr>
|
||||
<td style='width:20%' class='forumheader3'>".NWSLAN_6.": </td>
|
||||
<td style='width:20%' class='forumheader3'>".LAN_CATEGORY."</td>
|
||||
<td style='width:80%' class='forumheader3'>";
|
||||
|
||||
if (!$sql->select("news_category"))
|
||||
@ -308,7 +308,7 @@ class submitNews
|
||||
*/
|
||||
$fields = array();
|
||||
$fields['submitnews_keywords'] = array('title'=>SUBNEWSLAN_9, 'type'=>'tags');
|
||||
$fields['submitnews_summary'] = array('title'=>SUBNEWSLAN_10, 'type'=>'text', 'writeParms'=>array('maxlength'=>255, 'size'=>'xxlarge'));
|
||||
$fields['submitnews_summary'] = array('title'=>LAN_SUMMARY, 'type'=>'text', 'writeParms'=>array('maxlength'=>255, 'size'=>'xxlarge'));
|
||||
$fields['submitnews_description'] = array('title'=>SUBNEWSLAN_11, 'type'=>'textarea','writeParms'=>array('placeholder'=>SUBNEWSLAN_12));
|
||||
$fields['submitnews_media'] = array('title'=>SUBNEWSLAN_13, 'type'=>'method', 'method'=>'submitNewsForm::submitnews_media');
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user