diff --git a/application/ajaxwebpage.class.inc.php b/application/ajaxwebpage.class.inc.php index 3c1ace518..18f00f72e 100644 --- a/application/ajaxwebpage.class.inc.php +++ b/application/ajaxwebpage.class.inc.php @@ -115,7 +115,7 @@ class ajax_page extends WebPage else { $sUIPage = cmdbAbstractObject::ComputeUIPage($aParams['class']); - $sHtml .= "GetForLink()."\">\n"; + $sHtml .= "GetForLink()."\">\n"; } } $sHtml .= "\n"; diff --git a/application/loginwebpage.class.inc.php b/application/loginwebpage.class.inc.php index 82904c2b6..f43548aff 100644 --- a/application/loginwebpage.class.inc.php +++ b/application/loginwebpage.class.inc.php @@ -43,20 +43,20 @@ h1 { $sAuthPwd = utils::ReadParam('suggest_pwd', ''); $this->add("
\n"); - $this->add("

Welcome to iTop!

\n"); + $this->add("

".Dict::S('UI:Login:Welcome')."

\n"); if ($bFailedLogin) { - $this->add("

Incorrect login/password, please try again.

\n"); + $this->add("

".Dict::S('UI:Login:IncorrectLoginPassword')."

\n"); } else { - $this->add("

Please identify yourself before continuing.

\n"); + $this->add("

".Dict::S('UI:Login:IdentifyYourself')."

\n"); } $this->add("
\n"); $this->add("\n"); - $this->add("\n"); - $this->add("\n"); - $this->add("\n"); + $this->add("\n"); + $this->add("\n"); + $this->add("\n"); $this->add("
\n"); $this->add("\n"); $this->add("
\n"); @@ -114,7 +114,7 @@ h1 { header('WWW-Authenticate: Basic realm="iTop access is restricted"'); header('HTTP/1.0 401 Unauthorized'); // Note: accessed when the user will click on Cancel - echo '

iTop access is restricted. Please, contact an iTop administrator.

'; + echo '

'.Dict::S('UI:Login:Error:AccessRestricted').'

'; exit; } else @@ -127,7 +127,7 @@ h1 { header('HTTP/1.0 401 Unauthorized'); // Note: accessed when the user will click on Cancel // Todo: count the attempts - echo '

iTop access is restricted. Please, contact an iTop administrator.

'; + echo '

'.Dict::S('UI:Login:Error:AccessRestricted').'

'; exit; } } diff --git a/dictionaries/dictionary.itop.ui.php b/dictionaries/dictionary.itop.ui.php index 063722b8c..a81d277ec 100644 --- a/dictionaries/dictionary.itop.ui.php +++ b/dictionaries/dictionary.itop.ui.php @@ -358,6 +358,14 @@ Dict::Add('EN US', 'English', 'English', array( 'UI:OQLQueryBuilderTitle' => 'OQL Query Builder', 'UI:OQLQueryTab' => 'OQL Query', 'UI:SimpleSearchTab' => 'Simple Search', + 'UI:Details+' => 'Details', + 'UI:Login:Welcome' => 'Welcome to iTop!', + 'UI:Login:IncorrectLoginPassword' => 'Incorrect login/password, please try again.', + 'UI:Login:IdentifyYourself' => 'Identify yourself before continuing', + 'UI:Login:UserNamePrompt' => 'User Name:', + 'UI:Login:PasswordPrompt' => 'Password:', + 'UI:Button:Login' => 'Enter iTop', + 'UI:Login:Error:AccessRestricted' => 'iTop access is restricted. Please, contact an iTop administrator.', ));