Merge branch 'master' of vc.linet-services.de:public/lx-office-erp

diff --git a/SL/Locale.pm b/SL/Locale.pm
index bb95e73097523ef055cbe174dfb62b89d69a731d..24131378fb4d01739f3c92e4536f950abcd5d387 100644 (file)
--- a/SL/Locale.pm
+++ b/SL/Locale.pm
@@ -232,8 +232,8 @@ sub lang_to_locale {
 
   my $requested_locale;
   $requested_locale = 'de' if $requested_lang =~ m/^_(de|deu|ger)/i;
-  $requested_locale = 'fr' if $requested_lang =~ m/^_(en|uk|us|gr)/i;
-  $requested_locale = 'en' if $requested_lang =~ m/^_fr/i;
+  $requested_locale = 'en' if $requested_lang =~ m/^_(en|uk|us|gr)/i;
+  $requested_locale = 'fr' if $requested_lang =~ m/^_fr/i;
   $requested_locale ||= 'de';
 
   return $requested_locale;

diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl
index 5050e6aa2e5a35b979ca257ae173a0f00838850a..022f039ee5106dda5168e6c3bcda2cbbfed544a3 100644 (file)
--- a/bin/mozilla/io.pl
+++ b/bin/mozilla/io.pl
@@ -962,6 +962,9 @@ sub edit_e_mail {
     $form->{"email"} = $form->{"cp_email"} if $form->{"cp_email"};
   }
 
+  $form->{language} = $form->get_template_language(\%myconfig);
+  $form->{language} = "_" . $form->{language} if $form->{language};
+
   my $title = $locale->text('E-mail') . " " . $form->get_formname_translation();
 
   $form->{oldmedia} = $form->{media};