projects
/
Pman.Core
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
check what is being written to our log files.
[Pman.Core]
/
I18n.php
diff --git
a/I18n.php
b/I18n.php
index
d87210f
..
12ed22d
100644
(file)
--- a/
I18n.php
+++ b/
I18n.php
@@
-107,7
+107,7
@@
class Pman_Core_I18n extends Pman
return explode('_', $lang);
}
return explode('_', $lang);
}
- function get($s ='')
+ function get($s =''
, $opts=array()
)
{
$this->sessionState(0);
{
$this->sessionState(0);
@@
-120,7
+120,7
@@
class Pman_Core_I18n extends Pman
$i = DB_DataObject::Factory('I18n');
$i = DB_DataObject::Factory('I18n');
-
+ $i->is_active = 1;
switch($s) {
case 'Lang':
switch($s) {
case 'Lang':
@@
-189,7
+189,8
@@
class Pman_Core_I18n extends Pman
foreach($langs as $lang)
{
//$rlang = array_shift(explode('_', strtoupper($lang)));
foreach($langs as $lang)
{
//$rlang = array_shift(explode('_', strtoupper($lang)));
- $rlang = array_shift(explode('_', $lang));
+ $ll = explode('_', $lang);
+ $rlang = array_shift($ll);
$ar[$lang] = array();
$i = DB_DataObject::Factory('I18n');
$ar[$lang] = array();
$i = DB_DataObject::Factory('I18n');
@@
-230,7
+231,7
@@
class Pman_Core_I18n extends Pman
if (empty($k)) {
return '??';
}
if (empty($k)) {
return '??';
}
- $lang = !$au || empty($au->lang ) ? 'en' :
is_string($au) ? $au : $au->lang
;
+ $lang = !$au || empty($au->lang ) ? 'en' :
(is_string($au) ? $au : $au->lang)
;
// does it need caching?
// does it need caching?