From 1c62a6c2a4ed2bb170e0f1888899625e67a27947 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Mon, 13 Sep 2010 23:25:06 +0000 Subject: [PATCH] More EL used, this has fixed double calls of translateComma() in various places --- inc/autopurge/purge-general.php | 4 ++-- inc/extensions/ext-order.php | 2 +- inc/language/wernis_de.php | 2 +- inc/libs/surfbar_functions.php | 8 ++++---- inc/modules/admin/admin-inc.php | 2 +- inc/modules/admin/what-config_points.php | 3 --- inc/modules/admin/what-del_email.php | 6 +++--- inc/modules/admin/what-del_transfer.php | 2 +- inc/modules/admin/what-list_beg.php | 2 +- inc/modules/admin/what-list_bonus.php | 2 +- inc/modules/admin/what-list_user.php | 8 ++++---- inc/modules/admin/what-send_bonus.php | 4 ++-- inc/modules/guest/what-mediadata.php | 2 +- inc/modules/member/what-order.php | 5 ++--- inc/modules/member/what-payout.php | 2 +- inc/modules/member/what-surfbar_list.php | 2 +- inc/modules/member/what-transfer.php | 5 ++--- inc/modules/member/what-wernis.php | 9 +-------- inc/mysql-manager.php | 2 +- templates/de/emails/admin/admin_autopurge_points.tpl | 2 +- templates/de/emails/admin/admin_refback.tpl | 2 +- templates/de/emails/confirm-member.tpl | 2 +- templates/de/emails/confirm-referral.tpl | 2 +- templates/de/emails/member/member_refback.tpl | 4 ++-- templates/de/html/admin/admin_cache_stats.tpl | 2 +- templates/de/html/admin/admin_delete_reflevel_row.tpl | 2 +- templates/de/html/admin/admin_list_bank_package_row.tpl | 4 ++-- templates/de/html/admin/admin_list_beg.tpl | 2 +- templates/de/html/admin/admin_list_bonus.tpl | 2 +- templates/de/html/admin/admin_list_reflevel_row.tpl | 2 +- templates/de/html/admin/admin_list_user_row.tpl | 2 +- templates/de/html/admin/admin_send_bonus_form.tpl | 4 ++-- templates/de/html/admin/admin_user_details.tpl | 2 +- templates/de/html/doubler/doubler_index.tpl | 2 +- templates/de/html/guest/guest_doubler.tpl | 2 +- templates/de/html/member/member_doubler.tpl | 4 ++-- templates/de/html/member/member_holiday_form.tpl | 2 +- templates/de/html/member/member_order_points.tpl | 2 +- templates/de/html/member/member_points_row.tpl | 2 +- templates/de/html/member/member_refback_list_row.tpl | 2 +- .../de/html/member/member_refback_list_row_deleted.tpl | 2 +- templates/de/html/member/member_stats_row.tpl | 2 +- .../de/html/member/member_surfbar_start_dynamic.tpl | 2 +- templates/de/html/member/member_transfer_list.tpl | 2 +- templates/de/html/member/member_transfer_row.tpl | 2 +- templates/de/html/member/member_wernis_mode_payout.tpl | 4 ++-- templates/de/html/member/member_wernis_mode_withdraw.tpl | 2 +- 47 files changed, 63 insertions(+), 75 deletions(-) diff --git a/inc/autopurge/purge-general.php b/inc/autopurge/purge-general.php index fb30bb928c..f5249b9906 100644 --- a/inc/autopurge/purge-general.php +++ b/inc/autopurge/purge-general.php @@ -144,12 +144,12 @@ ORDER BY // Add points from deleted accounts to jackpot, but here just add to notify mail if ($admin_points > 0) { // Send mail to admin - sendAdminNotification('{--ADMIN_AUTOPURGE_SUBJECT--}', 'admin_autopurge_points', translateComma($admin_points)); + sendAdminNotification('{--ADMIN_AUTOPURGE_SUBJECT--}', 'admin_autopurge_points', $admin_points); } // END - if // Run all SQLs here runFilterChain('run_sqls'); } // END - if -// +// [EOF] ?> diff --git a/inc/extensions/ext-order.php b/inc/extensions/ext-order.php index 9df9339aa2..68b87ef4dc 100644 --- a/inc/extensions/ext-order.php +++ b/inc/extensions/ext-order.php @@ -73,7 +73,7 @@ switch (getExtensionMode()) { case 'update': // Update an extension switch (getCurrentExtensionVersion()) { case '0.1.0': // SQL queries for v0.1 - addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_config` ADD order_max_full ENUM('ORDER','MAX') NOT NULL DEFAULT 'MAX'"); + addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_config` ADD `order_max_full` ENUM('ORDER','MAX') NOT NULL DEFAULT 'MAX'"); addAdminMenuSql('setup','config_order','Mailbuchungsseite','Einstellungen am Mailbuchungsformular.',7); // Update notes (these will be set as task text!) diff --git a/inc/language/wernis_de.php b/inc/language/wernis_de.php index 2e204f375a..1b4e1d644d 100644 --- a/inc/language/wernis_de.php +++ b/inc/language/wernis_de.php @@ -105,7 +105,7 @@ addMessages(array( 'MEMBER_WERNIS_MODE_CHOOSE2' => "Hier klicken um neue Überweisung zu starten...", 'MEMBER_WERNIS_NO_ACCOUNT' => "Noch kein WDS66-Account? Hier entlang.", 'MEMBER_WERNIS_API_DATA_MISSING' => "Diese Funktion kann derzeit nicht genutzt werden, da wir sie noch einrichten müssen.", - 'MEMBER_WERNIS_MIN_PAYOUT' => "Sie haben nicht genügend Wernis zum Auszahlen! Mindestens: %s, Ihr Guthaben: %s Wernis.", + 'MEMBER_WERNIS_MIN_PAYOUT' => "Sie haben nicht genügend Wernis zum Auszahlen! Mindestens: {%%config,translateComma=wernis_min_payout%%} {?POINTS?}, Ihr Guthaben: {%%pipe,translateComma=%s%%} {?POINTS?}.", 'MEMBER_WERNIS_WITHDRAW_TITLE' => "Wernis bei {?MAIN_TITLE?} einzahlen:", 'MEMBER_WERNIS_WITHDRAW_POINTS_ACCOUNT' => "Wernis hier im Account:", 'MEMBER_WERNIS_WITHDRAW_MIN_POINTS' => "Mindest einzuzahlendes Wernis-Guthaben:", diff --git a/inc/libs/surfbar_functions.php b/inc/libs/surfbar_functions.php index bbb6daecaf..5f14531f9f 100644 --- a/inc/libs/surfbar_functions.php +++ b/inc/libs/surfbar_functions.php @@ -725,7 +725,7 @@ function translateSurfbarLimit ($limit) { $return = '{--MEMBER_SURFBAR_UNLIMITED_VIEWS--}'; } else { // Translate comma - $return = translateComma($limit); + $return = '{%pipe,translateComma=' . $limit . '%}'; } // Return value @@ -1295,9 +1295,9 @@ function SURFBAR_CHANGE_STATUS ($urlId, $prevStatus, $newStatus, $data=array()) // Prepare content for notification routines $data[$urlId]['url_userid'] = $data[$urlId]['url_userid']; - $data[$urlId]['frametester'] = generateFrametesterUrl($data[$urlId]['url']); - $data[$urlId]['reward'] = translateComma(getConfig('surfbar_static_reward')); - $data[$urlId]['costs'] = translateComma(getConfig('surfbar_static_costs')); + $data[$urlId]['frametester'] = '{%pipe,generateFrametesterUrl=' . $data[$urlId]['url'] . '%}'; + $data[$urlId]['reward'] = '{%config,translateComma=surfbar_static_reward%}'; + $data[$urlId]['costs'] = '{%config,translateComma=surfbar_static_costs%}'; // Do some dirty fixing here: if (($data[$urlId]['url_status'] == 'STOPPED') && ($newStatus == 'pending')) { diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php index f0e647c78a..543b67f17c 100644 --- a/inc/modules/admin/admin-inc.php +++ b/inc/modules/admin/admin-inc.php @@ -1360,7 +1360,7 @@ function generateUnconfirmedAdminLink ($id, $unconfirmed, $type = 'bid') { // Do we have unconfirmed mails? if ($unconfirmed > 0) { // Add link to list_unconfirmed what-file - $OUT = '' . translateComma($unconfirmed) . ''; + $OUT = '{%pipe,translateComma=' . $unconfirmed . '%}'; } // END - if // Return it diff --git a/inc/modules/admin/what-config_points.php b/inc/modules/admin/what-config_points.php index 78d995c954..1ec4d829b1 100644 --- a/inc/modules/admin/what-config_points.php +++ b/inc/modules/admin/what-config_points.php @@ -222,9 +222,6 @@ WHERE // List already existing categories for editing while ($content = SQL_FETCHARRAY($result)) { - // Prepare data for the row template - $content['percents'] = translateComma($content['percents']); - // Load row template and switch color $OUT .= loadTemplate('admin_list_reflevel_row', true, $content); } // END - while diff --git a/inc/modules/admin/what-del_email.php b/inc/modules/admin/what-del_email.php index 997c6370ee..1b8996f0b6 100644 --- a/inc/modules/admin/what-del_email.php +++ b/inc/modules/admin/what-del_email.php @@ -116,17 +116,17 @@ LIMIT 1", if (getConfig('repay_deleted_mails') == 'REPAY') { // Repayed loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_POINTS_REPAYED', - translateComma($totalPoints) + '{%pipe,translateComma=' . $totalPoints . '%}' )); } else { // To jackpot loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_POINTS_TO_JACKPOT', - translateComma($totalPoints) + '{%pipe,translateComma=' . $totalPoints . '%}' )); } } else { // Points shredded! - loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_POINTS_SHREDDED', translateComma($totalPoints))); + loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_POINTS_SHREDDED', '{%pipe,translateComma=' . $totalPoints . '%}')); } // Remove links from DB diff --git a/inc/modules/admin/what-del_transfer.php b/inc/modules/admin/what-del_transfer.php index 7869127894..19414fe984 100644 --- a/inc/modules/admin/what-del_transfer.php +++ b/inc/modules/admin/what-del_transfer.php @@ -100,7 +100,7 @@ if (!SQL_HASZERONUMS($result)) { $content['rows'] = $OUT; // Remeber total amount -$content['total'] = translateComma($total); +$content['total'] = $total; // Set title $content['title'] = '{--TRANSFER_LIST_ALL--}'; diff --git a/inc/modules/admin/what-list_beg.php b/inc/modules/admin/what-list_beg.php index 38bc8c3772..65711bcf70 100644 --- a/inc/modules/admin/what-list_beg.php +++ b/inc/modules/admin/what-list_beg.php @@ -105,7 +105,7 @@ ORDER BY } // END - while $content['rows'] = $OUT; - $content['total'] = translateComma($total); + $content['total'] = $total; // Check if we need to display form or not with manuel withdraw if (getConfig('last_month') == getMonth()) { diff --git a/inc/modules/admin/what-list_bonus.php b/inc/modules/admin/what-list_bonus.php index 492f1a0311..ef9631c12f 100644 --- a/inc/modules/admin/what-list_bonus.php +++ b/inc/modules/admin/what-list_bonus.php @@ -117,7 +117,7 @@ ORDER BY } // END - while $content['rows'] = $OUT; - $content['total'] = translateComma($total); + $content['total'] = $total; // Check if we need to display form or not with manuel withdraw if (getConfig('last_month') == getMonth()) { diff --git a/inc/modules/admin/what-list_user.php b/inc/modules/admin/what-list_user.php index 4502201f68..8d28ef51c9 100644 --- a/inc/modules/admin/what-list_user.php +++ b/inc/modules/admin/what-list_user.php @@ -118,8 +118,8 @@ LIMIT 1", // Add links to the numbers if ($content['links'] > 0) $content['links'] = $base . '&what=list_links&userid=' . $userid . '%}">' . $content['links'] . ']'; if (isValidUserId($content['refid'])) $content['refid'] = $base . '&what=list_user&userid=' . $content['refid'] . '%}">'.$content['refid'] . ']'; - if ($content['refs'] > 0) $content['refs'] = $base . '&what=list_refs&userid=' . $userid . '%}">' . translateComma($content['refs']) . ']'; - if ($content['cats'] > 0) $content['cats'] = $base . '&what=list_cats&userid=' . $userid . '%}">' . translateComma($content['cats']) . ']'; + if ($content['refs'] > 0) $content['refs'] = $base . '&what=list_refs&userid=' . $userid . '%}">{%pipe,translateComma=' . $content['refs'] . '%}]'; + if ($content['cats'] > 0) $content['cats'] = $base . '&what=list_cats&userid=' . $userid . '%}">{%pipe,translateComma=' . $content['cats'] . '%}]'; // Calculate timestamp for birthday $stamp = mktime(0, 0, 0, $content['birth_month'], $content['birth_day'], $content['birth_year']); @@ -136,7 +136,7 @@ LIMIT 1", // Prepare data for template $content['email_link'] = generateEmailLink($content['email'], 'user_data'); $content['last_online'] = generateDateTime($content['last_online'], 0); - if ($content['emails_sent'] > 0) $content['emails_sent'] = $base . '&what=email_details&userid=' . $userid . '%}">' . translateComma($content['emails_sent']) . ']'; + if ($content['emails_sent'] > 0) $content['emails_sent'] = $base . '&what=email_details&userid=' . $userid . '%}">}{%pipe,translateComma=' . $content['emails_sent'] . '%}]'; $content['joined'] = generateDateTime($content['joined'], 0); $content['last_update'] = generateDateTime($content['last_update'], 0); $content['last_profile_sent'] = generateDateTime($content['last_profile_sent'], 0); @@ -289,7 +289,7 @@ LIMIT 1", $content['locked'] = countSumTotalData($content['userid'], 'user_points', 'locked_points'); // If we have at least one referal, make it clickable to referal list - if ($content['refs'] > 0) $content['refs'] = $base . '&what=list_refs&userid=' . $content['userid'] . '%}">' . translateComma($content['refs']) . ']'; + if ($content['refs'] > 0) $content['refs'] = $base . '&what=list_refs&userid=' . $content['userid'] . '%}">{%pipe,translateComma=' . $content['refs'] . '%}]'; // Is the extension 'country' installed? // @TODO Rewrite this into a filter diff --git a/inc/modules/admin/what-send_bonus.php b/inc/modules/admin/what-send_bonus.php index ff353ba04c..9ef51ffb05 100644 --- a/inc/modules/admin/what-send_bonus.php +++ b/inc/modules/admin/what-send_bonus.php @@ -56,10 +56,10 @@ if (isFormSent()) { addNewBonusMail(postRequestArray(), getRequestParameter('mode')); } else { // Get all available users - $content['all'] = translateComma(getTotalReceivers(getRequestParameter('mode'))); + $content['all'] = getRequestParameter('mode'); // Prepare option lines - $content['options_lines'] = generateCategoryOptionsList(getRequestParameter('mode')); + $content['options_lines'] = getRequestParameter('mode'); // Store send mode $content['mode'] = getRequestParameter('mode'); diff --git a/inc/modules/guest/what-mediadata.php b/inc/modules/guest/what-mediadata.php index 7c402589f3..56f4582446 100644 --- a/inc/modules/guest/what-mediadata.php +++ b/inc/modules/guest/what-mediadata.php @@ -131,7 +131,7 @@ $jackpot = '0'; if (isExtensionActive('jackpot')) $jackpot = getJackpotPoints(); if (empty($jackpot)) $jackpot = '0'; -$content['jackpot'] = translateComma($jackpot); +$content['jackpot'] = $jackpot; // Total referal link clicks, total logins $result = SQL_QUERY('SELECT diff --git a/inc/modules/member/what-order.php b/inc/modules/member/what-order.php index d1d18a245a..f891d0609f 100644 --- a/inc/modules/member/what-order.php +++ b/inc/modules/member/what-order.php @@ -526,7 +526,7 @@ LIMIT 1", SQL_FREERESULT($result); // Output user's points - $content['total'] = translateComma($total); + $content['total'] = $total; // Check how many mail orders he has placed today and how many he's allowed to send switch (getConfig('order_max_full')) { @@ -599,12 +599,11 @@ LIMIT 1", // Mail type $content['type_selection'] = ''; foreach ($types as $key => $value) { - $P = translateComma($types[$key][1]); if (is_array($value)) { // Output option line $content['type_selection'] .= ' '; } // END - if } // END - foreach diff --git a/inc/modules/member/what-payout.php b/inc/modules/member/what-payout.php index 81369160cd..43c0ca9174 100644 --- a/inc/modules/member/what-payout.php +++ b/inc/modules/member/what-payout.php @@ -146,7 +146,7 @@ ORDER BY // Ok, he can get be paid if ((isFormSent()) && ($points <= $PAY_MAX) && ($points >= $content['min_points'])) { // Remember points in array - setPostRequestParameter('payout_points', translateComma($points)); + setPostRequestParameter('payout_points', $points); setPostRequestParameter('type' , $content['type']); // Subtract points from member's account diff --git a/inc/modules/member/what-surfbar_list.php b/inc/modules/member/what-surfbar_list.php index 6f892c2486..0f1c81eaa6 100644 --- a/inc/modules/member/what-surfbar_list.php +++ b/inc/modules/member/what-surfbar_list.php @@ -73,7 +73,7 @@ if ((isFormSent()) && (isPostRequestParameterSet('action')) && (isPostRequestPar // "Translate"/insert data if ($content['views_total'] > 0) { // Include link to stats - $content['views_total'] = '[' . translateComma($content['views_total']) . ']'; + $content['views_total'] = '[{%pipe,translateComma=' . $content['views_total'] . '%}]'; } // END - if $content['url_registered'] = generateDateTime($content['url_registered'], 2); $content['url_last_locked'] = generateDateTime($content['url_last_locked'], 2); diff --git a/inc/modules/member/what-transfer.php b/inc/modules/member/what-transfer.php index b080851b85..4edd967851 100644 --- a/inc/modules/member/what-transfer.php +++ b/inc/modules/member/what-transfer.php @@ -336,7 +336,7 @@ switch ($mode) { $content['rows'] = $OUT; // Remeber total amount - $content['total'] = translateComma($totalPoints); + $content['total'] = $totalPoints; // Load final template loadTemplate('member_transfer_list', false, $content); @@ -396,7 +396,6 @@ KEY (`party_userid`) // Prepare content for template $content['time'] = generateDateTime($content['time_trans'], 3); - $content['points'] = translateComma($content['points']); // Load row template $OUT .= loadTemplate('member_transfer_row', true, $content); @@ -420,7 +419,7 @@ KEY (`party_userid`) $content['rows'] = $OUT; // Remeber total amount - $content['total'] = translateComma($total); + $content['total'] = $total; // Set title $content['title'] = '{--TRANSFER_LIST_ALL--}'; diff --git a/inc/modules/member/what-wernis.php b/inc/modules/member/what-wernis.php index b62a5aaaae..108be32022 100644 --- a/inc/modules/member/what-wernis.php +++ b/inc/modules/member/what-wernis.php @@ -122,11 +122,7 @@ if ((!isGetRequestParameterSet('mode')) || (getRequestParameter('mode') == 'choo // Is this enougth for a payout? if ($points < getConfig('wernis_min_payout')) { // No, then abort here - loadTemplate('admin_settings_saved', false, sprintf( - getMessage('MEMBER_WERNIS_MIN_PAYOUT'), - translateComma(getConfig('wernis_min_payout')), - translateComma($points) - )); + loadTemplate('admin_settings_saved', false, '{%message,MEMBER_WERNIS_MIN_PAYOUT=' . $points . '%}'); return; } // END - if @@ -136,9 +132,6 @@ if ((!isGetRequestParameterSet('mode')) || (getRequestParameter('mode') == 'choo // Add points to content array $content['points'] = $points; - - // Get WDS66 username - $content['wernis_userid'] = getUserData('wernis_userid'); } elseif ((getRequestParameter('mode') == 'withdraw') && (getConfig('wernis_withdraw_active') == 'Y')) { // Prepare data for the template $content['points'] = getTotalPoints(getMemberId()); diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php index 885b670ce1..afd26d2bda 100644 --- a/inc/mysql-manager.php +++ b/inc/mysql-manager.php @@ -822,7 +822,7 @@ function getPaymentTitlePrice ($pid, $full=false) { if ($full === false) { $ret = $data['mail_title']; } else { - $ret = $data['mail_title'] . ' / ' . translateComma($data['price']) . ' {?POINTS?}'; + $ret = $data['mail_title'] . ' / {%pipe,translateComma=' . $data['price' . '%} {?POINTS?}'; } } diff --git a/templates/de/emails/admin/admin_autopurge_points.tpl b/templates/de/emails/admin/admin_autopurge_points.tpl index a4ad1b4deb..fe400ff718 100644 --- a/templates/de/emails/admin/admin_autopurge_points.tpl +++ b/templates/de/emails/admin/admin_autopurge_points.tpl @@ -1,6 +1,6 @@ Hallo Administrator, -Es wurden soeben $content {?POINTS?} durch die automatische Loeschung von Bestätigungslinks in den Jackpot transferiert! +Es wurden soeben {%pipe,translateComma=$content%} {?POINTS?} durch die automatische Loeschung von Bestätigungslinks in den Jackpot transferiert! Mit freundlichen Grüßen, Ihr {?MAIN_TITLE?} Script diff --git a/templates/de/emails/admin/admin_refback.tpl b/templates/de/emails/admin/admin_refback.tpl index ac37176630..c0fa399c28 100644 --- a/templates/de/emails/admin/admin_refback.tpl +++ b/templates/de/emails/admin/admin_refback.tpl @@ -11,7 +11,7 @@ Familienname: {%user,family=$userid%} ----------------------------------- Email-Adresse: {%user,email=$userid%} ----------------------------------- -Ref-Back: {%pipe,translateComma=$content[percents]%}% +Ref-Back: {%pipe,translateComma=$content[percents]%}% ----------------------------------- Bereits erhalten: {%pipe,translateComma=$content[points]%} {?POINTS?} ----------------------------------- diff --git a/templates/de/emails/confirm-member.tpl b/templates/de/emails/confirm-member.tpl index 9e68df08bb..45bb20a3b2 100644 --- a/templates/de/emails/confirm-member.tpl +++ b/templates/de/emails/confirm-member.tpl @@ -7,7 +7,7 @@ Sie können sich nun hier einloggen: Ihre Login-Id lautet: $userid URL zum Login: {?URL?}/login.php -für Ihre Anmeldung werden wir Ihnen als Willkommensgutschrift {%config,translateComma=points_register%} {?POINTS?} gutschreiben, sobald Sie {?ref_payout?} Mails bestätigt haben. Erst dann können Sie Mails an die anderen Mitglieder verschicken! +Für Ihre Anmeldung werden wir Ihnen als Willkommensgutschrift {%config,translateComma=points_register%} {?POINTS?} gutschreiben, sobald Sie {?ref_payout?} Mails bestätigt haben. Erst dann können Sie Mails an die anderen Mitglieder verschicken! Wir wünschen Ihnen viel Spass und Erfolg beim Mail-Versand! diff --git a/templates/de/emails/confirm-referral.tpl b/templates/de/emails/confirm-referral.tpl index 855148178f..a0801989b1 100644 --- a/templates/de/emails/confirm-referral.tpl +++ b/templates/de/emails/confirm-referral.tpl @@ -4,7 +4,7 @@ Sie haben heute ein neues Mitglied für {?MAIN_TITLE?} geworben! Hier sehen Sie genau, in welcher Ebene Sie ihn geworben haben: ----------------- -Referal-Ebene (translateComma=$content[percents]%}%): $content[level] +Referal-Ebene (translateComma=$content[percents]%}%): $content[level] {?POINTS?}: {%pipe,translateComma=$content[points]%} ID des Mitgliedes: {%user,refid,bigintval=$userid%} ----------------- diff --git a/templates/de/emails/member/member_refback.tpl b/templates/de/emails/member/member_refback.tpl index 9217303ee4..821fcba93a 100644 --- a/templates/de/emails/member/member_refback.tpl +++ b/templates/de/emails/member/member_refback.tpl @@ -1,11 +1,11 @@ Hallo {%user,gender,translateGender=$userid%} {%user,surname=$userid%} {%user,family=$userid%}, -Das Mitglied $content[refid] hat Ihnen soeben {%pipe,translateComma=$content[percents]%}% Ref-Back eingestellt. Sie erhalten also anteilig {?POINTS?} von seinen Referal-Gutschriften die Sie ihm/ihr bringen ebenfalls gutgeschrieben. +Das Mitglied $content[refid] hat Ihnen soeben {%pipe,translateComma=$content[percents]%}% Ref-Back eingestellt. Sie erhalten also anteilig {?POINTS?} von seinen Referal-Gutschriften die Sie ihm/ihr bringen ebenfalls gutgeschrieben. ------------------------------ Ihr Mitglieder-Id ist: $userid ------------------------------ -Ref-Back: {%pipe,translateComma=$content[percents]%}% +Ref-Back: {%pipe,translateComma=$content[percents]%}% ------------------------------ Sie haben bereits {%pipe,translateComma=$content[points]%} {?POINTS?} Ref-Back-Vergütung an das Mitglied abgegeben. diff --git a/templates/de/html/admin/admin_cache_stats.tpl b/templates/de/html/admin/admin_cache_stats.tpl index 6b07e069ff..955f180953 100644 --- a/templates/de/html/admin/admin_cache_stats.tpl +++ b/templates/de/html/admin/admin_cache_stats.tpl @@ -32,7 +32,7 @@
- {%pipe,translateComma=$content[cache_perc]%}% + {%pipe,translateComma=$content[cache_perc]%}%
diff --git a/templates/de/html/admin/admin_delete_reflevel_row.tpl b/templates/de/html/admin/admin_delete_reflevel_row.tpl index 1a4e5cff36..30366a7bd8 100644 --- a/templates/de/html/admin/admin_delete_reflevel_row.tpl +++ b/templates/de/html/admin/admin_delete_reflevel_row.tpl @@ -5,7 +5,7 @@ - {%pipe,translateComma=$content[percents]%}% ({--ID_SELECT--} $content[id]) + {%pipe,translateComma=$content[percents]%}% ({--ID_SELECT--} $content[id]) diff --git a/templates/de/html/admin/admin_list_bank_package_row.tpl b/templates/de/html/admin/admin_list_bank_package_row.tpl index 2f581268f7..7dab179052 100644 --- a/templates/de/html/admin/admin_list_bank_package_row.tpl +++ b/templates/de/html/admin/admin_list_bank_package_row.tpl @@ -15,10 +15,10 @@ {%pipe,translateComma=$content[account_fee]%} {?POINTS?} - {%pipe,translateComma=$content[interest_plus]%}% + {%pipe,translateComma=$content[interest_plus]%}% - {%pipe,translateComma=$content[interest_minus]%}% + {%pipe,translateComma=$content[interest_minus]%}% {%pipe,translateComma=$content[package_active]%} diff --git a/templates/de/html/admin/admin_list_beg.tpl b/templates/de/html/admin/admin_list_beg.tpl index 1c83d181c5..8dc492893e 100644 --- a/templates/de/html/admin/admin_list_beg.tpl +++ b/templates/de/html/admin/admin_list_beg.tpl @@ -24,7 +24,7 @@ {--MEMBER_BEG_TOTAL--}: - $content[total] {?POINTS?} + {%pipe,translateComma=$content[total]%} {?POINTS?}   diff --git a/templates/de/html/admin/admin_list_bonus.tpl b/templates/de/html/admin/admin_list_bonus.tpl index f11b2a4508..482955275b 100644 --- a/templates/de/html/admin/admin_list_bonus.tpl +++ b/templates/de/html/admin/admin_list_bonus.tpl @@ -24,7 +24,7 @@ {--ADMIN_TOTAL_MEMBER_BONUS--}:  - $content[total] {?POINTS?} + {%pipe,translateComma=$content[total]%} {?POINTS?}   diff --git a/templates/de/html/admin/admin_list_reflevel_row.tpl b/templates/de/html/admin/admin_list_reflevel_row.tpl index e9cf154107..1f24f6103b 100644 --- a/templates/de/html/admin/admin_list_reflevel_row.tpl +++ b/templates/de/html/admin/admin_list_reflevel_row.tpl @@ -6,6 +6,6 @@ $content[level] - $content[percents]% + {%pipe,translateComma=$content[percents]%}% diff --git a/templates/de/html/admin/admin_list_user_row.tpl b/templates/de/html/admin/admin_list_user_row.tpl index ecc921e4ec..571662dff3 100644 --- a/templates/de/html/admin/admin_list_user_row.tpl +++ b/templates/de/html/admin/admin_list_user_row.tpl @@ -36,7 +36,7 @@ {%pipe,getTotalPoints,translateComma=$content[userid]%} {?POINTS?} $content[emails_sent] - {%pipe,translateComma=$content[rate]%}% + {%pipe,translateComma=$content[rate]%}% {%pipe,translateComma=$content[locked]%} {?POINTS?} $content[refs] diff --git a/templates/de/html/admin/admin_send_bonus_form.tpl b/templates/de/html/admin/admin_send_bonus_form.tpl index 40651f5ba3..85406aa76b 100644 --- a/templates/de/html/admin/admin_send_bonus_form.tpl +++ b/templates/de/html/admin/admin_send_bonus_form.tpl @@ -7,8 +7,8 @@ diff --git a/templates/de/html/admin/admin_user_details.tpl b/templates/de/html/admin/admin_user_details.tpl index 4082e56b8c..9710237d18 100644 --- a/templates/de/html/admin/admin_user_details.tpl +++ b/templates/de/html/admin/admin_user_details.tpl @@ -142,7 +142,7 @@ {--CLICK_RATE--}:
- {%pipe,translateComma=$content[click_rate]%}% + {%pipe,translateComma=$content[click_rate]%}% {--EMAILS_RECEIVED--}:
diff --git a/templates/de/html/doubler/doubler_index.tpl b/templates/de/html/doubler/doubler_index.tpl index 85b98ab3c4..058d47ed91 100644 --- a/templates/de/html/doubler/doubler_index.tpl +++ b/templates/de/html/doubler/doubler_index.tpl @@ -65,7 +65,7 @@
$content[payout_time]

- {--DOUBLER_POINTS_1--} {%config,translateComma=doubler_charge%}% + {--DOUBLER_POINTS_1--} {%config,translateComma=doubler_charge%}% {--DOUBLER_POINTS_2--}

{--DOUBLER_EXAMPLE_1--} 500 {?POINTS?} »» diff --git a/templates/de/html/guest/guest_doubler.tpl b/templates/de/html/guest/guest_doubler.tpl index b769c1f615..d6f9f371db 100644 --- a/templates/de/html/guest/guest_doubler.tpl +++ b/templates/de/html/guest/guest_doubler.tpl @@ -14,7 +14,7 @@
  • {--DOUBLER_USAGE_COUNTER--}
  • $content[payout_time]
  • {--DOUBLER_FULL_PAYOUT--}
    • -
  • {--DOUBLER_POINTS_1--} {%config,translateComma=doubler_charge%}% {--DOUBLER_POINTS_2--}
    • +
  • {--DOUBLER_POINTS_1--} {%config,translateComma=doubler_charge%}% {--DOUBLER_POINTS_2--}
  • {--DOUBLER_EXAMPLE_1--} 500 {?POINTS?} »» {--DOUBLER_EXAMPLE_2--} 1000 {?POINTS?}{--DOUBLER_EXAMPLE_3--}
  • {--DOUBLER_REFERAL_1--}
  • {--DOUBLER_REFERAL_2--}
    • diff --git a/templates/de/html/member/member_doubler.tpl b/templates/de/html/member/member_doubler.tpl index 2edfb852f7..875990e861 100644 --- a/templates/de/html/member/member_doubler.tpl +++ b/templates/de/html/member/member_doubler.tpl @@ -8,7 +8,7 @@
    - Tipp: Nutzen Sie diesen zum Werben unseres {?mt_word2?}, um die {%config,translateComma=doubler_ref%}% Referal-Vergütung zu erhalten! + Tipp: Nutzen Sie diesen zum Werben unseres {?mt_word2?}, um die {%config,translateComma=doubler_ref%}% Referal-Vergütung zu erhalten!
    {--MEMBER_DOUBLER_ALREADY_PAYOUT--}:
    @@ -33,7 +33,7 @@
  • {--DOUBLER_USAGE_COUNTER--}
  • $content[payout_time]
  • {--DOUBLER_FULL_PAYOUT--}
    • -
  • {--DOUBLER_POINTS_1--} {%config,translateComma=doubler_charge%}% {--DOUBLER_POINTS_2--}
    • +
  • {--DOUBLER_POINTS_1--} {%config,translateComma=doubler_charge%}% {--DOUBLER_POINTS_2--}
  • {--DOUBLER_EXAMPLE_1--} 500 {?POINTS?} »» {--DOUBLER_EXAMPLE_2--} 1000 {?POINTS?}{--DOUBLER_EXAMPLE_3--}
  • {--DOUBLER_REFERAL_1--}
  • {--DOUBLER_REFERAL_2--}
    • diff --git a/templates/de/html/member/member_holiday_form.tpl b/templates/de/html/member/member_holiday_form.tpl index 576e80a047..8fb2a07d15 100644 --- a/templates/de/html/member/member_holiday_form.tpl +++ b/templates/de/html/member/member_holiday_form.tpl @@ -20,7 +20,7 @@ - {%message,MEMBER_HOLIDAY_MAX_DAYS,{?holiday_max?}%} + {%message,MEMBER_HOLIDAY_MAX_DAYS,{?holiday_max?}%} diff --git a/templates/de/html/member/member_order_points.tpl b/templates/de/html/member/member_order_points.tpl index 01b50220f1..7d1fc9f9b8 100644 --- a/templates/de/html/member/member_order_points.tpl +++ b/templates/de/html/member/member_order_points.tpl @@ -3,7 +3,7 @@
    {--MEMBER_POINTS_LEFT--}: - $content[total] {?POINTS?} + {%pipe,translateComma=$content[total]%} {?POINTS?}
    diff --git a/templates/de/html/member/member_points_row.tpl b/templates/de/html/member/member_points_row.tpl index c75032a3f9..acd137b239 100644 --- a/templates/de/html/member/member_points_row.tpl +++ b/templates/de/html/member/member_points_row.tpl @@ -1,5 +1,5 @@ - $content[level] {--REFERAL_LEVEL--} ({%pipe,translateComma=$content[percents]%}%) + $content[level] {--REFERAL_LEVEL--} ({%pipe,translateComma=$content[percents]%}%) {%pipe,translateComma=$content[points]%} {?POINTS?} {%pipe,translateComma=$content[counter]%} diff --git a/templates/de/html/member/member_refback_list_row.tpl b/templates/de/html/member/member_refback_list_row.tpl index 1642da7154..d74239bea3 100644 --- a/templates/de/html/member/member_refback_list_row.tpl +++ b/templates/de/html/member/member_refback_list_row.tpl @@ -6,7 +6,7 @@ $content[level_refid] - {%pipe,translateComma=$content[refback]%}% + {%pipe,translateComma=$content[refback]%}% {%pipe,translateComma=$content[points]%} {?POINTS?} diff --git a/templates/de/html/member/member_refback_list_row_deleted.tpl b/templates/de/html/member/member_refback_list_row_deleted.tpl index b6c724862a..f0486436cf 100644 --- a/templates/de/html/member/member_refback_list_row_deleted.tpl +++ b/templates/de/html/member/member_refback_list_row_deleted.tpl @@ -6,7 +6,7 @@ $content[level_refid] - {%pipe,translateComma=$content[refback]%}% + {%pipe,translateComma=$content[refback]%}% {%pipe,translateComma=$content[points]%} {?POINTS?} diff --git a/templates/de/html/member/member_stats_row.tpl b/templates/de/html/member/member_stats_row.tpl index 1b1c557bec..671dcd19b3 100644 --- a/templates/de/html/member/member_stats_row.tpl +++ b/templates/de/html/member/member_stats_row.tpl @@ -39,6 +39,6 @@ {--MEMBER_EMAIL_PERCENT--}:
    - {%pipe,translateComma=$content[percents]%}% + {%pipe,translateComma=$content[percents]%}% diff --git a/templates/de/html/member/member_surfbar_start_dynamic.tpl b/templates/de/html/member/member_surfbar_start_dynamic.tpl index 2da45f7a96..5df1807086 100644 --- a/templates/de/html/member/member_surfbar_start_dynamic.tpl +++ b/templates/de/html/member/member_surfbar_start_dynamic.tpl @@ -29,7 +29,7 @@ {%pipe,getMemberId,SURFBAR_GET_TOTAL_USER_URLS,translateComma%} URLs werden als Berechnungsgrundlage verwendet. Sie erhalten allerdings nur einen reduzierten Anteil von - {%config,translateComma=surfbar_dynamic_percent%}%. + {%config,translateComma=surfbar_dynamic_percent%}%.
    diff --git a/templates/de/html/member/member_transfer_list.tpl b/templates/de/html/member/member_transfer_list.tpl index d8c78c442d..61f542b5ca 100644 --- a/templates/de/html/member/member_transfer_list.tpl +++ b/templates/de/html/member/member_transfer_list.tpl @@ -28,7 +28,7 @@ $content[balance] ({?POINTS?}):  - $content[total] + {%pipe,translateComma=$content[total]%} diff --git a/templates/de/html/member/member_transfer_row.tpl b/templates/de/html/member/member_transfer_row.tpl index 923faafc8a..c187488181 100644 --- a/templates/de/html/member/member_transfer_row.tpl +++ b/templates/de/html/member/member_transfer_row.tpl @@ -12,6 +12,6 @@
    $content[reason]
    -
    $content[points]
    +
    {%pipe,translateComma=$content[points]%}
    diff --git a/templates/de/html/member/member_wernis_mode_payout.tpl b/templates/de/html/member/member_wernis_mode_payout.tpl index ae7a706a15..6795fa1697 100644 --- a/templates/de/html/member/member_wernis_mode_payout.tpl +++ b/templates/de/html/member/member_wernis_mode_payout.tpl @@ -16,7 +16,7 @@ {--MEMBER_WERNIS_WDS66_ID--} - + {--MEMBER_WERNIS_WDS66_PASSWORD--} @@ -42,7 +42,7 @@
    Die Umrechnung von {?POINTS?} in Wernis enspricht derzeit {%config,translateComma=wernis_payout_factor%}:1. Das auszahlungsfähige {?POINTS?}-Guthaben ist entweder um eine - prozentuale Gebühr von {%config,translateComma=wernis_payout_fee_percent%}% + prozentuale Gebühr von {%config,translateComma=wernis_payout_fee_percent%}% oder um einen fixen Betrag von {%config,translateComma=wernis_payout_fee_fix%} {?POINTS?} bereits reduziert.
    diff --git a/templates/de/html/member/member_wernis_mode_withdraw.tpl b/templates/de/html/member/member_wernis_mode_withdraw.tpl index 11a816ec7e..8c911f4ed5 100644 --- a/templates/de/html/member/member_wernis_mode_withdraw.tpl +++ b/templates/de/html/member/member_wernis_mode_withdraw.tpl @@ -16,7 +16,7 @@ {--MEMBER_WERNIS_WDS66_ID--} - + {--MEMBER_WERNIS_WDS66_PASSWORD--} -- 2.39.5