Heacy rewrite/cleanup:

[mailer.git] / inc / language-functions.php

diff --git a/inc/language-functions.php b/inc/language-functions.php
index 249812c7102c781dfe4238dc6e6d2ed25fb4b71d..9566d60516a22ca37d57aee50cac5327281f1797 100644 (file)
--- a/inc/language-functions.php
+++ b/inc/language-functions.php
@@ -51,7 +51,7 @@ function getMessage ($messageId) {
                $return = $GLOBALS['messages'][getCurrentLanguage()][$messageId];
        } else {
                // Missing language constant
-               logDebugMessage(__FUNCTION__, __LINE__, sprintf("Missing message string %s detected.", $messageId));
+               logDebugMessage(__FUNCTION__, __LINE__, sprintf('Missing message string %s detected.', $messageId));
        }
 
        // Return the string
@@ -168,10 +168,10 @@ function isLanguageIncludeReadable ($ext_name = 'none') {
                // Generate filename
                if ($ext_name == 'none') {
                        // Generic
-                       $languageInclude = sprintf("inc/language/%s.php", getLanguage());
+                       $languageInclude = sprintf('inc/language/%s.php', getLanguage());
                } else {
                        // Extension's language file
-                       $languageInclude = sprintf("inc/language/%s_%s.php", $ext_name, getLanguage());
+                       $languageInclude = sprintf('inc/language/%s_%s.php', $ext_name, getLanguage());
                }
 
                // Look for file if no extension name is provided
@@ -214,7 +214,7 @@ function loadLanguageFile ($ext_name = 'none') {
                loadLanguageInclude($ext_name);
        } elseif ((isDebugModeEnabled()) && (isHtmlOutputMode()) && ($ext_name != 'sql_patches') && (substr($ext_name, 0, 10) != 'admintheme')) {
                // No language file is not so good...
-               logDebugMessage(__FUNCTION__, __LINE__, sprintf("NOTICE: Extension %s has no language file or we cannot read from it. lang=%s, mode=%s",
+               logDebugMessage(__FUNCTION__, __LINE__, sprintf('NOTICE: Extension %s has no language file or we cannot read from it. lang=%s, mode=%s',
                        $ext_name,
                        getLanguage(),
                        getExtensionMode()
@@ -222,7 +222,7 @@ function loadLanguageFile ($ext_name = 'none') {
        }
 
        // Check for installation mode
-       if ((isInstallationPhase()) || (!isAdminRegistered())) {
+       if ((isInstaller()) || (!isAdminRegistered())) {
                // Load language file
                loadLanguageInclude('install');
        } // END - if
@@ -233,10 +233,10 @@ function loadLanguageInclude ($ext_name = 'none') {
        // Generate filename
        if ($ext_name == 'none') {
                // Generic
-               $languageInclude = sprintf("inc/language/%s.php", getLanguage());
+               $languageInclude = sprintf('inc/language/%s.php', getLanguage());
        } else {
                // Extension's language file
-               $languageInclude = sprintf("inc/language/%s_%s.php", $ext_name, getLanguage());
+               $languageInclude = sprintf('inc/language/%s_%s.php', $ext_name, getLanguage());
        }
 
        // Check it before loading
@@ -245,7 +245,7 @@ function loadLanguageInclude ($ext_name = 'none') {
                loadIncludeOnce($languageInclude);
        } else {
                // Not readable!
-               logDebugMessage(__FUNCTION__, __LINE__, sprintf("Language file %s not found or readable.", $languageInclude));
+               logDebugMessage(__FUNCTION__, __LINE__, sprintf('Language file %s not found or readable.', $languageInclude));
        }
 }