X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flanguage-functions.php;h=0c7fb342757cee0cdc8e386dc622e6ba298fafd5;hb=2c46da5e9d74e87def9ce4db377f26920eb30b28;hp=5a7b9dacd9217a73cbccbe2f41e9bb686abec8e0;hpb=adbdf97c7222a8a024f3e8aa0d556b0dd4c30a03;p=mailer.git

diff --git a/inc/language-functions.php b/inc/language-functions.php
index 5a7b9dacd9..0c7fb34275 100644
--- a/inc/language-functions.php
+++ b/inc/language-functions.php
@@ -10,13 +10,8 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Sprachfunktionen                                 *
  * -------------------------------------------------------------------- *
- * $Revision::                                                        $ *
- * $Date::                                                            $ *
- * $Tag:: 0.2.1-FINAL                                                 $ *
- * $Author::                                                          $ *
- * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2016 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -51,7 +46,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 +163,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 +209,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 +217,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 +228,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 +240,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));
 	}
 }