Commit 928ddfd0 authored by Côme Chilliet's avatar Côme Chilliet

Merge branch '5814-adapt-code-to-new-language-class' into '1.3-dev'

Resolve "Adapt code to new Language class"

See merge request fusiondirectory/fd-plugins!220
parents 1d189bf6 9d29ddea
...@@ -86,7 +86,7 @@ class expiredUserPostpone extends standAlonePage ...@@ -86,7 +86,7 @@ class expiredUserPostpone extends standAlonePage
$smarty->append('css_files', get_template_path('login.css')); $smarty->append('css_files', get_template_path('login.css'));
$lang = session::global_get('lang'); $lang = session::global_get('lang');
$smarty->assign('lang', preg_replace('/_.*$/', '', $lang)); $smarty->assign('lang', preg_replace('/_.*$/', '', $lang));
$smarty->assign('rtl', language_is_rtl($lang)); $smarty->assign('rtl', Language::isRTL($lang));
$smarty->display(get_template_path('headers.tpl')); $smarty->display(get_template_path('headers.tpl'));
$smarty->assign('version', FD_VERSION); $smarty->assign('version', FD_VERSION);
......
...@@ -72,7 +72,7 @@ function initiateRPCSession($id = NULL, $ldap = NULL, $user = NULL, $pwd = NULL) ...@@ -72,7 +72,7 @@ function initiateRPCSession($id = NULL, $ldap = NULL, $user = NULL, $pwd = NULL)
$config = session::global_get('config'); $config = session::global_get('config');
$plist = session::global_get('plist'); $plist = session::global_get('plist');
$ui = session::global_get('ui'); $ui = session::global_get('ui');
initLanguage(); Language::init();
} else { } else {
$config = new config(CONFIG_DIR."/".CONFIG_FILE, $BASE_DIR); $config = new config(CONFIG_DIR."/".CONFIG_FILE, $BASE_DIR);
if ($ldap === NULL) { if ($ldap === NULL) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment