tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2012-01-10 Junichi Satoh <junichi@rworks.jp> 

* mobile/index.php: Fixed i18n translation does not work with mobile
	console.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5333 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
jsatoh 2012-01-10 04:46:09 +00:00
parent 3808bff1f0
commit 6132a59f8a
2 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_console/ChangeLog
View File

@ -1,3 +1,8 @@
2012-01-10 Junichi Satoh <junichi@rworks.jp>
* mobile/index.php: Fixed i18n translation does not work with mobile
console.
2012-01-09 Vanessa Gil <vanessa.gil@artica.es> 2012-01-09 Vanessa Gil <vanessa.gil@artica.es>
* godmode/agentes/planned_downtime.php: allow cancelling scheduled * godmode/agentes/planned_downtime.php: allow cancelling scheduled
downtime once it has started. downtime once it has started.

20
pandora_console/mobile/index.php
View File

@ -12,6 +12,11 @@
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details. // GNU General Public License for more details.
//Set character encoding to UTF-8 - fixes a lot of multibyte character headaches
if (function_exists ('mb_internal_encoding')) {
mb_internal_encoding ("UTF-8");
}
ob_start (); ob_start ();
require_once("include/system.class.php"); require_once("include/system.class.php");
@ -33,6 +38,15 @@ if ($user == null) {
$user = new User(); $user = new User();
} }
$user->hackinjectConfig(); $user->hackinjectConfig();
if ($user->isLogged()) {
$user_language = get_user_language ($system->getConfig('id_user'));
if (file_exists ('../include/languages/'.$user_language.'.mo')) {
$l10n = new gettext_reader (new CachedFileReader ('../include/languages/'.$user_language.'.mo'));
$l10n->load_tables();
}
}
?> ?>
<html> <html>
<head> <head>
@ -64,7 +78,11 @@ $user->hackinjectConfig();
require ("../general/noaccess.php"); require ("../general/noaccess.php");
return; return;
} }
$user_language = get_user_language ($system->getConfig('id_user'));
if (file_exists ('../include/languages/'.$user_language.'.mo')) {
$l10n = new gettext_reader (new CachedFileReader ('../include/languages/'.$user_language.'.mo'));
$l10n->load_tables();
}
$tactical = new Tactical(); $tactical = new Tactical();
$tactical->show(); $tactical->show();
} }