From 78d3ca2c21277839c7902c84767bd769c4dfca31 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Thu, 22 Jul 2010 12:24:48 +0000 Subject: [PATCH] More language strings renamed (better naming convention) --- .gitattributes | 1 + DOCS/TODOs.txt | 6 +- inc/language/de.php | 16 ++---- inc/language/mods_de.php | 2 +- inc/language/update_de.php | 56 +++++++++++++++++++ inc/modules/guest/what-mediadata.php | 10 ++-- inc/pool/pool-user.php | 2 +- .../de/html/admin/admin_list_refbanner.tpl | 6 +- templates/de/html/mediadata.tpl | 38 ++++++------- templates/de/html/member/member_points.tpl | 2 +- .../de/html/member/member_reflinks_row.tpl | 4 +- .../html/member/member_unconfirmed_table.tpl | 2 +- 12 files changed, 97 insertions(+), 48 deletions(-) create mode 100644 inc/language/update_de.php diff --git a/.gitattributes b/.gitattributes index 4df353b271..5f9de8ded5 100644 --- a/.gitattributes +++ b/.gitattributes @@ -267,6 +267,7 @@ inc/language/theme_de.php -text svneol=unset#text/plain inc/language/timezone_de.php -text svneol=unset#text/plain inc/language/top10_de.php -text svneol=unset#text/plain inc/language/transfer_de.php -text svneol=unset#text/plain +inc/language/update_de.php svneol=native#text/plain inc/language/usage_de.php -text svneol=unset#text/plain inc/language/user_de.php -text svneol=unset#text/plain inc/language/validator_de.php -text svneol=unset#text/plain diff --git a/DOCS/TODOs.txt b/DOCS/TODOs.txt index 3290830a29..02d154db50 100644 --- a/DOCS/TODOs.txt +++ b/DOCS/TODOs.txt @@ -49,10 +49,10 @@ ./inc/functions.php:2251: // @TODO This is still very static, rewrite it somehow ./inc/gen_sql_patches.php:96:// @TODO Rewrite this to a filter ./inc/install-functions.php:59: // @TODO DEACTIVATED: changeDataInFile(getCachePath() . 'config-local.php', 'OUTPUT-MODE', "setConfigEntry('OUTPUT_MODE', '", "');", postRequestParameter('omode'), 0); -./inc/language/de.php:1127:// @TODO Rewrite these two constants -./inc/language/de.php:1142:// @TODO Rewrite these three constants +./inc/language/de.php:1119:// @TODO Rewrite these two constants +./inc/language/de.php:1134:// @TODO Rewrite these three constants ./inc/language/de.php:301: // @TODO Following two are unused? -./inc/language/de.php:819:// @TODO Are these constants longer used? +./inc/language/de.php:811:// @TODO Are these constants longer used? ./inc/language-functions.php:234: // @TODO These are all valid languages, again hard-coded ./inc/language-functions.php:46:// @TODO Rewrite all language constants to this function. ./inc/language/rallye_de.php:13: * @TODO Naming convention not applied for language strings * diff --git a/inc/language/de.php b/inc/language/de.php index 090e8ec296..151fc87405 100644 --- a/inc/language/de.php +++ b/inc/language/de.php @@ -371,8 +371,9 @@ addMessages(array( 'VIEWS' => "Views", 'REFERAL_URL' => "Banner", 'REFERAL_TITLE' => "Alternativer Text", - 'REFERAL_CNTR' => "Views", - 'REFERAL_VIS' => "Aktiv?", + 'REFERAL_CLICKS_SHORT' => "Klicks", + 'REFERAL_VIEWS' => "Views", + 'REFERAL_IS_ACTIVE' => "Aktiv?", 'POINTS_USED' => "Verbrauchte {?POINTS?}", 'MEMBER_NO_POINTS' => "Sie haben keine {?POINTS?} mehr zum Versenden übrig.", 'MEMBER_NO_PAYMENTS' => "Der Admin diesen {?mt_word?} hat noch keine Mailarten definiert.", @@ -599,14 +600,7 @@ addMessages(array( 'ADMIN_CHANGE_PAYMENT' => "Mailvergütungen ändern", 'ADMIN_REMOVE_PAYMENT' => "Mailvergütungen löschen", 'REFERALS' => "Referals", - 'POINTS_SUM' => "Gesamtsumme", - 'ADMIN_NEW_VERSION_AVAILABLE' => "Neue Version verfügbar.", - 'ADMIN_YOUR_VERSION_IS' => "Installierte Version", - 'ADMIN_ONLINE_VERSION_IS' => "Verfügbare Version", - 'ADMIN_UPDATE_CREATE_TIME' => "Update wurde erstellt", - 'ADMIN_DOWNLOAD_NEW_VERSION' => "Jetzt neue Version herunterladen.", - 'ADMIN_NO_UPDATES_AVAILABLE' => "Keine neuen Updates verfügbar.", - 'ADMIN_NEW_PATCHES_AVAILABLE' => "Neue Entwickler-Patches verfügbar.", + 'MEMBER_TOTAL_POINTS' => "Gesamtsumme", 'KBYTES' => "KBytes", 'DEFAULT_SUBJECT_LINE' => "Klick-Mail von {?MAIN_TITLE?}", 'MEBER_UPDATE_PWD_WRONG' => "Sie haben das falsche Passwort eingegeben! Bitte nochmal versuchen.", @@ -623,8 +617,6 @@ addMessages(array( 'TODAY' => "Heute", 'MEMBER_PROFILE_LOCKED' => "Sie können Ihren Account erst am %s wieder ändern.", 'MEMBER_HAS_ZERO_MMAILS' => "Sie haben Ihren Empfang auf Urlaub stehen! Bitte stellen Sie unter "Profildaten ändern" den Empfang höher ein.", - 'REFERAL_CLIX' => "Clicks", - 'REFERAL_VIEWS' => "Views", 'REFBANNER_TOTALS' => "Gesamt", 'DAYS' => "Tage", 'USER_NOW_ONLINE' => "User Online", diff --git a/inc/language/mods_de.php b/inc/language/mods_de.php index 8c689875a6..df35214083 100644 --- a/inc/language/mods_de.php +++ b/inc/language/mods_de.php @@ -50,7 +50,7 @@ addMessages(array( 'ADMIN_MODS_IS_HIDDEN' => "Verdeckt", 'ADMIN_MODS_IS_ADMIN' => "Nur Admin", 'ADMIN_MODS_IS_MEMBER' => "Nur Mitglied", - 'ADMIN_MODS_CLICKS' => "Klicks", + 'ADMIN_MODS_CLICKS' => "Modulklicks", 'ADMIN_MODS_EDIT' => "Module ändern", 'ADMIN_MODS_EDIT_NOTE' => "Klicken Sie auf den Modulnamen, um Statistiken zu den verknüpften Menüpunkten zu erhalten.", 'ADMIN_MODS_NOTHING_SELECTED' => "Bitte mindestens ein Modul auswählen.", diff --git a/inc/language/update_de.php b/inc/language/update_de.php new file mode 100644 index 0000000000..2912792f07 --- /dev/null +++ b/inc/language/update_de.php @@ -0,0 +1,56 @@ + "Neue Version verfügbar.", + 'ADMIN_YOUR_VERSION_IS' => "Installierte Version", + 'ADMIN_ONLINE_VERSION_IS' => "Verfügbare Version", + 'ADMIN_UPDATE_CREATE_TIME' => "Update wurde erstellt", + 'ADMIN_DOWNLOAD_NEW_VERSION' => "Jetzt neue Version herunterladen.", + 'ADMIN_CANNOT_CHECK_VERSION' => "Konnte Versionsnummer nicht abgleichen! (Fehlende Internet-Verbindung? Server ist down?)", +)); + +// [EOF] +?> diff --git a/inc/modules/guest/what-mediadata.php b/inc/modules/guest/what-mediadata.php index 733327beeb..7cbfc56f2f 100644 --- a/inc/modules/guest/what-mediadata.php +++ b/inc/modules/guest/what-mediadata.php @@ -126,7 +126,7 @@ $content['user_links'] = abs($sent - $clicks); $clr = '0.00000'; if ($sent > 0) $clr = $clicks / $sent * 100; -$content['_clr'] = translateComma($clr) . '%'; +$content['_clr'] = $clr; // Load jackpot $jackpot = '0'; @@ -150,7 +150,7 @@ if (empty($points)) $points = '0'; if (empty($ref)) $ref = '0'; if (empty($logins)) $logins = '0'; -$content['total_points'] = translateComma($points); +$content['total_points'] = $points; $content['total_refclicks'] = $ref; $content['total_logins'] = $logins; @@ -188,7 +188,7 @@ if (isExtensionActive('beg')) { 'value' => countSumTotalData('0', 'user_data', 'beg_clicks', 'userid', false, ' AND `beg_clicks` > 0') ); $OUT_EXTRA .= loadTemplate('mediadata_extra_row', true, $data); -} +} // END - if if (isExtensionActive('doubler')) { // Add header @@ -217,7 +217,7 @@ if (isExtensionActive('doubler')) { 'value' => countSumTotalData('N','doubler','id','completed', false, ' AND `points` > 0') ); $OUT_SPECIAL .= loadTemplate('mediadata_extra_row', true, $data); -} +} // END - if if (isExtensionActive('holiday')) { // Total holiday requests @@ -240,7 +240,7 @@ WHERE 'value' => $holiday ); $OUT_USER .= loadTemplate('mediadata_extra_row', true, $data); -} +} // END - if if (isExtensionActive('transfer')) { // Statistics for points transfers diff --git a/inc/pool/pool-user.php b/inc/pool/pool-user.php index b9fffa4cf1..10d1780fea 100644 --- a/inc/pool/pool-user.php +++ b/inc/pool/pool-user.php @@ -40,7 +40,7 @@ // Some security stuff... if (!defined('__SECURITY')) { die(); -} +} // END - if // Don't run on daily reset if (isResetModeEnabled()) { diff --git a/templates/de/html/admin/admin_list_refbanner.tpl b/templates/de/html/admin/admin_list_refbanner.tpl index 2bd25976cd..91743a68f8 100644 --- a/templates/de/html/admin/admin_list_refbanner.tpl +++ b/templates/de/html/admin/admin_list_refbanner.tpl @@ -10,9 +10,9 @@ {--ID_SELECT--} {--REFERAL_URL--}: {--REFERAL_TITLE--}: - {--REFERAL_CNTR--}: - {--REFERAL_CLIX--} - {--REFERAL_VIS--}: + {--REFERAL_VIEWS--}: + {--REFERAL_CLICKS_SHORT--} + {--REFERAL_IS_ACTIVE--}: $content diff --git a/templates/de/html/mediadata.tpl b/templates/de/html/mediadata.tpl index b32f52f9ea..32775fcabf 100644 --- a/templates/de/html/mediadata.tpl +++ b/templates/de/html/mediadata.tpl @@ -17,27 +17,27 @@ {--USERS_TOTAL--}: - $content[user_count] + {%pipe,translateComma=$content[user_count]%} {--USERS_CONFIRMED--}: - $content[user_confirmed] + {%pipe,translateComma=$content[user_confirmed]%} {--USERS_UNCONFIRMED--}: - $content[user_unconfirmed] + {%pipe,translateComma=$content[user_unconfirmed]%} {--USERS_LOCKED--}: - $content[user_locked] + {%pipe,translateComma=$content[user_locked]%} {--USERS_MAX_MAILS--}: - $content[user_max_mails] + {%pipe,translateComma=$content[user_max_mails]%} {--USERS_REC_PER_DAY--}: - $content[user_max_rec] + {%pipe,translateComma=$content[user_max_rec]%} $content[out_user] @@ -45,38 +45,38 @@ {--USERS_STATS--}: - $content[user_stats] + {%pipe,translateComma=$content[user_stats]%} {--USERS_MAX_PER_DAY--}: - $content[max] + {%pipe,translateComma=$content[max]%} {--USERS_MAX_REC--}: - $content[rec] + {%pipe,translateComma=$content[rec]%} {--USERS_SENT_MAILS--}: - $content[sent] + {%pipe,translateComma=$content[sent]%} {--USERS_LINKS--}: - $content[user_links] + {%pipe,translateComma=$content[user_links]%} {--CLICK_RATE--}: - $content[_clr] + {%pipe,translateComma=$content[_clr]%} {--MEDIA_DATA_POINTS--} {--JACKPOT_POINTS--}: - $content[jackpot] + {%pipe,translateComma=$content[jackpot]%} {--TOTAL_POINTS--}: - $content[total_points] + {%pipe,translateComma=$content[total_points]%} $content[out_points] @@ -84,26 +84,26 @@ {--TOTAL_REFERAL_BANNER--}: - $content[ref_total] + {%pipe,translateComma=$content[ref_total]%} {--TOTAL_REFERAL_VIEWS--}: - $content[ref_views] + {%pipe,translateComma=$content[ref_views]%} {--TOTAL_REFERAL_CLICKS--}: - $content[ref_clicks] + {%pipe,translateComma=$content[ref_clicks]%} {--MEDIA_DATA_MISC--} {--TOTAL_REFCLICKS--}: - $content[total_refclicks] + {%pipe,translateComma=$content[total_refclicks]%} {--TOTAL_LOGINS--}: - $content[total_logins] + {%pipe,translateComma=$content[total_logins]%} $content[out_extra] $content[out_special] diff --git a/templates/de/html/member/member_points.tpl b/templates/de/html/member/member_points.tpl index 83b064d4f1..d435034821 100644 --- a/templates/de/html/member/member_points.tpl +++ b/templates/de/html/member/member_points.tpl @@ -12,7 +12,7 @@   - {--POINTS_SUM--} + {--MEMBER_TOTAL_POINTS--} {%pipe,translateComma=$content[total_points]%} {?POINTS?} diff --git a/templates/de/html/member/member_reflinks_row.tpl b/templates/de/html/member/member_reflinks_row.tpl index f01295feb1..1b6d098065 100644 --- a/templates/de/html/member/member_reflinks_row.tpl +++ b/templates/de/html/member/member_reflinks_row.tpl @@ -4,8 +4,8 @@ $content[alternate]
{--REFBANNER_TOTALS--}: - $content[counter] {--REFERAL_VIEWS--} / - $content[clicks] {--REFERAL_CLIX--} + $content[counter] {--REFERAL_VIEWS--} / + $content[clicks] {--REFERAL_CLICKS--}
diff --git a/templates/de/html/member/member_unconfirmed_table.tpl b/templates/de/html/member/member_unconfirmed_table.tpl index 77af034249..4ff1367da5 100644 --- a/templates/de/html/member/member_unconfirmed_table.tpl +++ b/templates/de/html/member/member_unconfirmed_table.tpl @@ -9,7 +9,7 @@ $content[rows] - {--POINTS_SUM--}: + {--MEMBER_TOTAL_POINTS--}: {%pipe,translateComma=$content[total_points]%} {?POINTS?} -- 2.39.5