[xoops-svn] SF.net SVN: xoops-svn:[12181] XoopsModules/xnewsletter/trunk/xNewsletter

[<go...@us...>]

Revision: 12181
          http://sourceforge.net/p/xoops/svn/12181
Author:   goffy
Date:     2013-10-16 16:24:12 +0000 (Wed, 16 Oct 2013)
Log Message:
-----------
transfered error text to language file (feichtl/goffy)

Modified Paths:
--------------
    XoopsModules/xnewsletter/trunk/xNewsletter/admin/import.php
    XoopsModules/xnewsletter/trunk/xNewsletter/docs/changelog.txt
    XoopsModules/xnewsletter/trunk/xNewsletter/docs/lang_diff.txt
    XoopsModules/xnewsletter/trunk/xNewsletter/language/english/admin.php

Modified: XoopsModules/xnewsletter/trunk/xNewsletter/admin/import.php
===================================================================
--- XoopsModules/xnewsletter/trunk/xNewsletter/admin/import.php	2013-10-16 15:02:14 UTC (rev 12180)
+++ XoopsModules/xnewsletter/trunk/xNewsletter/admin/import.php	2013-10-16 16:24:12 UTC (rev 12181)
@@ -353,7 +353,7 @@
 
     $pluginFile = XNEWSLETTER_PATH . "/plugins/" . $plugin . '.php';
     if ( !file_exists($pluginFile) ) {
-      echo "Error: File ".$plugin."' doesn't exist";
+      echo str_replace("%p", $plugin, _AM_XNEWSLETTER_IMPORT_ERROR_NO_PLUGIN);
       break;
     }
     require_once($pluginFile);
@@ -361,6 +361,7 @@
     $function = 'xnewsletter_plugin_getdata_' . $plugin;
     if (!function_exists($function)) {
       echo "Error: require function 'xnewsletter_plugin_getdata_".$plugin."' doesn't exist";
+      echo str_replace("%f", $plugin, _AM_XNEWSLETTER_IMPORT_ERROR_NO_FUNCTION);
       break;
     }
 
@@ -404,14 +405,14 @@
     
     $pluginFile = XNEWSLETTER_PATH . "/plugins/" . $plugin . '.php';
     if ( !file_exists($pluginFile) ) {
-      echo "Error: File ".$plugin."' doesn't exist";
+      echo str_replace("%p", $plugin, _AM_XNEWSLETTER_IMPORT_ERROR_NO_PLUGIN);
       break;
     }
     require_once($pluginFile);
     
     $function = 'xnewsletter_plugin_getform_' . $plugin;
     if (!function_exists($function) ) {
-      echo "Error: require function 'xnewsletter_plugin_getform_".$plugin."' doesn't exist";
+      echo str_replace("%f", $plugin, _AM_XNEWSLETTER_IMPORT_ERROR_NO_FUNCTION);
       break;
     }
     //$form = $function( $cat_id, $action_after_read, $limitcheck, $skipcatsubscrexist );

Modified: XoopsModules/xnewsletter/trunk/xNewsletter/docs/changelog.txt
===================================================================
--- XoopsModules/xnewsletter/trunk/xNewsletter/docs/changelog.txt	2013-10-16 15:02:14 UTC (rev 12180)
+++ XoopsModules/xnewsletter/trunk/xNewsletter/docs/changelog.txt	2013-10-16 16:24:12 UTC (rev 12181)
@@ -1,5 +1,6 @@
 Version 1.2
 --------------
+ - transfered error text to language file (feichtl/goffy)
  - fixed bug when filter subscribers in admin/subscr.php (feichtl/goffy)
  - french translation (pierredelu)
  - corrected english language files (cesag)

Modified: XoopsModules/xnewsletter/trunk/xNewsletter/docs/lang_diff.txt
===================================================================
--- XoopsModules/xnewsletter/trunk/xNewsletter/docs/lang_diff.txt	2013-10-16 15:02:14 UTC (rev 12180)
+++ XoopsModules/xnewsletter/trunk/xNewsletter/docs/lang_diff.txt	2013-10-16 16:24:12 UTC (rev 12181)
@@ -7,4 +7,11 @@
 admin.php
 ----------
 define("_AM_XNEWSLETTER_IMPORT_INFO","Add all users of a group to a newsletter");
-define("_AM_XNEWSLETTER_IMPORT_CSV","One column ( email ) or four columns ( email | sex | firstname | lastname)<br />see sample1col.csv and sample4col.csv in /plugins");
\ No newline at end of file
+define("_AM_XNEWSLETTER_IMPORT_CSV","One column ( email ) or four columns ( email | sex | firstname | lastname)<br />see sample1col.csv and sample4col.csv in /plugins");
+
+Version 1.2
+----------------
+admin.php
+----------
+define("_AM_XNEWSLETTER_IMPORT_ERROR_NO_PLUGIN","Error: required file 'plugins/%p.php' not found!");
+define("_AM_XNEWSLETTER_IMPORT_ERROR_NO_FUNCTION","Error: required function 'xnewsletter_plugin_getdata_%f' doesn't exist!");

Modified: XoopsModules/xnewsletter/trunk/xNewsletter/language/english/admin.php
===================================================================
--- XoopsModules/xnewsletter/trunk/xNewsletter/language/english/admin.php	2013-10-16 15:02:14 UTC (rev 12180)
+++ XoopsModules/xnewsletter/trunk/xNewsletter/language/english/admin.php	2013-10-16 16:24:12 UTC (rev 12181)
@@ -403,4 +403,7 @@
 
 define("_AM_XNEWSLETTER_SUBSCR_NO_CATSUBSCR","For this e-mail-address are no subscription to newsletter cats available");
 
+//version 1.2
+define("_AM_XNEWSLETTER_IMPORT_ERROR_NO_PLUGIN","Error: required file 'plugins/%p.php' not found!");
+define("_AM_XNEWSLETTER_IMPORT_ERROR_NO_FUNCTION","Error: required function 'xnewsletter_plugin_getdata_%f' doesn't exist!");
 ?>
\ No newline at end of file