X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Flang%2Flanguage.php;h=62866f0b0279564036e144e42a07576351652d18;hb=2e181b13aa722a43e78b897404912d6b13a0a937;hp=72a0b3e4e8fd47a2795575086d06c411d46ff7f4;hpb=f12dbe7523bb1abc6cd69b009ef8f0be838f5348;p=fa-stable.git

diff --git a/includes/lang/language.php b/includes/lang/language.php
index 72a0b3e4..62866f0b 100644
--- a/includes/lang/language.php
+++ b/includes/lang/language.php
@@ -1,7 +1,16 @@
 <?php
-
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+	Released under the terms of the GNU General Public License, GPL, 
+	as published by the Free Software Foundation, either version 3 
+	of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
+***********************************************************************/
 if (!isset($path_to_root) || isset($_GET['path_to_root']) || isset($_POST['path_to_root']))
-	die("Restricted access");
+	die(_("Restricted access"));
 include_once($path_to_root . "/lang/installed_languages.inc");
 include_once($path_to_root . "/includes/lang/gettext.php");
 
@@ -12,7 +21,8 @@ class language
 	var $encoding;		// eg. UTF-8, CP1256, ISO8859-1
 	var	$dir;			// Currently support for Left-to-Right (ltr) and
 						// Right-To-Left (rtl)
-
+	var $is_locale_file;
+	
 	function language($name, $code, $encoding) 
 	{
 		$this->name = $name;
@@ -35,31 +45,27 @@ class language
 
 	function set_language($code) 
 	{
-	    global $comp_path;
+	    global $comp_path, $path_to_root;
 	    
 		if (isset($_SESSION['languages'][$code]) &&
 			$_SESSION['language'] != $_SESSION['languages'][$code]) 
 		{
-	    
 		// flush cache as we can use several languages in one account
 		    flush_dir($comp_path.'/'.user_company().'/js_cache');
 		    $_SESSION['language'] = $_SESSION['languages'][$code];
-		    reload_page("");
+			$locale = $path_to_root . "/lang/" . $_SESSION['language']->code . "/locale.inc";
+			// check id file exists only once for session
+			$_SESSION['language']->is_locale_file = file_exists($locale);
 		}
 	}
 
-	function get_stylesheet() 
-	{
-		return 'lang/' . $_SESSION['language']->code . '/stylesheet.css';
-	}
-
 	/**
 	 * This method loads an array of language objects into a session variable
      * called $_SESSIONS['languages']. Only supported languages are added.
      */
 	function load_languages() 
 	{
-		global $installed_languages;
+		global $installed_languages, $dflt_lang;
 
 		$_SESSION['languages'] = array();
 
@@ -72,42 +78,27 @@ class language
         }
 
 		if (!isset($_SESSION['language']))
-			$_SESSION['language'] = $_SESSION['languages']['en_GB'];
+			$_SESSION['language'] = $_SESSION['languages'][$dflt_lang];
 	}
 
 }
-
-session_name('FrontAccounting');
-session_start();
-// this is to fix the "back-do-you-want-to-refresh" issue - thanx PHPFreaks
-header("Cache-control: private");
-
-// Page Initialisation
-if (!isset($_SESSION['languages'])) 
-{
-	language::load_languages();
-}
-
-$lang = $_SESSION['language'];
-
-// get_text support
-get_text::init();
-get_text::set_language($lang->code, $lang->encoding);
-//get_text::add_domain("wa", $path_to_root . "/lang");
-get_text::add_domain($lang->code, $path_to_root . "/lang");
-// Unnecessary for ajax calls. 
-// Due to bug in php 4.3.10 for this version set globally in php.ini
-ini_set('default_charset', $_SESSION['language']->encoding);
-
-if (!function_exists("_")) 
+/*
+	Test if named function is defined in locale.inc file.
+*/
+function has_locale($fun=null)
 {
-	function _($text) 
+	global $path_to_root;
+	
+	if ($_SESSION['language']->is_locale_file)
 	{
-		$retVal = get_text::gettext($text);
-		if ($retVal == "")
-			return $text;
-		return $retVal;
+		global $path_to_root;
+		include_once($path_to_root . "/lang/" . 
+			$_SESSION['language']->code . "/locale.inc");
+
+		if (!isset($fun) || function_exists($fun))
+			return true;
 	}
+	return false;
 }
 
 function _set($key,$value) 
@@ -117,6 +108,7 @@ function _set($key,$value)
 
 function reload_page($msg) 
 {
+	global $Ajax;
 //	header("Location: $_SERVER['PHP_SELF']."");
 //	exit;
 	echo "<html>";
@@ -131,8 +123,17 @@ function reload_page($msg)
 	echo "</div>";	
 	echo "</body>";
 	echo "</html>";
+	$Ajax->redirect($_SERVER['PHP_SELF']);
 }
 
-
-
+if (!function_exists("_")) 
+{
+	function _($text) 
+	{
+		$retVal = get_text::gettext($text);
+		if ($retVal == "")
+			return $text;
+		return $retVal;
+	}
+}
 ?>
\ No newline at end of file