projects / mailer.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 086762b)
Index and language fixes
authorRoland Häder <roland@mxchange.org>
Thu, 29 Oct 2009 03:36:21 +0000 (03:36 +0000)
committerRoland Häder <roland@mxchange.org>
Thu, 29 Oct 2009 03:36:21 +0000 (03:36 +0000)
inc/language/bonus_de.php patch | blob | history
inc/language/de.php patch | blob | history
inc/modules/admin/what-config_bonus.php patch | blob | history
inc/modules/admin/what-config_points.php patch | blob | history
inc/modules/guest/what-mediadata.php patch | blob | history
templates/de/html/admin/admin_config_bonus.tpl patch | blob | history

diff --git a/inc/language/bonus_de.php b/inc/language/bonus_de.php
index 349effe354a224a1cda580483dbb4c7bfc11adbf..fe04eb5c1a52da58756b68567bd23d1372cc1b07 100644 (file)
--- a/inc/language/bonus_de.php
+++ b/inc/language/bonus_de.php
@@ -125,12 +125,12 @@ addMessages(array(
        'ADMIN_NO_NOTIFICATIONS' => "Keine Benachrichtigungen gefunden.",
 
 // Switches
        'ADMIN_NO_NOTIFICATIONS' => "Keine Benachrichtigungen gefunden.",
 
 // Switches
-       'ADMIN_BONUS_RALLYE_IS_ACTIVE'    , "Ist die Aktiv-Rallye aktiv?",
+       'ADMIN_BONUS_RALLYE_IS_ACTIVE'     => "Ist die Aktiv-Rallye aktiv?",
        'ADMIN_BONUS_RALLYE_LOGIN_INCLUDE' => "Login-Bonus in monatlicher Auswertung mit einschliessen?",
        'ADMIN_BONUS_RALLYE_ORDER_INCLUDE' => "Mailbuchungsbonus in monatlicher Auswertung mit einschliessen?",
        'ADMIN_BONUS_RALLYE_STATS_INCLUDE' => "Statistik-Bonus in monatlicher Auswertung mit einschliessen?",
        'ADMIN_BONUS_RALLYE_CLICK_INCLUDE' => "Mailbest&auml;tigungsbonus in monatlicher Auswertung mit einschliessen?",
        'ADMIN_BONUS_RALLYE_LOGIN_INCLUDE' => "Login-Bonus in monatlicher Auswertung mit einschliessen?",
        'ADMIN_BONUS_RALLYE_ORDER_INCLUDE' => "Mailbuchungsbonus in monatlicher Auswertung mit einschliessen?",
        'ADMIN_BONUS_RALLYE_STATS_INCLUDE' => "Statistik-Bonus in monatlicher Auswertung mit einschliessen?",
        'ADMIN_BONUS_RALLYE_CLICK_INCLUDE' => "Mailbest&auml;tigungsbonus in monatlicher Auswertung mit einschliessen?",
-       'ADMIN_BONUS_RALLYE_REF_INCLUDE'  , "Referal-Bonus in monatlicher Auswertung mit einschliessen?",
+       'ADMIN_BONUS_RALLYE_REF_INCLUDE'   => "Referal-Bonus in monatlicher Auswertung mit einschliessen?",
 
 // Header
        'MEMBER_MAIL_BONUS_DETAILS_TITLE_1' => "Details zur Bonusmail <u>",
 
 // Header
        'MEMBER_MAIL_BONUS_DETAILS_TITLE_1' => "Details zur Bonusmail <u>",
diff --git a/inc/language/de.php b/inc/language/de.php
index f82881b93745d28532008852ffc9bff79db7bc55..044f9408d43c6a6712a33b246d548e2b4032584c 100644 (file)
--- a/inc/language/de.php
+++ b/inc/language/de.php
@@ -948,11 +948,11 @@ addMessages(array(
        'TASK_NO_TITLE' => "Aufgabe ohne SQL-Anweisungen",
        'UNCONFIRMED_LOCKED' => "Anzahl zu best. Mails f&uuml;r Willkommensgutschrift",
        'CONFIRMED_MAILS' => "Bereits best. Mails",
        'TASK_NO_TITLE' => "Aufgabe ohne SQL-Anweisungen",
        'UNCONFIRMED_LOCKED' => "Anzahl zu best. Mails f&uuml;r Willkommensgutschrift",
        'CONFIRMED_MAILS' => "Bereits best. Mails",
-       '_YEARS'  , "Jahre",
-       '_MONTHS' , "Monate",
-       '_WEEKS'  , "Wochen",
-       '_DAYS'   , "Tage",
-       '_HOURS'  , "Stunden",
+       '_YEARS'   => "Jahre",
+       '_MONTHS'  => "Monate",
+       '_WEEKS'   => "Wochen",
+       '_DAYS'    => "Tage",
+       '_HOURS'   => "Stunden",
        '_MINUTES' => "Minuten",
        '_SECONDS' => "Sekunden",
        'SORT_ASCENDING' => "Aufsteigend",
        '_MINUTES' => "Minuten",
        '_SECONDS' => "Sekunden",
        'SORT_ASCENDING' => "Aufsteigend",
diff --git a/inc/modules/admin/what-config_bonus.php b/inc/modules/admin/what-config_bonus.php
index 406cefa1bde07018b6510e02a7e7542466f00118..3360eeb3d0adc2da68d3989f3555c6852a15d89b 100644 (file)
--- a/inc/modules/admin/what-config_bonus.php
+++ b/inc/modules/admin/what-config_bonus.php
@@ -76,7 +76,7 @@ if (isFormSent()) {
        // Prepare contants for the template
        $content['login']  = translateComma(getConfig('login_bonus')        , false);
        $content['turbo']  = translateComma(getConfig('turbo_bonus')        , false);
        // Prepare contants for the template
        $content['login']  = translateComma(getConfig('login_bonus')        , false);
        $content['turbo']  = translateComma(getConfig('turbo_bonus')        , false);
-       $contentp['order'] = translateComma(getConfig('bonus_order')        , false);
+       $content['order']  = translateComma(getConfig('bonus_order')        , false);
        $content['ref']    = translateComma(getConfig('bonus_ref')          , false);
        $content['stats']  = translateComma(getConfig('bonus_stats')        , false);
        $content['notify'] = translateComma(getConfig('bonus_notify_points'), false);
        $content['ref']    = translateComma(getConfig('bonus_ref')          , false);
        $content['stats']  = translateComma(getConfig('bonus_stats')        , false);
        $content['notify'] = translateComma(getConfig('bonus_notify_points'), false);
diff --git a/inc/modules/admin/what-config_points.php b/inc/modules/admin/what-config_points.php
index d45ef8dc92623a2f4446cb3a456c98fb7f9df62b..b8a62ba74702ebddcd371654021f89dd444a8380 100644 (file)
--- a/inc/modules/admin/what-config_points.php
+++ b/inc/modules/admin/what-config_points.php
@@ -220,7 +220,7 @@ WHERE `mails_confirmed` < %s", $REF, $REF));
                                'sw'       => $SW,
                                'id'       => $id,
                                'level'    => $content['level'],
                                'sw'       => $SW,
                                'id'       => $id,
                                'level'    => $content['level'],
-                               'percents' => translateComma($contentp['percents']),
+                               'percents' => translateComma($content['percents']),
                        );
 
                        // Load row template and switch color
                        );
 
                        // Load row template and switch color
diff --git a/inc/modules/guest/what-mediadata.php b/inc/modules/guest/what-mediadata.php
index 1cac00d558a770ea834e606962652fd21c334ba2..b19c7203e4c38c6949d1c7b8672dc7112b14227f 100644 (file)
--- a/inc/modules/guest/what-mediadata.php
+++ b/inc/modules/guest/what-mediadata.php
@@ -304,7 +304,7 @@ $content['rowspan_points'] = $ROWS_POINTS;
 $content['rowspan_user']   = $ROWS_USER;
 
 // Patch timespamp
 $content['rowspan_user']   = $ROWS_USER;
 
 // Patch timespamp
-$contentp['patch_ctime'] = generateDateTime(getConfig('patch_ctime'), 2);
+$content['patch_ctime'] = generateDateTime(getConfig('patch_ctime'), 2);
 
 // Load template
 loadTemplate('mediadata', false, $content);
 
 // Load template
 loadTemplate('mediadata', false, $content);
diff --git a/templates/de/html/admin/admin_config_bonus.tpl b/templates/de/html/admin/admin_config_bonus.tpl
index 466879194be8d0aad57b99ca9dc2a881863edc0c..a5f0761e56511bc4b1db1a43d3120d4a9c15e6b7 100644 (file)
--- a/templates/de/html/admin/admin_config_bonus.tpl
+++ b/templates/de/html/admin/admin_config_bonus.tpl
@@ -43,8 +43,8 @@
                </td>
                <td class="seperator" width="5">&nbsp;</td>
                <td width="195" align="center">
                </td>
                <td class="seperator" width="5">&nbsp;</td>
                <td width="195" align="center">
-                       <input type="radio" name="bonus_click_yn" class="admin_normal" value="Y"$content[click_y] />&nbsp;{--YES--}<br />
-                       <input type="radio" name="bonus_click_yn" class="admin_normal" value="N"$content[click_n] />&nbsp;{--NO--}
+                       <input type="radio" name="bonus_click_yn" class="admin_normal" value="Y"$content[click_yn_y] />&nbsp;{--YES--}<br />
+                       <input type="radio" name="bonus_click_yn" class="admin_normal" value="N"$content[click_yn_n] />&nbsp;{--NO--}
                </td>
        </tr>
        <tr>
                </td>
        </tr>
        <tr>
@@ -59,8 +59,8 @@
                </td>
                <td class="seperator" width="5">&nbsp;</td>
                <td width="195" align="center">
                </td>
                <td class="seperator" width="5">&nbsp;</td>
                <td width="195" align="center">
-                       <input type="radio" name="bonus_login_yn" class="admin_normal" value="Y"$content[login_y] />&nbsp;{--YES--}<br />
-                       <input type="radio" name="bonus_login_yn" class="admin_normal" value="N"$content[login_n] />&nbsp;{--NO--}
+                       <input type="radio" name="bonus_login_yn" class="admin_normal" value="Y"$content[login_yn_y] />&nbsp;{--YES--}<br />
+                       <input type="radio" name="bonus_login_yn" class="admin_normal" value="N"$content[login_yn_n] />&nbsp;{--NO--}
                </td>
        </tr>
        <tr>
                </td>
        </tr>
        <tr>
@@ -75,8 +75,8 @@
                </td>
                <td class="seperator" width="5">&nbsp;</td>
                <td width="195" align="center">
                </td>
                <td class="seperator" width="5">&nbsp;</td>
                <td width="195" align="center">
-                       <input type="radio" name="bonus_order_yn" class="admin_normal" value="Y"$content[order_y] />&nbsp;{--YES--}<br />
-                       <input type="radio" name="bonus_order_yn" class="admin_normal" value="N"$content[order_n] />&nbsp;{--NO--}
+                       <input type="radio" name="bonus_order_yn" class="admin_normal" value="Y"$content[order_yn_y] />&nbsp;{--YES--}<br />
+                       <input type="radio" name="bonus_order_yn" class="admin_normal" value="N"$content[order_yn_n] />&nbsp;{--NO--}
                </td>
        </tr>
        <tr>
                </td>
        </tr>
        <tr>
@@ -91,8 +91,8 @@
                </td>
                <td class="seperator" width="5">&nbsp;</td>
                <td width="195" align="center">
                </td>
                <td class="seperator" width="5">&nbsp;</td>
                <td width="195" align="center">
-                       <input type="radio" name="bonus_stats_yn" class="admin_normal" value="Y"$content[stats_y] />&nbsp;{--YES--}<br />
-                       <input type="radio" name="bonus_stats_yn" class="admin_normal" value="N"$content[stats_n] />&nbsp;{--NO--}
+                       <input type="radio" name="bonus_stats_yn" class="admin_normal" value="Y"$content[stats_yn_y] />&nbsp;{--YES--}<br />
+                       <input type="radio" name="bonus_stats_yn" class="admin_normal" value="N"$content[stats_yn_n] />&nbsp;{--NO--}
                </td>
        </tr>
        <tr>
                </td>
        </tr>
        <tr>
@@ -107,8 +107,8 @@
                </td>
                <td class="seperator" width="5">&nbsp;</td>
                <td width="195" align="center">
                </td>
                <td class="seperator" width="5">&nbsp;</td>
                <td width="195" align="center">
-                       <input type="radio" name="bonus_ref_yn" class="admin_normal" value="Y"$content[ref_y] />&nbsp;{--YES--}<br />
-                       <input type="radio" name="bonus_ref_yn" class="admin_normal" value="N"$content[ref_n] />&nbsp;{--NO--}
+                       <input type="radio" name="bonus_ref_yn" class="admin_normal" value="Y"$content[ref_yn_y] />&nbsp;{--YES--}<br />
+                       <input type="radio" name="bonus_ref_yn" class="admin_normal" value="N"$content[ref_yn_n] />&nbsp;{--NO--}
                </td>
        </tr>
        <tr>
                </td>
        </tr>
        <tr>
@@ -129,7 +129,7 @@
                <td class="seperator" width="5">&nbsp;</td>
                <td width="195" align="center">
                        <input type="text" name="bonus_order" class="admin_normal" size="8" maxlength="20" value="$content[order]" />
                <td class="seperator" width="5">&nbsp;</td>
                <td width="195" align="center">
                        <input type="text" name="bonus_order" class="admin_normal" size="8" maxlength="20" value="$content[order]" />
-                       <div class="admin_note">({?POINTS?})</div>
+                       <span class="admin_note">({?POINTS?})</span>
                </td>
        </tr>
        <tr>
                </td>
        </tr>
        <tr>
@@ -142,7 +142,7 @@
                <td class="seperator" width="5">&nbsp;</td>
                <td width="195" align="center">
                        <input type="text" name="bonus_ref" class="admin_normal" size="8" maxlength="20" value="$content[ref]" />
                <td class="seperator" width="5">&nbsp;</td>
                <td width="195" align="center">
                        <input type="text" name="bonus_ref" class="admin_normal" size="8" maxlength="20" value="$content[ref]" />
-                       <div class="admin_note">({?POINTS?})</div>
+                       <span class="admin_note">({?POINTS?})</span>
                </td>
        </tr>
        <tr>
                </td>
        </tr>
        <tr>
@@ -155,7 +155,7 @@
                <td class="seperator" width="5">&nbsp;</td>
                <td width="195" align="center">
                        <input type="text" name="bonus_stats" class="admin_normal" size="8" maxlength="20" value="$content[stats]" />
                <td class="seperator" width="5">&nbsp;</td>
                <td width="195" align="center">
                        <input type="text" name="bonus_stats" class="admin_normal" size="8" maxlength="20" value="$content[stats]" />
-                       <div class="admin_note">({?POINTS?})</div>
+                       <span class="admin_note">({?POINTS?})</span>
                </td>
        </tr>
        <tr>
                </td>
        </tr>
        <tr>
@@ -168,7 +168,7 @@
                <td class="seperator" width="5">&nbsp;</td>
                <td width="195" align="center">
                        <input type="text" name="login_bonus" class="admin_normal" size="8" maxlength="20" value="$content[login]" />
                <td class="seperator" width="5">&nbsp;</td>
                <td width="195" align="center">
                        <input type="text" name="login_bonus" class="admin_normal" size="8" maxlength="20" value="$content[login]" />
-                       <div class="admin_note">({?POINTS?})</div>
+                       <span class="admin_note">({?POINTS?})</span>
                </td>
        </tr>
        <tr>
                </td>
        </tr>
        <tr>
@@ -187,7 +187,7 @@
                <td class="seperator" width="5">&nbsp;</td>
                <td align="center">
                        <input type="text" name="turbo_bonus" class="admin_normal" size="10" maxlength="20" value="$content[turbo]" />
                <td class="seperator" width="5">&nbsp;</td>
                <td align="center">
                        <input type="text" name="turbo_bonus" class="admin_normal" size="10" maxlength="20" value="$content[turbo]" />
-                       <div class="admin_note">({?POINTS?})</div>
+                       <span class="admin_note">({?POINTS?})</span>
                </td>
        </tr>
        <tr>
                </td>
        </tr>
        <tr>
@@ -314,8 +314,8 @@
                </td>
                <td class="seperator" width="5">&nbsp;</td>
                <td width="195" align="center">
                </td>
                <td class="seperator" width="5">&nbsp;</td>
                <td width="195" align="center">
-                       <input type="radio" name="bonus_new_mem_notify" class="admin_normal" value="Y"$content[new_member_notify_y] />&nbsp;{--YES--}<br />
-                       <input type="radio" name="bonus_new_mem_notify" class="admin_normal" value="N"$content[new_member_notify_n] />&nbsp;{--NO--}
+                       <input type="radio" name="bonus_new_mem_notify" class="admin_normal" value="Y"$content[new_mem_notify_y] />&nbsp;{--YES--}<br />
+                       <input type="radio" name="bonus_new_mem_notify" class="admin_normal" value="N"$content[new_mem_notify_n] />&nbsp;{--NO--}
                </td>
        </tr>
        <tr>
                </td>
        </tr>
        <tr>
@@ -328,7 +328,7 @@
                <td class="seperator" width="5">&nbsp;</td>
                <td width="195" align="center">
                        <input type="text" name="bonus_notify_points" class="admin_normal" size="8" maxlength="20" value="$content[notify]" />
                <td class="seperator" width="5">&nbsp;</td>
                <td width="195" align="center">
                        <input type="text" name="bonus_notify_points" class="admin_normal" size="8" maxlength="20" value="$content[notify]" />
-                       <div class="admin_note">({?POINTS?})</div>
+                       <span class="admin_note">({?POINTS?})</span>
                </td>
        </tr>
        <tr>
                </td>
        </tr>
        <tr>
Mailer-Project repository