Merge branch 'after-262'

[kivitendo-erp.git] / bin / mozilla / login.pl

diff --git a/bin/mozilla/login.pl b/bin/mozilla/login.pl
index 5ecc695..49cb6c6 100644 (file)
--- a/bin/mozilla/login.pl
+++ b/bin/mozilla/login.pl
@@ -66,7 +66,7 @@ sub run {
     $::locale   = Locale->new($::myconfig{countrycode}) if $::myconfig{countrycode};
 
     if (!$::myconfig{login} || (SL::Auth::OK != $auth->authenticate($form->{login}, $form->{password}, 0))) {
-      $form->{error_message} = $::locale->text('Incorrect Password!');
+      $form->{error_message} = $::locale->text('Incorrect username or password!');
       login_screen();
     } else {
       $auth->set_session_value('login', $form->{login}, 'password', $form->{password});
@@ -175,7 +175,7 @@ sub company_logo {
 sub show_error {
   my $template           = shift;
   my %myconfig           = %main::myconfig;
-  $myconfig{countrycode} = $main::language;
+  $myconfig{countrycode} = $::lx_office_conf{system}->{language};
   $form->{stylesheet}    = 'css/lx-office-erp.css';
 
   $form->header();