From e83dd14b5bdb0fadbafcbc89698467f9db0f04bf Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Fri, 05 Aug 2011 04:59:05 -0400
Subject: [PATCH] - Improved lng function ai app.inc.php - Fixed date handling functions in remoting library.
---
interface/lib/app.inc.php | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/interface/lib/app.inc.php b/interface/lib/app.inc.php
index 4de9904..32b5918 100644
--- a/interface/lib/app.inc.php
+++ b/interface/lib/app.inc.php
@@ -158,11 +158,12 @@
/** Translates strings in current language */
public function lng($text) {
if($this->_language_inc != 1) {
+ $language = (isset($_SESSION['s']['language']))?$_SESSION['s']['language']:$conf['language'];
//* loading global Wordbook
- $this->load_language_file('/lib/lang/'.$_SESSION['s']['language'].'.lng');
+ $this->load_language_file('lib/lang/'.$language.'.lng');
//* Load module wordbook, if it exists
- if(isset($_SESSION['s']['module']['name']) && isset($_SESSION['s']['language'])) {
- $lng_file = '/web/'.$_SESSION['s']['module']['name'].'/lib/lang/'.$_SESSION['s']['language'].'.lng';
+ if(isset($_SESSION['s']['module']['name'])) {
+ $lng_file = 'web/'.$_SESSION['s']['module']['name'].'/lib/lang/'.$language.'.lng';
if(!file_exists(ISPC_ROOT_PATH.'/'.$lng_file)) $lng_file = '/web/'.$_SESSION['s']['module']['name'].'/lib/lang/en.lng';
$this->load_language_file($lng_file);
}
--
Gitblit v1.9.1