More plugin LAN clean-up (#50)

e107inc · Dec 19, 2012 · 549431f · 549431f
1 parent 44210bf
commit 549431f
Show file tree

Hide file tree

Showing 10 changed files with 44 additions and 47 deletions.
diff --git a/e107_plugins/newsletter/languages/English_admin_newsletter.php b/e107_plugins/newsletter/languages/English_admin_newsletter.php
@@ -8,41 +8,37 @@
  *
  * Plugin - newsfeeds
  *
- * $Source: /cvs_backup/e107_0.8/e107_plugins/newsletter/languages/English_admin_newsletter.php,v $
- * $Revision$
- * $Date$
- * $Author$
- *
+ * $Id$
 */
 
-define('NLLAN_01', 'Newsletter');
-define('NLLAN_02', 'Provides a quick and easy way to configure and send newsletters');
-define('NLLAN_03', 'Configure Newsletters');
+//define('NLLAN_01', 'Newsletter');
+//define('NLLAN_02', 'Provides a quick and easy way to configure and send newsletters');
+//define('NLLAN_03', 'Configure Newsletters');
 define('NLLAN_04', 'The newsletter plugin has been successfully installed. To configure, return to your main admin page and click on \'Newsletter\' in the plugin section.');
 define('NLLAN_05', 'No newsletters defined yet');
 
 define('NLLAN_06', 'Name');
 define('NLLAN_07', 'Subscribers');
-define('NLLAN_08', 'Options');
+//define('NLLAN_08', 'Options');
 define('NLLAN_09', 'Are you sure you want to delete this newsletter?');
 define('NLLAN_10', 'Existing Newsletters');
 
 define('NLLAN_11', 'No newsletter issues yet');
 define('NLLAN_12', 'Issue');
 define('NLLAN_13', '[ Parent ID ] Subject/Title');
 define('NLLAN_14', 'Mailed?');
-define('NLLAN_15', 'Options');
+//define('NLLAN_15', 'Options');
 define('NLLAN_16', 'yes');
 define('NLLAN_17', 'Not sent out - click to send');
 define('NLLAN_18', 'Are you sure you want to mail this issue to subscribers?');
 define('NLLAN_19', 'Are you sure you want to delete this newsletter issue?');
 define('NLLAN_20', 'Existing Issues');
-define('NLLAN_21', 'Title');
-define('NLLAN_22', 'Description');
+//define('NLLAN_21', 'Title');
+//define('NLLAN_22', 'Description');
 define('NLLAN_23', 'Header');
 define('NLLAN_24', 'Footer');
-define('NLLAN_25', 'Update Newsletter');
-define('NLLAN_26', 'Create Newsletter');
+//define('NLLAN_25', 'Update Newsletter');
+//define('NLLAN_26', 'Create Newsletter');
 define('NLLAN_27', 'Newsletter updated in database.');
 define('NLLAN_28', 'Newsletter defined and saved in database.');
 //define('NLLAN_29', 'No newsletters defined yet.');

diff --git a/e107_plugins/newsletter/languages/English_global.php b/e107_plugins/newsletter/languages/English_global.php
@@ -0,0 +1,6 @@
+<?php
+
+define("LAN_PLUGIN_NEWSLETTER_NAME", "Newsletter");
+define("LAN_PLUGIN_NEWSLETTER_DESCRIPTION", "Provides a quick and easy way to configure and send newsletters.");
+
+?>
diff --git a/e107_plugins/newsletter/plugin.xml b/e107_plugins/newsletter/plugin.xml
@@ -1,15 +1,10 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Copyright e107 Inc e107.org, Licensed under GNU GPL (http://www.gnu.org/licenses/gpl.txt) -->
-<!-- $Id: plugin.xml,v 1.1 2009-11-19 20:24:21 e107steved Exp $ -->
-<e107Plugin name="Newsletter" lan="NLLAN_01" version="1.1" date="2012-08-01" compatibility="2.0" installRequired="true">
+<e107Plugin name="Newsletter" lan="LAN_PLUGIN_NEWSLETTER_NAME" version="1.1" date="2012-08-01" compatibility="2.0" installRequired="true">
 	<author name="e107 Inc, nlstart" url="http://e107.org" />
-	<description lan="NLLAN_02">Provides a quick and easy way to configure and send newsletters</description>
+	<description lan="LAN_PLUGIN_NEWSLETTER_DESCRIPTION">Provides a quick and easy way to configure and send newsletters.</description>
 	<folder>newsletter</folder>
 	<copyright>Copyright e107 Inc e107.org, Licensed under GPL (http://www.gnu.org/licenses/gpl.txt)</copyright>
 	<category>content</category>  
-	<languageFiles>
-		<file type='log' path='languages/--LAN--_admin_newsletter.php' />
-	</languageFiles>
 	<adminLinks>
 		<link url='admin_config.php' description='LAN_CONFIGURE' icon='images/nl_32.png' iconSmall='images/nl_16.png' primary='true' />	
 	</adminLinks>

diff --git a/e107_plugins/pdf/admin_pdf_config.php b/e107_plugins/pdf/admin_pdf_config.php
@@ -267,7 +267,7 @@ function getFontList($match = '')
 </tr>
 </table>
 <div class='buttons-bar center'>
-	".$rs -> form_button("submit", "update_pdf", PDF_LAN_17)."
+	".$frm->admin_button('update_pdf', LAN_UPDATE, 'update')."
 </div>
 ".$rs -> form_close()."
 ";

diff --git a/e107_plugins/pdf/languages/English_admin_pdf.php b/e107_plugins/pdf/languages/English_admin_pdf.php
@@ -10,10 +10,10 @@
 +-----------------------------------------------------------------------------+
 */
 
-define('PDF_PLUGIN_LAN_1', 'PDF');
-define('PDF_PLUGIN_LAN_2', 'PDF creation support using TCPDF');
-define('PDF_PLUGIN_LAN_3', 'PDF');
-define('PDF_PLUGIN_LAN_4', 'This plugin is now ready to be used.');
+//define('PDF_PLUGIN_LAN_1', 'PDF');
+//define('PDF_PLUGIN_LAN_2', 'PDF creation support using TCPDF');
+//define('PDF_PLUGIN_LAN_3', 'PDF');
+//define('PDF_PLUGIN_LAN_4', 'This plugin is now ready to be used.');
 
 define('PDF_LAN_1', 'PDF');
 define('PDF_LAN_2', 'PDF preferences');
@@ -31,8 +31,8 @@
 define('PDF_LAN_14', 'show sitename on pdf?');
 define('PDF_LAN_15', 'show creator page url on pdf?');
 define('PDF_LAN_16', 'show page numbers on pdf?');
-define('PDF_LAN_17', 'update');
-define('PDF_LAN_18', 'PDF preferences successfully updated');
+//define('PDF_LAN_17', 'update');
+//define('PDF_LAN_18', 'PDF preferences successfully updated');
 define('PDF_LAN_19', 'Page');
 define('PDF_LAN_20', 'error reporting');
 define('PDF_LAN_21', 'Font name');
@@ -49,6 +49,6 @@
 
 
 // Admin logging
-define('LAN_AL_PDF_01', 'PDF settings updated');
+//define('LAN_AL_PDF_01', 'PDF settings updated');
 
 ?>
diff --git a/e107_plugins/pdf/languages/English_global.php b/e107_plugins/pdf/languages/English_global.php
@@ -0,0 +1,6 @@
+<?php
+
+define("LAN_PLUGIN_PDF_NAME", "PDF");
+define("LAN_PLUGIN_PDF_DESCRIPTION", "PDF creation support using TCPDF.");
+
+?>
diff --git a/e107_plugins/pdf/plugin.xml b/e107_plugins/pdf/plugin.xml
@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Id: plugin.xml,v 1.6 2009-12-05 12:33:30 e107steved Exp $ -->
-<e107Plugin name="PDF" lan="PDF_PLUGIN_LAN_1" version="2.0" date="2012-08-01" compatibility="2.0" installRequired="true">
+<e107Plugin name="PDF" lan="LAN_PLUGIN_PDF_NAME" version="2.0" date="2012-08-01" compatibility="2.0" installRequired="true">
 	<author name="e107Inc" />
-	<description lan="PDF_PLUGIN_LAN_2">PDF creation support using TCPDF</description>
+	<description lan="LAN_PLUGIN_PDF_DESCRIPTION">PDF creation support using TCPDF.</description>
 	<copyright>Copyright e107 Inc e107.org, Licensed under GPL (http://www.gnu.org/licenses/gpl.txt)</copyright>
-	<languageFiles>
-		<file type='log' path='languages/--LAN--_admin_pdf.php' />
-	</languageFiles>
 	<adminLinks>
 		<link url='admin_pdf_config.php' description='PDF' icon='images/pdf_32.png' iconSmall='images/pdf_16.png' primary='true' >PDF</link>	
 	</adminLinks>

diff --git a/e107_plugins/pm/languages/English_admin_pm.php b/e107_plugins/pm/languages/English_admin_pm.php
@@ -1,7 +1,7 @@
 <?php
-define('ADLAN_PM', "Private Messenger");
+//define('ADLAN_PM', "Private Messenger");
 define('ADLAN_PM_1', "To activate please go to your menus screen and select the private_msg into one of your menu areas. <br /><br />If you need to convert messages from a previous version, please go to the main config page for this plugin and select the 'convert' link.");
-define('ADLAN_PM_2', "Configure Private Messenger");
+//define('ADLAN_PM_2', "Configure Private Messenger");
 define('ADLAN_PM_3', "PM settings not found, default values set");
 define('ADLAN_PM_4', "Options Updated");
 define('ADLAN_PM_5', "Limit for selected userclass already exists");
@@ -49,11 +49,11 @@
 define('ADLAN_PM_54', "Main settings");
 define('ADLAN_PM_55', "Limits");
 
-define('ADLAN_PM_57', "This plugin is a fully featured Private Messaging system.");
+//define('ADLAN_PM_57', "This plugin is a fully featured Private Messaging system.");
 define('ADLAN_PM_58', "Private Messenger");
 define('ADLAN_PM_59', 'Maintenance');
 define('ADLAN_PM_60', 'PM Maintenance');
-define('ADLAN_PM_61', 'Execute');
+//define('ADLAN_PM_61', 'Execute');
 define('ADLAN_PM_62', 'These options remove transactions concerned with deleted users from the PM database tables');
 define('ADLAN_PM_63', 'Messages sent');
 define('ADLAN_PM_64', 'Messages received');
@@ -77,4 +77,6 @@
 define('ADLAN_PM_82', 'If sending more than this, they are added to a queue, and sent out using the cron task');
 
 define('ADLAN_PM_URL_DEFAULT_LABEL', 'Default');
-define('ADLAN_PM_URL_DEFAULT_DESCR', 'Example: http://yoursite.com/e107_plugins/pm/pm.php');
+define('ADLAN_PM_URL_DEFAULT_DESCR', 'Example: http://yoursite.com/e107_plugins/pm/pm.php');
+
+?>
diff --git a/e107_plugins/pm/languages/English_global.php b/e107_plugins/pm/languages/English_global.php
diff --git a/e107_plugins/pm/plugin.xml b/e107_plugins/pm/plugin.xml
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Id: plugin.xml,v 1.13 2009-12-11 22:33:15 e107steved Exp $ -->
-<e107Plugin name="Private Messenger" lan="ADLAN_PM" version="3.0" date="2012-08-01" compatibility="2.0" installRequired="true">
+<e107Plugin name="Private Messenger" lan="LAN_PLUGIN_PM_NAME" version="3.0" date="2012-08-01" compatibility="2.0" installRequired="true">
 	<author name="e107 Inc." email="devs@e107.org" />
-	<description lan="ADLAN_PM_57">This plugin is a fully featured Private Messaging system.</description>
+	<description lan="LAN_PLUGIN_PM_DESCRIPTION">This plugin is a fully featured Private Messaging system.</description>
 	<category>users</category>
-	<languageFiles>
-		<file type='log' path='languages/--LAN--_log.php' />	
-	</languageFiles>
 	<adminLinks>
 		<link url='pm_conf.php' description='ADLAN_PM_2' icon='images/pvt_message_32.png' iconSmall='images/pvt_message_16.png' primary='true' />
 	</adminLinks>
-</e107Plugin>
+</e107Plugin>