new number-format 1'000.00

[mfinanz.git] / bin / mozilla / am.pl

diff --git a/bin/mozilla/am.pl b/bin/mozilla/am.pl
index a52677f95a6c46bd410cd8d7b772c1c611b7d02e..ad17f31238c638d3e2ac0aae04f303312f97cd7d 100644 (file)
--- a/bin/mozilla/am.pl
+++ b/bin/mozilla/am.pl
@@ -750,7 +750,7 @@ sub language_header {
   $::form->header;
 
   print $::form->parse_html_template('am/language_header', {
-    numberformats => [ '1,000.00', '1000.00', '1.000,00', '1000,00' ],
+    numberformats => [ '1,000.00', '1000.00', '1.000,00', '1000,00', "1'000.00" ],
     dateformats => [ qw(mm/dd/yy dd/mm/yy dd.mm.yy yyyy-mm-dd) ],
   });
 
@@ -816,7 +816,7 @@ sub config {
 
   _build_cfg_options('dateformat', qw(mm/dd/yy dd/mm/yy dd.mm.yy yyyy-mm-dd));
   _build_cfg_options('timeformat', qw(hh:mm hh:mm:ss));
-  _build_cfg_options('numberformat', ('1,000.00', '1000.00', '1.000,00', '1000,00'));
+  _build_cfg_options('numberformat', ('1,000.00', '1000.00', '1.000,00', '1000,00', "1'000.00"));
 
   my @formats = ();
   if ($::lx_office_conf{print_templates}->{opendocument}
@@ -885,9 +885,9 @@ sub config {
 
   $myconfig{show_form_details} = 1 unless (defined($myconfig{show_form_details}));
   $form->{CAN_CHANGE_PASSWORD} = $main::auth->can_change_password();
-  $form->{todo_cfg}            = { TODO->get_user_config('login' => $form->{login}) };
+  $form->{todo_cfg}            = { TODO->get_user_config('login' => $::myconfig{login}) };
 
-  $form->{title}               = $locale->text('Edit Preferences for #1', $form->{login});
+  $form->{title}               = $locale->text('Edit Preferences for #1', $::myconfig{login});
 
   $form->header();
 
@@ -907,7 +907,7 @@ sub save_preferences {
 
   $form->{stylesheet} = $form->{usestylesheet};
 
-  TODO->save_user_config('login' => $form->{login}, %{ $form->{todo_cfg} || { } });
+  TODO->save_user_config('login' => $::myconfig{login}, %{ $form->{todo_cfg} || { } });
 
   if (AM->save_preferences($form)) {
     if ($::auth->can_change_password()
@@ -920,7 +920,7 @@ sub save_preferences {
         $form->error($::locale->text('The settings were saved, but the password was not changed.') . ' ' . join(' ', $verifier->errors($result)));
       }
 
-      $::auth->change_password($form->{login}, $form->{new_password});
+      $::auth->change_password($::myconfig{login}, $form->{new_password});
     }
 
     $form->redirect($locale->text('Preferences saved!'));