X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Flang%2Flanguage.php;h=62866f0b0279564036e144e42a07576351652d18;hb=2e181b13aa722a43e78b897404912d6b13a0a937;hp=a47df71d00f0507c88caa242df13c7218ef5ed9d;hpb=34577a7a19f579aee070fd936697e318b2fa036f;p=fa-stable.git diff --git a/includes/lang/language.php b/includes/lang/language.php index a47df71d..62866f0b 100644 --- a/includes/lang/language.php +++ b/includes/lang/language.php @@ -1,7 +1,16 @@ . +***********************************************************************/ 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"); @@ -47,7 +56,6 @@ class language $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); - reload_page(""); } } @@ -57,7 +65,7 @@ class language */ function load_languages() { - global $installed_languages; + global $installed_languages, $dflt_lang; $_SESSION['languages'] = array(); @@ -70,7 +78,7 @@ class language } if (!isset($_SESSION['language'])) - $_SESSION['language'] = $_SESSION['languages']['en_GB']; + $_SESSION['language'] = $_SESSION['languages'][$dflt_lang]; } } @@ -93,39 +101,6 @@ function has_locale($fun=null) return false; } -session_name('FrontAccounting'.user_company()); -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("_")) -{ - function _($text) - { - $retVal = get_text::gettext($text); - if ($retVal == "") - return $text; - return $retVal; - } -} - function _set($key,$value) { get_text::set_var($key,$value); @@ -133,6 +108,7 @@ function _set($key,$value) function reload_page($msg) { + global $Ajax; // header("Location: $_SERVER['PHP_SELF'].""); // exit; echo ""; @@ -147,8 +123,17 @@ function reload_page($msg) echo ""; echo ""; echo ""; + $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