From 2f7aa5a40d48a586003ececeb3cdad3f33f11941 Mon Sep 17 00:00:00 2001 From: Tijn Kuyper Date: Wed, 19 Dec 2012 11:37:45 +0100 Subject: [PATCH] Last plugin LAN clean-up (#50) for now. --- e107_handlers/plugin_class.php | 16 +++++------ e107_plugins/pm/languages/English_global.php | 6 +++++ .../poll/languages/English_admin_poll.php | 4 +-- .../poll/languages/English_global.php | 6 +++++ e107_plugins/poll/plugin.xml | 11 +++----- .../languages/English_admin_rss_menu.php | 14 +++++----- .../rss_menu/languages/English_global.php | 6 +++++ e107_plugins/rss_menu/plugin.xml | 10 ++----- .../languages/English_admin_trackback.php | 27 +++++++++---------- .../trackback/languages/English_global.php | 6 +++++ e107_plugins/trackback/plugin.xml | 7 ++--- 11 files changed, 60 insertions(+), 53 deletions(-) create mode 100644 e107_plugins/poll/languages/English_global.php create mode 100644 e107_plugins/rss_menu/languages/English_global.php create mode 100644 e107_plugins/trackback/languages/English_global.php diff --git a/e107_handlers/plugin_class.php b/e107_handlers/plugin_class.php index b1bfd8949..699df0527 100644 --- a/e107_handlers/plugin_class.php +++ b/e107_handlers/plugin_class.php @@ -1570,7 +1570,7 @@ class e107plugin } /** - * Process XML Tag + * Process XML Tag // DEPRECATED - using _install _log and _global * @param object $function * @param object $tag * @return none @@ -1581,7 +1581,7 @@ class e107plugin $updated = false; - $path_a = e_PLUGIN.$this->plugFolder."/languages/English_install.php"; // always check for English so we have a fall-bak + $path_a = e_PLUGIN.$this->plugFolder."/languages/English_install.php"; // always check for English so we have a fall-back $path_b = e_PLUGIN.$this->plugFolder."/languages/English/English_install.php"; if(file_exists($path_a) || file_exists($path_b)) @@ -1589,7 +1589,7 @@ class e107plugin e107::lan($this->plugFolder,'install',true); } - $path_a = e_PLUGIN.$this->plugFolder."/languages/English_global.php"; // always check for English so we have a fall-bak + $path_a = e_PLUGIN.$this->plugFolder."/languages/English_global.php"; // always check for English so we have a fall-back $path_b = e_PLUGIN.$this->plugFolder."/languages/English/English_global.php"; if(file_exists($path_a) || file_exists($path_b)) @@ -1612,7 +1612,7 @@ class e107plugin } - $path_a = e_PLUGIN.$this->plugFolder."/languages/English_log.php"; // always check for English so we have a fall-bak + $path_a = e_PLUGIN.$this->plugFolder."/languages/English_log.php"; // always check for English so we have a fall-back $path_b = e_PLUGIN.$this->plugFolder."/languages/English/English_log.php"; if(file_exists($path_a) || file_exists($path_b)) @@ -2572,17 +2572,17 @@ class e107plugin } // For BC. - $ret['administration']['icon'] = str_replace($plugName."/","",$eplug_icon); + $ret['administration']['icon'] = str_replace($plugName."/","",$eplug_icon); $ret['administration']['caption'] = varset($eplug_caption); - $ret['administration']['iconSmall'] = str_replace($plugName."/","",$eplug_icon_small); + $ret['administration']['iconSmall'] = str_replace($plugName."/","",$eplug_icon_small); $ret['administration']['configFile'] = varset($eplug_conffile); if (varset($eplug_conffile)) { $ret['adminLinks']['link'][0]['@attributes']['url'] = varset($eplug_conffile); $ret['adminLinks']['link'][0]['@attributes']['description'] = LAN_CONFIGURE; - $ret['adminLinks']['link'][0]['@attributes']['icon'] = str_replace($plugName."/","",$eplug_icon); - $ret['adminLinks']['link'][0]['@attributes']['iconSmall'] = str_replace($plugName."/","",$eplug_icon_small); + $ret['adminLinks']['link'][0]['@attributes']['icon'] = str_replace($plugName."/","",$eplug_icon); + $ret['adminLinks']['link'][0]['@attributes']['iconSmall'] = str_replace($plugName."/","",$eplug_icon_small); $ret['adminLinks']['link'][0]['@attributes']['primary'] = 'true'; } if (vartrue($eplug_link) && varset($eplug_link_name) && varset($eplug_link_url)) diff --git a/e107_plugins/pm/languages/English_global.php b/e107_plugins/pm/languages/English_global.php index e69de29bb..b7f1e7cd8 100644 --- a/e107_plugins/pm/languages/English_global.php +++ b/e107_plugins/pm/languages/English_global.php @@ -0,0 +1,6 @@ + \ No newline at end of file diff --git a/e107_plugins/poll/languages/English_admin_poll.php b/e107_plugins/poll/languages/English_admin_poll.php index 75263d62b..a8f2a474b 100644 --- a/e107_plugins/poll/languages/English_admin_poll.php +++ b/e107_plugins/poll/languages/English_admin_poll.php @@ -14,8 +14,8 @@ * $Author$ */ -define("POLL_ADLAN01", "Poll"); -define("POLL_ADLAN02", "The poll plugin allows you to define polls in either a menu or forum post."); +//define("POLL_ADLAN01", "Poll"); +//define("POLL_ADLAN02", "The poll plugin allows you to define polls in either a menu or forum post."); define("POLL_ADLAN03", "Configure polls"); define("POLL_ADLAN04", "The poll plugin has been successfully installed. To add polls, click on the Polls icon in the plugin section of your admin front page, and remember to activate the menu item from your menus page."); diff --git a/e107_plugins/poll/languages/English_global.php b/e107_plugins/poll/languages/English_global.php new file mode 100644 index 000000000..876d8baf1 --- /dev/null +++ b/e107_plugins/poll/languages/English_global.php @@ -0,0 +1,6 @@ + \ No newline at end of file diff --git a/e107_plugins/poll/plugin.xml b/e107_plugins/poll/plugin.xml index 72779a687..bdc52fd78 100644 --- a/e107_plugins/poll/plugin.xml +++ b/e107_plugins/poll/plugin.xml @@ -1,12 +1,9 @@ - - + - The poll plugin allows you to define polls in either a menu or forum post. - content - - - + The poll plugin allows you to define polls in either a menu or forum post. + content + Copyright e107 Inc e107.org, Licensed under GPL (http://www.gnu.org/licenses/gpl.txt) POLL_ADLAN03 diff --git a/e107_plugins/rss_menu/languages/English_admin_rss_menu.php b/e107_plugins/rss_menu/languages/English_admin_rss_menu.php index d667ccd77..1ed6ddd1e 100644 --- a/e107_plugins/rss_menu/languages/English_admin_rss_menu.php +++ b/e107_plugins/rss_menu/languages/English_admin_rss_menu.php @@ -3,10 +3,6 @@ + ----------------------------------------------------------------------------+ | e107 website system - Language File. | -| $Source: /cvs_backup/e107_0.8/e107_plugins/rss_menu/languages/English_admin_rss_menu.php,v $ -| $Revision$ -| $Date$ -| $Author$ +----------------------------------------------------------------------------+ */ @@ -33,8 +29,8 @@ define("RSS_BUG", "Bugtracker"); define("RSS_FOR", "Forum"); define("RSS_DL", "Downloads"); -define("RSS_PLUGIN_LAN_1", "RSS"); -define("RSS_PLUGIN_LAN_2", "RSS Feeds from your site"); +//define("RSS_PLUGIN_LAN_1", "RSS"); +//define("RSS_PLUGIN_LAN_2", "RSS Feeds from your site"); define("RSS_PLUGIN_LAN_6", "Feed Links"); define("RSS_PLUGIN_LAN_7", "The rss feed of the news"); @@ -60,12 +56,12 @@ define("RSS_LAN_ERROR_7", "Some required fields are missing."); define("RSS_LAN_ADMIN_1", "Existing RSS feeds"); define("RSS_LAN_ADMIN_2", "Id"); define("RSS_LAN_ADMIN_3", "Path"); -define("RSS_LAN_ADMIN_4", "Name"); +//define("RSS_LAN_ADMIN_4", "Name"); define("RSS_LAN_ADMIN_5", "Url"); define("RSS_LAN_ADMIN_6", "Text"); define("RSS_LAN_ADMIN_7", "Limit"); define("RSS_LAN_ADMIN_8", "Visibility"); -define("RSS_LAN_ADMIN_9", "Type"); +//define("RSS_LAN_ADMIN_9", "Type"); define("RSS_LAN_ADMIN_10", "rss feed create entry"); define("RSS_LAN_ADMIN_11", "rss feed import feeds"); define("RSS_LAN_ADMIN_12", "Topic id"); @@ -96,6 +92,7 @@ define("RSS_LAN_3", "noauthor@nospam.com"); // Admin log messages //------------------- +/* define('LAN_AL_RSS_01','RSS feed deleted'); define('LAN_AL_RSS_02','RSS feed created'); define('LAN_AL_RSS_03','RSS feed updated'); @@ -103,4 +100,5 @@ define('LAN_AL_RSS_04','RSS feed imported'); define('LAN_AL_RSS_05','RSS limits updated'); define('LAN_AL_RSS_06','RSS settings updated'); define('LAN_AL_RSS_07',''); +*/ ?> \ No newline at end of file diff --git a/e107_plugins/rss_menu/languages/English_global.php b/e107_plugins/rss_menu/languages/English_global.php new file mode 100644 index 000000000..136f06cc9 --- /dev/null +++ b/e107_plugins/rss_menu/languages/English_global.php @@ -0,0 +1,6 @@ + \ No newline at end of file diff --git a/e107_plugins/rss_menu/plugin.xml b/e107_plugins/rss_menu/plugin.xml index 57d3fb92b..60e5eb658 100644 --- a/e107_plugins/rss_menu/plugin.xml +++ b/e107_plugins/rss_menu/plugin.xml @@ -1,14 +1,8 @@ - - - - + - RSS Feeds from your site + RSS Feeds from your site. misc - - - Copyright e107 Inc e107.org, Licensed under GPL (http://www.gnu.org/licenses/gpl.txt) LAN_CONFIGURE diff --git a/e107_plugins/trackback/languages/English_admin_trackback.php b/e107_plugins/trackback/languages/English_admin_trackback.php index 97e707210..7caf40a05 100644 --- a/e107_plugins/trackback/languages/English_admin_trackback.php +++ b/e107_plugins/trackback/languages/English_admin_trackback.php @@ -8,19 +8,16 @@ * * Plugin administration - newsfeeds * - * $Source: /cvs_backup/e107_0.8/e107_plugins/trackback/languages/English_admin_trackback.php,v $ - * $Revision$ - * $Date$ - * $Author$ + * $Id$ * */ -define("TRACKBACK_L1", "Configure Trackback"); -define("TRACKBACK_L2", "This plugin enables you to use trackback in your news posts."); -define("TRACKBACK_L3", "Trackback is now installed and enabled."); -define("TRACKBACK_L4", "Trackback settings saved."); -define("TRACKBACK_L5", "On"); -define("TRACKBACK_L6", "Off"); +//define("TRACKBACK_L1", "Configure Trackback"); +//define("TRACKBACK_L2", "This plugin enables you to use trackback in your news posts."); +//define("TRACKBACK_L3", "Trackback is now installed and enabled."); +//define("TRACKBACK_L4", "Trackback settings saved."); +//define("TRACKBACK_L5", "On"); +//define("TRACKBACK_L6", "Off"); define("TRACKBACK_L7", "Activate trackback"); define("TRACKBACK_L8", "Trackback URL text"); //define("TRACKBACK_L9", "Save Settings"); @@ -29,15 +26,15 @@ define("TRACKBACK_L11", "Trackback address for this post:"); define("TRACKBACK_L12", "No trackbacks for this item"); define("TRACKBACK_L13", "Moderate trackbacks"); -define("TRACKBACK_L14", "Delete"); -define("TRACKBACK_L15", "Trackbacks deleted."); +//define("TRACKBACK_L14", "Delete"); +//define("TRACKBACK_L15", "Trackbacks deleted."); define('TRACKBACK_L16', 'Trackback'); -define('TRACKBACK_L17', 'Nothing changed - not saved'); +//define('TRACKBACK_L17', 'Nothing changed - not saved'); // Admin log messages //------------------- -define('LAN_AL_TRACK_01', 'Trackback settings changed'); -define('LAN_AL_TRACK_02', 'Trackback items deleted'); +//define('LAN_AL_TRACK_01', 'Trackback settings changed'); +//define('LAN_AL_TRACK_02', 'Trackback items deleted'); ?> \ No newline at end of file diff --git a/e107_plugins/trackback/languages/English_global.php b/e107_plugins/trackback/languages/English_global.php new file mode 100644 index 000000000..dd3d6eb28 --- /dev/null +++ b/e107_plugins/trackback/languages/English_global.php @@ -0,0 +1,6 @@ + \ No newline at end of file diff --git a/e107_plugins/trackback/plugin.xml b/e107_plugins/trackback/plugin.xml index 9d7bbdd43..222c9ea72 100644 --- a/e107_plugins/trackback/plugin.xml +++ b/e107_plugins/trackback/plugin.xml @@ -1,11 +1,8 @@ - + - This plugin enables you to use trackback in your news posts. + This plugin enables you to use trackback in your news posts. Copyright e107 Inc e107.org, Licensed under GPL (http://www.gnu.org/licenses/gpl.txt) - - - TRACKBACK_L1