From: Sven Schöling <s.schoeling@linet-services.de>
Date: Mon, 28 Sep 2009 12:47:19 +0000 (+0200)
Subject: Merge branch 'master' of ssh://lx-office/~/lx-office-erp
X-Git-Tag: release-2.6.1beta1~275^2
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/6d06b2c53d68b0b93ae96c112fb77fb2e9bda8f6?hp=8ffb5ba4d41835960ad449a0e6b1d492b209400a

Merge branch 'master' of ssh://lx-office/~/lx-office-erp
---

diff --git a/SL/Template.pm b/SL/Template.pm
index 3ec7cd138..fe4b24893 100644
--- a/SL/Template.pm
+++ b/SL/Template.pm
@@ -501,7 +501,7 @@ sub _force_mandatory_packages {
   my (%used_packages, $document_start_line);
 
   foreach my $i (0 .. scalar @{ $lines } - 1) {
-    if ($lines->[$i] =~ m/\\usepackage[^{]*{(.*?)}/) {
+    if ($lines->[$i] =~ m/\\usepackage[^\{]*{(.*?)}/) {
       $used_packages{$1} = 1;
 
     } elsif ($lines->[$i] =~ m/\\begin{document}/) {
diff --git a/bin/mozilla/common.pl b/bin/mozilla/common.pl
index 6ace578f2..c8d7d6bb2 100644
--- a/bin/mozilla/common.pl
+++ b/bin/mozilla/common.pl
@@ -364,6 +364,13 @@ sub format_dates {
                                  $dateformat, $longformat);
       }
     }
+    if (ref($form->{TEMPLATE_ARRAYS}->{$idx}) eq "ARRAY") {
+      for (my $i = 0; $i < scalar(@{$form->{TEMPLATE_ARRAYS}->{$idx}}); $i++) {
+        $form->{TEMPLATE_ARRAYS}->{$idx}->[$i] =
+          $locale->reformat_date(\%myconfig, $form->{TEMPLATE_ARRAYS}->{$idx}->[$i],
+                                 $dateformat, $longformat);
+      }
+    }
   }
 
   $lxdebug->leave_sub();