projects
/
Pman.Core
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix #8131 - chinese translations
[Pman.Core]
/
I18n.php
diff --git
a/I18n.php
b/I18n.php
index
5f70c7a
..
bab0b2d
100644
(file)
--- a/
I18n.php
+++ b/
I18n.php
@@
-62,7
+62,7
@@
class Pman_Core_I18n extends Pman
//return true;
$au = $this->getAuthUser();
//if (!$au) {
//return true;
$au = $this->getAuthUser();
//if (!$au) {
- // $this->jerr
(
"Not authenticated", array('authFailure' => true));
+ // $this->jerr
or("LOGIN-NOAUTH",
"Not authenticated", array('authFailure' => true));
//}
$this->authUser = $au;
//}
$this->authUser = $au;
@@
-86,8
+86,7
@@
class Pman_Core_I18n extends Pman
$this->sessionState(0);
$lang = !$this->authUser || empty($this->authUser->lang ) ? 'en' : $this->authUser->lang;
$this->sessionState(0);
$lang = !$this->authUser || empty($this->authUser->lang ) ? 'en' : $this->authUser->lang;
-
- /// verify the selected language..
+ /// verify the selected language..
$i = DB_DataObject::Factory('I18n');
$i->ltype = 'l'; // string(1) not_null multiple_key
$i->lkey = $lang; // string(8) not_null
$i = DB_DataObject::Factory('I18n');
$i->ltype = 'l'; // string(1) not_null multiple_key
$i->lkey = $lang; // string(8) not_null
@@
-235,7
+234,13
@@
class Pman_Core_I18n extends Pman
if (empty($k)) {
return '??';
}
if (empty($k)) {
return '??';
}
- $fo = &PEAR::getStaticProperty('HTML_Template_Flexy','options');
+
+ if(class_exists('HTML_FlexyFramework2', false)) {
+ $fo = HTML_FlexyFramework2::get()->HTML_Template_Flexy;
+ }
+ else {
+ $fo = &PEAR::getStaticProperty('HTML_Template_Flexy','options');
+ }
$fallback_lang = empty($fo['locale']) ? 'en' : $fo['locale'];
$fallback_lang = empty($fo['locale']) ? 'en' : $fo['locale'];