From d5ee31ebfc85f22fc691b8c2753c42e188c1c4ef Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sun, 22 Feb 2009 21:39:07 +0000 Subject: [PATCH] More language constants rewritten ({--LANGUAGE--} is for constants) --- inc/extensions.php | 2 +- inc/extensions/ext-cache.php | 2 +- inc/extensions/ext-sql_patches.php | 4 +- inc/functions.php | 20 ++++---- inc/install-inc.php | 40 +++++++-------- inc/libs/payout_functions.php | 8 +-- inc/libs/surfbar_functions.php | 2 +- inc/libs/task_functions.php | 6 +-- inc/libs/user_functions.php | 2 +- inc/modules/admin.php | 4 +- inc/modules/admin/admin-inc.php | 2 +- inc/modules/admin/overview-inc.php | 18 +++---- inc/modules/admin/what-adminedit.php | 59 +++++++++-------------- inc/modules/admin/what-config_payouts.php | 4 +- inc/modules/admin/what-guestedit.php | 22 +++++---- inc/modules/admin/what-list_beg.php | 2 +- inc/modules/admin/what-list_bonus.php | 2 +- inc/modules/admin/what-list_cats.php | 4 +- inc/modules/admin/what-list_task.php | 19 +++----- inc/modules/admin/what-memedit.php | 7 +-- inc/modules/admin/what-theme_edit.php | 2 +- inc/modules/admin/what-theme_import.php | 4 +- inc/modules/admin/what-updates.php | 6 +-- inc/modules/chk_login.php | 8 +-- inc/modules/frametester.php | 2 +- inc/modules/guest/action-themes.php | 2 +- inc/modules/guest/what-register.php | 30 ++++++------ inc/modules/guest/what-stats.php | 8 +-- inc/modules/guest/what-top10.php | 4 +- inc/modules/member/action-themes.php | 2 +- inc/modules/member/what-newsletter.php | 36 ++++++-------- inc/modules/member/what-order.php | 28 +++++------ inc/mysql-connect.php | 8 +-- inc/mysql-manager.php | 14 +++--- inc/profile-updte.php | 2 +- 35 files changed, 183 insertions(+), 202 deletions(-) diff --git a/inc/extensions.php b/inc/extensions.php index bb8e8eefd1..b54e756123 100644 --- a/inc/extensions.php +++ b/inc/extensions.php @@ -651,7 +651,7 @@ function EXT_VERSION_IS_OLDER ($ext_name, $ext_ver) { // Creates a new task for updated extension function CREATE_EXTENSION_UPDATE_TASK ($admin_id, $ext_name, $ext_ver, $notes) { // Create subject line - $subject = "[UPDATE-".$ext_name."-".$ext_ver.":] {!ADMIN_UPDATE_EXT_SUBJ!}"; + $subject = "[UPDATE-".$ext_name."-".$ext_ver.":] {--ADMIN_UPDATE_EXT_SUBJ--}"; // Is the extension there? if (GET_EXT_VERSION($ext_name) != "") { diff --git a/inc/extensions/ext-cache.php b/inc/extensions/ext-cache.php index 3a7f56e5b1..1ae1bc7d38 100644 --- a/inc/extensions/ext-cache.php +++ b/inc/extensions/ext-cache.php @@ -154,7 +154,7 @@ case "update": // Update an extension case "0.1.2": // SQL queries for v0.1.2 // Update notes (these will be set as task text!) - $UPDATE_NOTES = "Die Tabelen {!MYSQL_PREFIX!}_config, {!MYSQL_PREFIX!}_refsystem, {!MYSQL_PREFIX!}_refdepths und {!MYSQL_PREFIX!}_mod_reg werden nun auch ausgelagert."; + $UPDATE_NOTES = "Die Tabelen {!_MYSQL_PREFIX!}_config, {!_MYSQL_PREFIX!}_refsystem, {!_MYSQL_PREFIX!}_refdepths und {!_MYSQL_PREFIX!}_mod_reg werden nun auch ausgelagert."; break; case "0.1.3": // SQL queries for v0.1.3 diff --git a/inc/extensions/ext-sql_patches.php b/inc/extensions/ext-sql_patches.php index 80a91853bf..a64088ad08 100644 --- a/inc/extensions/ext-sql_patches.php +++ b/inc/extensions/ext-sql_patches.php @@ -149,7 +149,7 @@ case "update": // Update an extension $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` CHANGE auto_purge auto_purge BIGINT(20) UNSIGNED NOT NULL DEFAULT ".(getConfig('one_day')*14).""; // Update notes (these will be set as task text!) - $UPDATE_NOTES = "In der Tabelle {!MYSQL_PREFIX!}_config musste die Spalte auto_purge (autom. Löschen von Bestätigungsmails angepasst werden (war auf dem Testsystem auf TINYINT(4) gesetzt.)"; + $UPDATE_NOTES = "In der Tabelle {!_MYSQL_PREFIX!}_config musste die Spalte auto_purge (autom. Löschen von Bestätigungsmails angepasst werden (war auf dem Testsystem auf TINYINT(4) gesetzt.)"; break; case "0.0.3": // SQL queries for v0.0.3 @@ -242,7 +242,7 @@ case "update": // Update an extension $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_extensions` DROP ext_has_admin"; // Update notes (these will be set as task text!) - $UPDATE_NOTES = "Spalte ext_has_admin aus der Tabelle {!MYSQL_PREFIX!}_extensions entfernt, da sie keinen Sinn mehr macht."; + $UPDATE_NOTES = "Spalte ext_has_admin aus der Tabelle {!_MYSQL_PREFIX!}_extensions entfernt, da sie keinen Sinn mehr macht."; break; case "0.1.6": // SQL queries for v0.1.6 diff --git a/inc/functions.php b/inc/functions.php index 74cef54935..9a7bd4b484 100644 --- a/inc/functions.php +++ b/inc/functions.php @@ -98,7 +98,7 @@ function OUTPUT_HTML ($HTML, $newLine = true) { default: // Huh, something goes wrong or maybe you have edited config.php ??? DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Invalid renderer %s detected.", constant('OUTPUT_MODE'))); - mxchange_die("{!FATAL_ERROR!}: {!LANG_NO_RENDER_DIRECT!}"); + mxchange_die("{--FATAL_ERROR--}: {--LANG_NO_RENDER_DIRECT--}"); break; } } elseif ((constant('_OB_CACHING') == "on") && ($footer == 1)) { @@ -857,10 +857,10 @@ function LOAD_EMAIL_TEMPLATE($template, $content=array(), $UID="0") { @eval($tmpl_file); } elseif (!empty($template)) { // Template file not found! - $newContent = "{!TEMPLATE_404!}: ".$template."
-{!TEMPLATE_CONTENT!} + $newContent = "{--TEMPLATE_404--}: ".$template."
+{--TEMPLATE_CONTENT--} 
".print_r($content, true)."
-{!TEMPLATE_DATA!} +{--TEMPLATE_DATA--} 
".print_r($DATA, true)."


"; @@ -1197,9 +1197,9 @@ function ADD_SELECTION($type, $DEFAULT, $prefix="", $id="0") { case "yn": $OUT .= "