1
0
mirror of https://github.com/e107inc/e107.git synced 2025-07-31 11:50:30 +02:00

Merge pull request #3479 from yesszus/patch-1

Update English_admin_rss_menu.php
This commit is contained in:
Cameron
2018-09-30 11:51:48 -07:00
committed by GitHub
3 changed files with 7 additions and 6 deletions

View File

@@ -48,7 +48,7 @@ define("RSS_LAN_ADMINMENU_1", "RSS Options");
define("RSS_LAN_ADMINMENU_2", "Listing");
define("RSS_LAN_ADMINMENU_4", "Import");
define("RSS_LAN_ERROR_1", "This is not a valid rss feed.[br][br][Return to rss feed list]");
define("RSS_LAN_ERROR_1", "This is not a valid rss feed. [Return to rss feed list]");
define("RSS_LAN_ERROR_2", "Your e107_config.php file or your language files contain spaces or  characters before the <? characters. You should remove this with a non-utf8 text-editor if you wish to have a valid RSS feed.");
define("RSS_LAN_ERROR_3", "No rss feeds are present yet[br]please use the import feature to import available rss feeds or create a rss feed manually.");
define("RSS_LAN_ERROR_4", "No rss feeds are available yet");
@@ -104,4 +104,4 @@ define("LAN_AL_RSS_05","RSS limits updated");
define("LAN_AL_RSS_06","RSS settings updated");
define("LAN_AL_RSS_07","");
*/
?>
?>

View File

@@ -137,7 +137,7 @@ if(!$sql->select('rss', '*', "rss_class!=2 AND rss_url='".$content_type."' ".$ch
if(!$sql->select('rss', '*', "rss_class!=2 AND rss_url='".$content_type."' ".$check_topic." AND rss_limit>0 "))
{
require_once(HEADERF);
$repl = array("<a href='".e_REQUEST_SELF."'>", "</a>");
$repl = array("<br /><br /><a href='".e_REQUEST_SELF."'>", "</a>");
$message = str_replace(array("[","]"), $repl, RSS_LAN_ERROR_1);
$ns->tablerender('', $message);
require_once(FOOTERF);
@@ -809,4 +809,4 @@ class rssCreate
$tmp = explode("@",$text);
return ($tmp[0] != "") ? $tmp[0].RSS_LAN_2 : RSS_LAN_3;
}
} // End class rssCreate
} // End class rssCreate

View File

@@ -9,6 +9,7 @@
* Custom FAQ install/uninstall/update routines
*
*/
e107::includeLan(e_PLUGIN.'rss_menu/languages/'.e_LANGUAGE.'_admin_rss_menu.php');
class rss_menu_setup
{
@@ -26,11 +27,11 @@ class rss_menu_setup
$insert = array(
'rss_id' => 0,
'rss_name' => 'News',
'rss_name' => RSS_NEWS,
'rss_url' => 'news',
'rss_topicid' => '',
'rss_path' => 'news',
'rss_text' => 'The rss feed of the news',
'rss_text' => RSS_PLUGIN_LAN_7,
'rss_datestamp' => time(),
'rss_class' => '0',
'rss_limit' => '9'