Nested EL code is not yet suppported, so we need to rewrite all these parts

diff --git a/inc/language/mailid_de.php b/inc/language/mailid_de.php
index bd2eed36edfc0a23b90826b1b5381b4c1e13dfd4..457a832ceeb4d5893b46d69d8e03dc73ef7b49c6 100644 (file)
--- a/inc/language/mailid_de.php
+++ b/inc/language/mailid_de.php
@@ -44,14 +44,14 @@ if (!defined('__SECURITY')) {
 addMessages(array(
        'MAIL_DATA_INVALID' => "Daten der Mailbuchung sind fehlerhaft.",
        'ERROR_CONFIRMING_MAIL' => "Bitte klicken Sie nur Links aus Ihrem Mitgliedsbereich oder aus den Mails an.",
-       'MEMBER_THANX_POINTS_ADDED' => "Vielen Dank f&uuml;r die Best&auml;tigung der Mail. Die <span class=\"data\">%s</span> {?POINTS?} wurden Ihnen gerade gutgeschrieben.",
-       'MEMBER_THANX_POINTS_LOCKED' => "Vielen Dank f&uuml;r die Best&auml;tigung der Mail. Die <span class=\"data\">%s</span> {?POINTS?} werden Ihnen bald gutgeschrieben.",
-       'MEMBER_POINTS_NOT_ADDED' => "Falscher Best&auml;tigungscode eingegeben! Die <span class=\"notice\">%s</span> {?POINTS?} wurden dem Versender wieder gutgeschrieben.",
+       'MEMBER_THANX_POINTS_ADDED' => "Vielen Dank f&uuml;r die Best&auml;tigung der Mail. Die <span class=\"data\">{%%pipe,translateComma=%s%%}</span> {?POINTS?} wurden Ihnen gerade gutgeschrieben.",
+       'MEMBER_THANX_POINTS_LOCKED' => "Vielen Dank f&uuml;r die Best&auml;tigung der Mail. Die <span class=\"data\">{%%pipe,translateComma=%s%%}</span> {?POINTS?} werden Ihnen bald gutgeschrieben.",
+       'MEMBER_POINTS_NOT_ADDED' => "Falscher Best&auml;tigungscode eingegeben! Die <span class=\"data\">{%%pipe,translateComma=%s%%}</span> {?POINTS?} wurden dem Versender wieder gutgeschrieben.",
        'MEMBER_ENTER_CODE' => "Code eingeben",
-       'MEMBER_TIME_COUNTER1' => "Gutschrift der {?POINTS?} erfolgt in <span class=\"data\">",
-       'MEMBER_TIME_COUNTER2' => "</span> ...",
+       'MEMBER_TIME_COUNTER_1' => "Gutschrift der {?POINTS?} erfolgt in <span class=\"data\">",
+       'MEMBER_TIME_COUNTER_2' => "</span> ...",
        'MEMBER_SUBMIT_CODE' => "Abschicken",
-       'MEMBER_MAILID_TOTAL_POINTS' => "Ihr Kontostand betr&auml;gt jetzt <span class=\"data\">%s {?POINTS?}</span>.",
+       'MEMBER_MAILID_TOTAL_POINTS' => "Ihr Kontostand betr&auml;gt jetzt <span class=\"data\">{%%pipe,translateComma=%s%%} {?POINTS?}</span>.",
        'MEMBER_MAILID_CLICK_BUTTON' => "Einmal den Button anklicken",
 ));
 

diff --git a/templates/de/html/mailid/mailid_points_done.tpl b/templates/de/html/mailid/mailid_points_done.tpl
index c44562bc4c1be4422bc2040734e4d3622fbffedd..e3529c352b6feaab3ba3d6dce4c45217eef35ac8 100644 (file)
--- a/templates/de/html/mailid/mailid_points_done.tpl
+++ b/templates/de/html/mailid/mailid_points_done.tpl
@@ -2,8 +2,8 @@
 <table border="0" cellspacing="0" cellpadding="0" class="mailid_table">
        <tr>
                <td width="220" align="center">
-                       {%message,MEMBER_THANX_POINTS_ADDED={%pipe,translateComma=$content[points]%}%}<br />
-                       {%message,MEMBER_MAILID_TOTAL_POINTS={%pipe,translateComma=$content[total]%}%}
+                       {%message,MEMBER_THANX_POINTS_ADDED=$content[points]%}<br />
+                       {%message,MEMBER_MAILID_TOTAL_POINTS=$content[total]%}
                </td>
                <td align="center">
                        <div class="banner dashed">

diff --git a/templates/de/html/mailid/mailid_points_done2.tpl b/templates/de/html/mailid/mailid_points_done2.tpl
index 196e90bb680a2bd67fbb3d9bfde37e2c212d2264..5aa6b39b9aa50188bf5d622743c9cb406ae9ff7d 100644 (file)
--- a/templates/de/html/mailid/mailid_points_done2.tpl
+++ b/templates/de/html/mailid/mailid_points_done2.tpl
@@ -3,8 +3,8 @@
        <tr>
                <td width="220" align="center">
                        <div class="tiny">
-                       {%message,MEMBER_THANX_POINTS_ADDED={%pipe,translateComma=$content[points]%}%}<br />
-                       {%message,MEMBER_MAILID_TOTAL_POINTS={%pipe,translateComma=$content[total]%}%}<br />
+                       {%message,MEMBER_THANX_POINTS_ADDED=$content[points]%}<br />
+                       {%message,MEMBER_MAILID_TOTAL_POINTS=$content[total]%}<br />
                        <br />
                        <a href="{%url=show_bonus.php?userid=$content[userid]&amp;t=$content[type]&amp;d=$content[data]%}" target="_blank">{--MEMBER_SHOW_TURBO_BONUS_LINK--}
                        </div>

diff --git a/templates/de/html/mailid/mailid_points_failed.tpl b/templates/de/html/mailid/mailid_points_failed.tpl
index a0900ed7198aad34c7bfd9f60ad0158007f60581..87b0e7ad5264b33bb24e95307935ea2913c67cb5 100644 (file)
--- a/templates/de/html/mailid/mailid_points_failed.tpl
+++ b/templates/de/html/mailid/mailid_points_failed.tpl
@@ -2,7 +2,7 @@
 <table border="0" cellspacing="0" cellpadding="0" class="mailid_table">
        <tr>
                <td width="220" align="center">
-                       {%message,POINTS_NOT_ADDED={%pipe,translateComma=$content[points]%}%}
+                       {%message,MEMBER_POINTS_NOT_ADDED=$content[points]%}
                </td>
                <td align="center">
                        <div class="banner dashed">

diff --git a/templates/de/html/mailid/mailid_points_locked.tpl b/templates/de/html/mailid/mailid_points_locked.tpl
index 14a839c2dcb771d8f0a7159180065d95952ea070..97c83cd096c372cb4af194c4d5027f96d72b050d 100644 (file)
--- a/templates/de/html/mailid/mailid_points_locked.tpl
+++ b/templates/de/html/mailid/mailid_points_locked.tpl
@@ -2,7 +2,7 @@
 <table border="0" cellspacing="0" cellpadding="0" class="mailid_table">
        <tr>
                <td width="220" align="center">
-                       {%message,MEMBER_THANX_POINTS_LOCKED={%pipe,translateComma=$content[points]%}%}
+                       {%message,MEMBER_THANX_POINTS_LOCKED=$content[points]%}
                </td>
                <td align="center">
                        <div class="banner dashed">

diff --git a/templates/de/html/mailid/mailid_points_locked2.tpl b/templates/de/html/mailid/mailid_points_locked2.tpl
index 689d42af815f850ab1aef524a43c7d557db32201..a621650e5127db18010d39576cf01a1d83defeef 100644 (file)
--- a/templates/de/html/mailid/mailid_points_locked2.tpl
+++ b/templates/de/html/mailid/mailid_points_locked2.tpl
@@ -3,7 +3,7 @@
        <tr>
                <td width="220" align="center">
                        <div class="tiny">
-                               {%message,MEMBER_THANX_POINTS_LOCKED={%pipe,translateComma=$content[points]%}%}<br />
+                               {%message,MEMBER_THANX_POINTS_LOCKED=$content[points]%}<br />
                                <br />
                                <a href="{%url=show_bonus.php?userid=$content[userid]&amp;t=$content[type]&amp;d=$content[data]%}" target="_blank">{--MEMBER_SHOW_TURBO_BONUS_LINK--}
                        </div>

diff --git a/templates/de/html/mailid/mailid_timer.tpl b/templates/de/html/mailid/mailid_timer.tpl
index ccf30fca975127f0caa675fea3c25f593b798175..d795e9c91baa9e8d4c953f7ba4ca7bbbf7cadf05 100644 (file)
--- a/templates/de/html/mailid/mailid_timer.tpl
+++ b/templates/de/html/mailid/mailid_timer.tpl
@@ -27,9 +27,9 @@ function startCounter() {
                        <tr>
                                <td align="center">
                                <form accept-charset="utf-8" name="confirm" style="margin-top: 0px;margin-bottom:0px">
-                                       {--MEMBER_TIME_COUNTER1--}
+                                       {--MEMBER_TIME_COUNTER_1--}
                                        <input type="text" class="form_field" name="counter" size="$content[tim2]" readonly class="form_field" value="$content[time]" />
-                                       {--MEMBER_TIME_COUNTER2--}
+                                       {--MEMBER_TIME_COUNTER_2--}
                                </form>
                                </td>
                        </tr>