Merge branch 'master', remote branch 'origin'

[mfinanz.git] / SL / Auth.pm

diff --git a/SL/Auth.pm b/SL/Auth.pm
index ddd8233d3babeb26731accb35e025e330f969dc9..b9840fc08fe2405c0c405bc3ef3cb3e9fe7540e2 100644 (file)
--- a/SL/Auth.pm
+++ b/SL/Auth.pm
@@ -492,6 +492,9 @@ sub read_user {
   # The XUL/XML backed menu has been removed.
   $user_data{menustyle} = 'v3' if lc($user_data{menustyle} || '') eq 'xml';
 
+  # Set default language if selected language does not exist (anymore).
+  $user_data{countrycode} = $::lx_office_conf{system}->{language} unless $user_data{countrycode} && -d "locale/$user_data{countrycode}";
+
   $sth->finish();
 
   $main::lxdebug->leave_sub();