From 8ece7fd45c386f7ccd60f9c4800ad207602b0240 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Fri, 20 Feb 2009 00:22:09 +0000 Subject: [PATCH] More language constants rewritten --- inc/libs/user_functions.php | 2 +- inc/modules/admin/admin-inc.php | 2 +- inc/modules/admin/overview-inc.php | 18 +++++++++--------- inc/modules/admin/what-config_payouts.php | 4 ++-- inc/modules/admin/what-theme_edit.php | 2 +- inc/modules/admin/what-updates.php | 2 +- inc/modules/frametester.php | 2 +- inc/modules/guest/action-themes.php | 2 +- inc/modules/guest/what-stats.php | 6 +++--- inc/modules/member/action-themes.php | 2 +- inc/modules/member/what-newsletter.php | 2 +- inc/mysql-manager.php | 8 ++++---- modules.php | 4 ++-- 13 files changed, 28 insertions(+), 28 deletions(-) diff --git a/inc/libs/user_functions.php b/inc/libs/user_functions.php index 03fbfae67b..e5ecb1b7a8 100644 --- a/inc/libs/user_functions.php +++ b/inc/libs/user_functions.php @@ -448,7 +448,7 @@ function USER_DO_NEW_PASSWORD ($email, $uid) { } } else { // ID or email is wrong - LOAD_TEMPLATE("admin_settings_saved", false, "".GUEST_WRONG_ID_EMAIL.""); + LOAD_TEMPLATE("admin_settings_saved", false, "{!GUEST_WRONG_ID_EMAIL!}"); } // Return the error code diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php index f729b1da8f..fa49f1f28e 100644 --- a/inc/modules/admin/admin-inc.php +++ b/inc/modules/admin/admin-inc.php @@ -778,7 +778,7 @@ function ADMIN_USER_PROFILE_LINK ($uid, $title="", $wht="list_user") { //* DEBUG: */ echo "a:".$title."
"; // Return link - return "".$title.""; + return "".$title.""; } // Check "logical-area-mode" diff --git a/inc/modules/admin/overview-inc.php b/inc/modules/admin/overview-inc.php index e87f4d5606..301f3bc35f 100644 --- a/inc/modules/admin/overview-inc.php +++ b/inc/modules/admin/overview-inc.php @@ -141,7 +141,7 @@ function OUTPUT_SELECTED_TASKS ($POST, $result_tasks) { if ($type == "SUPPORT_MEMBER") { $mode = substr($text, 0, strpos($text, ":")); $text = substr($text, strpos($text, ":") + 1); - $ADD = "
  • ".ADMIN_TASK_SUPPORT_MODE.": ".$mode."
    • "; + $ADD = "
  • {!ADMIN_TASK_SUPPORT_MODE!}: ".$mode."
    • "; } // END - if if ($uid > 0) { @@ -150,7 +150,7 @@ function OUTPUT_SELECTED_TASKS ($POST, $result_tasks) { if (SQL_NUMROWS($result_user) == 1) { list($gender, $sname, $fname, $email) = SQL_FETCHROW($result_user); SQL_FREERESULT($result_user); - $ADD = "
  • ".ADMIN_MEMBER_UID.": ".ADMIN_USER_PROFILE_LINK($uid)." (".TRANSLATE_GENDER($gender)." ".$sname." ".$fname.")
    • "; + $ADD = "
  • {!ADMIN_MEMBER_UID!}: ".ADMIN_USER_PROFILE_LINK($uid)." (".TRANSLATE_GENDER($gender)." ".$sname." ".$fname.")
    • "; } // END - if } // END - if @@ -241,7 +241,7 @@ function OUTPUT_SELECTED_TASKS ($POST, $result_tasks) { )); } else { // Task is closed so nothing is todo - $OUT .= "
    ".ADMIN_EXT_ALREADY_REGISTERED."
    \n"; + $OUT .= "
    {!ADMIN_EXT_ALREADY_REGISTERED!}
    \n"; // Close task but not already closes or deleted or update tasks if (($status != "CLOSED") && ($status != "DELETED") && ($type != "EXTENSION_UPDATE")) { @@ -253,7 +253,7 @@ function OUTPUT_SELECTED_TASKS ($POST, $result_tasks) { case "EXTENSION_UPDATE": // Extension update // Extension updates are installed automatically - $OUT .= "
    ".ADMIN_EXTENSION_UPDATED."
    \n"; + $OUT .= "
    {!ADMIN_EXTENSION_UPDATED!}
    \n"; // Close task if (($status != "CLOSED") && ($status != "DELETED")) { @@ -293,7 +293,7 @@ function OUTPUT_SELECTED_TASKS ($POST, $result_tasks) { } } else { // Extension is not installed - $OUT .= "
    ".ADMIN_PAYOUT_NOT_INSTALLED."
    \n"; + $OUT .= "
    {!ADMIN_PAYOUT_NOT_INSTALLED!}
    \n"; } break; @@ -314,11 +314,11 @@ function OUTPUT_SELECTED_TASKS ($POST, $result_tasks) { $OUT .= LOAD_TEMPLATE("admin_wernis_overview_form", true, $content); } else { // Problem obtaining wernis ID - $OUT .= "
    ".WERNIS_OBTAIN_ID_FAILED."
    \n"; + $OUT .= "
    {!WERNIS_OBTAIN_ID_FAILED!}
    \n"; } } else { // Extension is not installed - $OUT .= "
    ".ADMIN_WERNIS_NOT_INSTALLED."
    \n"; + $OUT .= "
    {!ADMIN_WERNIS_NOT_INSTALLED!}
    \n"; } break; @@ -389,7 +389,7 @@ function OUTPUT_SELECTED_TASKS ($POST, $result_tasks) { $infos = "---"; if ($admin == "0") { // No admin currently is assigned - $admin = "
    ".ADMIN_NO_ADMIN_ASSIGNED."
    "; + $admin = "
    {!ADMIN_NO_ADMIN_ASSIGNED!}
    "; } else { // Load admin's data $login = GET_ADMIN_LOGIN($admin); @@ -419,7 +419,7 @@ function OUTPUT_SELECTED_TASKS ($POST, $result_tasks) { // Member found otherwise it's a system task $uid = ADMIN_USER_PROFILE_LINK($uid); } else { - $uid = "".ADMIN_IS_SYSTEM_TASK.""; + $uid = "{!ADMIN_IS_SYSTEM_TASK!}"; } // Prepare content diff --git a/inc/modules/admin/what-config_payouts.php b/inc/modules/admin/what-config_payouts.php index 598eb8cf5e..8008970116 100644 --- a/inc/modules/admin/what-config_payouts.php +++ b/inc/modules/admin/what-config_payouts.php @@ -69,7 +69,7 @@ VALUES ('%s', %d, %d,'%s','%s','%s','%s','%s','%s','%s')", SQL_FREERESULT($result); // Does already exist - $msg = "
    ".ADMIN_PAYOUT_TYPE_ALREADY."
    "; + $msg = "
    {!ADMIN_PAYOUT_TYPE_ALREADY!}
    "; } } @@ -212,7 +212,7 @@ if ((SQL_NUMROWS($result_type) > 0) && ($display)) { // Does your members request payouts? if ((SQL_NUMROWS($result_mem) > 0) && ($display)) { // Members has requested payouts - LOAD_TEMPLATE("admin_settings_saved", false, "".ADMIN_PAYOUT_LIST_REQUESTS."

    "); + LOAD_TEMPLATE("admin_settings_saved", false, "{!ADMIN_PAYOUT_LIST_REQUESTS!}

    "); } elseif ($display) { // No member requests so far LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_PAYOUT_NO_MEMBER_REQUESTS')); diff --git a/inc/modules/admin/what-theme_edit.php b/inc/modules/admin/what-theme_edit.php index 806610456c..47d341b66f 100644 --- a/inc/modules/admin/what-theme_edit.php +++ b/inc/modules/admin/what-theme_edit.php @@ -111,7 +111,7 @@ if (SQL_NUMROWS($result) > 0) { // Is the loaded theme name != current theme name? $LINK = $unix; - if ($unix != GET_CURR_THEME()) $LINK = "".$unix.""; + if ($unix != GET_CURR_THEME()) $LINK = "".$unix.""; // Prepare data for the row template $content = array( diff --git a/inc/modules/admin/what-updates.php b/inc/modules/admin/what-updates.php index 94306fe016..743de75788 100644 --- a/inc/modules/admin/what-updates.php +++ b/inc/modules/admin/what-updates.php @@ -123,7 +123,7 @@ if (empty($response[0]) && empty($response[1]) && empty($response[2]) && empty($ // Is a newer version available? if (empty($ONLINE['version'])) { // Disconnected? - LOAD_TEMPLATE("admin_settings_saved", false, "
    ".ADMIN_CANNOT_CHECK_VERSION." (".$ONLINE['code'].")
    "); + LOAD_TEMPLATE("admin_settings_saved", false, "
    {!ADMIN_CANNOT_CHECK_VERSION!} (".$ONLINE['code'].")
    "); } elseif (($ONLINE['version'] != FULL_VERSION) || ($ONLINE['revision'] != CURR_SVN_REVISION)) { // New full-version available (all previous released patches are included in this version!) define('__ONLINE_VERSION', $ONLINE['version']); diff --git a/inc/modules/frametester.php b/inc/modules/frametester.php index 9a0dd6c95f..55bd891a67 100644 --- a/inc/modules/frametester.php +++ b/inc/modules/frametester.php @@ -102,7 +102,7 @@ if ((!empty($_POST['url'])) || (!empty($_GET['url'])) || (!empty($_GET['frame']) break; case "test_top": - LOAD_TEMPLATE("admin_settings_saved", false, "
    ".GUEST_FRAMETESTER_TOP.""); + LOAD_TEMPLATE("admin_settings_saved", false, "
    {!GUEST_FRAMETESTER_TOP!}"); break; case "back": // Back buttom diff --git a/inc/modules/guest/action-themes.php b/inc/modules/guest/action-themes.php index 096a60bc6a..ae572fe30a 100644 --- a/inc/modules/guest/action-themes.php +++ b/inc/modules/guest/action-themes.php @@ -60,7 +60,7 @@ if ($num_themes > 1) { $OUT = LOAD_TEMPLATE("theme_one", true); } elseif (IS_ADMIN()) { // If there is no theme installed and there's an admin notify him! - $OUT = LOAD_TEMPLATE("admin_settings_saved", true, "
    ".ADMIN_NO_THEME_INSTALLED_WARNING."
    "); + $OUT = LOAD_TEMPLATE("admin_settings_saved", true, "
    {!ADMIN_NO_THEME_INSTALLED_WARNING!}
    "); } // Remember diff --git a/inc/modules/guest/what-stats.php b/inc/modules/guest/what-stats.php index 08bcfcf699..495e4e0ff7 100644 --- a/inc/modules/guest/what-stats.php +++ b/inc/modules/guest/what-stats.php @@ -177,7 +177,7 @@ case "MODULES": // TOP10 module clicks if (SQL_NUMROWS($guest_t10) > 0) { // Guest clicks OUTPUT_HTML(" - ".GUEST_TOP_GUEST_STATS." + {!GUEST_TOP_GUEST_STATS!} "); $SW = 2; while (list($clicks, $title) = SQL_FETCHROW($guest_t10)) { @@ -192,7 +192,7 @@ case "MODULES": // TOP10 module clicks if (SQL_NUMROWS($guest_t10) > 0) { // Guest clicks OUTPUT_HTML(" - ".GUEST_TOP_MEMBER_STATS." + {!GUEST_TOP_MEMBER_STATS!} "); $SW = 2; while (list($clicks, $title) = SQL_FETCHROW($mem_t10)) { @@ -214,7 +214,7 @@ case "MODULES": // TOP10 module clicks break; case "INACTIVE": // Deactivated stats - LOAD_TEMPLATE("admin_settings_saved", false, "".GUEST_STATS_DEACTIVATED.""); + LOAD_TEMPLATE("admin_settings_saved", false, "{!GUEST_STATS_DEACTIVATED!}"); break; } diff --git a/inc/modules/member/action-themes.php b/inc/modules/member/action-themes.php index 4c2dcb6b92..db2fbf5830 100644 --- a/inc/modules/member/action-themes.php +++ b/inc/modules/member/action-themes.php @@ -63,7 +63,7 @@ if ($num_themes > 1) { $OUT = LOAD_TEMPLATE("theme_one", true); } elseif (IS_ADMIN()) { // If there is no theme installed and there's an admin notify him! - $OUT = LOAD_TEMPLATE("admin_settings_saved", true, "
    ".ADMIN_NO_THEME_INSTALLED_WARNING."
    "); + $OUT = LOAD_TEMPLATE("admin_settings_saved", true, "
    {!ADMIN_NO_THEME_INSTALLED_WARNING!}
    "); } // Remember diff --git a/inc/modules/member/what-newsletter.php b/inc/modules/member/what-newsletter.php index 1b31672422..2e5f885cad 100644 --- a/inc/modules/member/what-newsletter.php +++ b/inc/modules/member/what-newsletter.php @@ -65,7 +65,7 @@ if ((isset($_POST['ok'])) && ($status == "Y") && ($span == "0")) // Add task SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_task_system` (assigned_admin, status, task_type, subject, text, task_created, userid) -VALUES ('0','NEW','NL_UNSUBSCRIBE','".ADMIN_NL_SUBJECT."','".$admin_msg."', UNIX_TIMESTAMP(),'%s')", array($GLOBALS['userid']), __FILE__, __LINE__); +VALUES ('0','NEW','NL_UNSUBSCRIBE','{!ADMIN_NL_SUBJECT!}','".$admin_msg."', UNIX_TIMESTAMP(),'%s')", array($GLOBALS['userid']), __FILE__, __LINE__); // Send mail to member $msg = LOAD_EMAIL_TEMPLATE("member_newsletter_request", array(), $GLOBALS['userid']); diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php index 0c85a3f765..1539e82f8a 100644 --- a/inc/mysql-manager.php +++ b/inc/mysql-manager.php @@ -812,15 +812,15 @@ function SEND_MODE_MAILS($mod, $modes) { } // END - switch } else { // Could not load profile data - $content = "".MEMBER_CANNOT_LOAD_PROFILE.""; + $content = "{!MEMBER_CANNOT_LOAD_PROFILE!}"; } } else { // Passwords mismatch - $content = "".MEMBER_PASSWORD_ERROR.""; + $content = "{!MEMBER_PASSWORD_ERROR!}"; } } else { // Could not load profile - $content = "".MEMBER_CANNOT_LOAD_PROFILE.""; + $content = "{!MEMBER_CANNOT_LOAD_PROFILE!}"; } // Send email to user if required @@ -1835,7 +1835,7 @@ WHERE userid=%s AND `status`='CONFIRMED' AND receive_mails > 0".PREPARE_SQL_HTML } } else { // No cateogries are defined yet - $OUT = "\n"; + $OUT = "\n"; } // Return HTML code diff --git a/modules.php b/modules.php index f1b619b29e..c862671e53 100644 --- a/modules.php +++ b/modules.php @@ -70,11 +70,11 @@ if (IS_MEMBER()) { // Additionally admin? if (IS_ADMIN()) { // Add it - $username .= " ("._ADMIN_SHORT.")"; + $username .= " ({!_ADMIN_SHORT!})"; } // END - if } else { // Hmmm, logged in and no valid userid? - $username = ""._UNKNOWN.""; + $username = "{!_UNKNOWN!}"; // Destroy session destroy_user_session(); -- 2.39.5