[geeklog-cvs] tools: Fixed MESSAGE handling and updated staticpages MESSAGES

[geeklog-cvs at lists.geeklog.net]

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/408878562aeb
changeset: 20:408878562aeb
user:      Dirk Haun <dirk at haun-online.de>
date:      Fri Oct 03 17:25:57 2008 +0200
description:
Fixed MESSAGE handling and updated staticpages MESSAGES

diffstat:

5 files changed, 35 insertions(+), 29 deletions(-)
lm/include/calendar.inc    |   12 ++++++------
lm/include/links.inc       |   32 ++++++++++++++++----------------
lm/include/polls.inc       |    6 +++---
lm/include/spamx.inc       |    6 +++---
lm/include/staticpages.inc |    8 +++++++-

diffs (121 lines):

diff -r 0a4cb099aaf3 -r 408878562aeb lm/include/calendar.inc
--- a/lm/include/calendar.inc	Sun Aug 17 16:19:20 2008 +0000
+++ b/lm/include/calendar.inc	Fri Oct 03 17:25:57 2008 +0200
@@ -38,12 +38,12 @@
 $ENG_CAL_ADMIN = $LANG_CAL_ADMIN;
 $ENG_CAL_MESSAGE = $LANG_CAL_MESSAGE;
 
-$ENG_MSG4 = PLG_calendar_MESSAGE4;
-$ENG_MSG17 = PLG_calendar_MESSAGE17;
-$ENG_MSG18 = PLG_calendar_MESSAGE18;
-$ENG_MSG24 = PLG_calendar_MESSAGE24;
-$ENG_MSG26 = PLG_calendar_MESSAGE26;
-$ENG_MSG3001 = PLG_calendar_MESSAGE3001;
+$ENG_MSG4 = $PLG_calendar_MESSAGE4;
+$ENG_MSG17 = $PLG_calendar_MESSAGE17;
+$ENG_MSG18 = $PLG_calendar_MESSAGE18;
+$ENG_MSG24 = $PLG_calendar_MESSAGE24;
+$ENG_MSG26 = $PLG_calendar_MESSAGE26;
+$ENG_MSG3001 = $PLG_calendar_MESSAGE3001;
 
 $ENG_configsections['calendar'] = $LANG_configsections['calendar'];
 $ENG_confignames['calendar'] = $LANG_confignames['calendar'];
diff -r 0a4cb099aaf3 -r 408878562aeb lm/include/links.inc
--- a/lm/include/links.inc	Sun Aug 17 16:19:20 2008 +0000
+++ b/lm/include/links.inc	Fri Oct 03 17:25:57 2008 +0200
@@ -39,22 +39,22 @@
 $ENG_ADMIN = $LANG_LINKS_ADMIN;
 $ENG_STATUS = $LANG_LINKS_STATUS;
 
-$ENG_MSG1 = PLG_links_MESSAGE1;
-$ENG_MSG2 = PLG_links_MESSAGE2;
-$ENG_MSG3 = PLG_links_MESSAGE3;
-$ENG_MSG4 = PLG_links_MESSAGE4;
-$ENG_MSG5 = PLG_links_MESSAGE5;
-$ENG_MSG6 = PLG_links_MESSAGE6;
-$ENG_MSG7 = PLG_links_MESSAGE7;
-$ENG_MSG10 = PLG_links_MESSAGE10;
-$ENG_MSG11 = PLG_links_MESSAGE11;
-$ENG_MSG12 = PLG_links_MESSAGE12;
-$ENG_MSG13 = PLG_links_MESSAGE13;
-$ENG_MSG14 = PLG_links_MESSAGE14;
-$ENG_MSG15 = PLG_links_MESSAGE15;
-$ENG_MSG16 = PLG_links_MESSAGE16;
-$ENG_MSG17 = PLG_links_MESSAGE17;
-$ENG_MSG3001 = PLG_links_MESSAGE3001;
+$ENG_MSG1 = $PLG_links_MESSAGE1;
+$ENG_MSG2 = $PLG_links_MESSAGE2;
+$ENG_MSG3 = $PLG_links_MESSAGE3;
+$ENG_MSG4 = $PLG_links_MESSAGE4;
+$ENG_MSG5 = $PLG_links_MESSAGE5;
+$ENG_MSG6 = $PLG_links_MESSAGE6;
+$ENG_MSG7 = $PLG_links_MESSAGE7;
+$ENG_MSG10 = $PLG_links_MESSAGE10;
+$ENG_MSG11 = $PLG_links_MESSAGE11;
+$ENG_MSG12 = $PLG_links_MESSAGE12;
+$ENG_MSG13 = $PLG_links_MESSAGE13;
+$ENG_MSG14 = $PLG_links_MESSAGE14;
+$ENG_MSG15 = $PLG_links_MESSAGE15;
+$ENG_MSG16 = $PLG_links_MESSAGE16;
+$ENG_MSG17 = $PLG_links_MESSAGE17;
+$ENG_MSG3001 = $PLG_links_MESSAGE3001;
 
 $ENG_configsections['links'] = $LANG_configsections['links'];
 $ENG_confignames['links'] = $LANG_confignames['links'];
diff -r 0a4cb099aaf3 -r 408878562aeb lm/include/polls.inc
--- a/lm/include/polls.inc	Sun Aug 17 16:19:20 2008 +0000
+++ b/lm/include/polls.inc	Fri Oct 03 17:25:57 2008 +0200
@@ -35,9 +35,9 @@
 $ENG_POLLS = $LANG_POLLS;
 $ENG_LANG25 = $LANG25;
 
-$ENG_MSG19 = PLG_polls_MESSAGE19;
-$ENG_MSG20 = PLG_polls_MESSAGE20;
-$ENG_MSG3001 = PLG_polls_MESSAGE3001;
+$ENG_MSG19 = $PLG_polls_MESSAGE19;
+$ENG_MSG20 = $PLG_polls_MESSAGE20;
+$ENG_MSG3001 = $PLG_polls_MESSAGE3001;
 
 $ENG_configsections['polls'] = $LANG_configsections['polls'];
 $ENG_confignames['polls'] = $LANG_confignames['polls'];
diff -r 0a4cb099aaf3 -r 408878562aeb lm/include/spamx.inc
--- a/lm/include/spamx.inc	Sun Aug 17 16:19:20 2008 +0000
+++ b/lm/include/spamx.inc	Fri Oct 03 17:25:57 2008 +0200
@@ -34,9 +34,9 @@
 // save the english text strings
 $ENG_SX00 = $LANG_SX00;
 
-$ENG_MSG128 = PLG_spamx_MESSAGE128;
-$ENG_MSG8 = PLG_spamx_MESSAGE8;
-$ENG_MSG3001 = PLG_spamx_MESSAGE3001;
+$ENG_MSG128 = $PLG_spamx_MESSAGE128;
+$ENG_MSG8 = $PLG_spamx_MESSAGE8;
+$ENG_MSG3001 = $PLG_spamx_MESSAGE3001;
 
 $ENG_configsections['spamx'] = $LANG_configsections['spamx'];
 $ENG_confignames['spamx'] = $LANG_confignames['spamx'];
diff -r 0a4cb099aaf3 -r 408878562aeb lm/include/staticpages.inc
--- a/lm/include/staticpages.inc	Sun Aug 17 16:19:20 2008 +0000
+++ b/lm/include/staticpages.inc	Fri Oct 03 17:25:57 2008 +0200
@@ -34,7 +34,9 @@
 // save the english text strings
 $ENG_STATIC = $LANG_STATIC;
 
-$ENG_MSG3001 = PLG_staticpages_MESSAGE3001;
+$ENG_MSG19 = $PLG_staticpages_MESSAGE19;
+$ENG_MSG20 = $PLG_staticpages_MESSAGE20;
+$ENG_MSG3001 = $PLG_staticpages_MESSAGE3001;
 
 $ENG_configsections['staticpages'] = $LANG_configsections['staticpages'];
 $ENG_confignames['staticpages'] = $LANG_confignames['staticpages'];
@@ -57,6 +59,10 @@
 mergeArrays($ENG_STATIC, $LANG_STATIC, 'LANG_STATIC', false);
 
 echo "\n";
+mergeString($ENG_MSG19, $PLG_staticpages_MESSAGE19, 'PLG_staticpages_MESSAGE19');
+mergeString($ENG_MSG20, $PLG_staticpages_MESSAGE20, 'PLG_staticpages_MESSAGE20');
+
+echo "\n";
 echo "// Messages for the plugin upgrade\n";
 mergeString($ENG_MSG3001, $PLG_staticpages_MESSAGE3001, 'PLG_staticpages_MESSAGE3001');
 echo "\$PLG_staticpages_MESSAGE3002 = \$LANG32[9];\n";