From: Niclas Zimmermann <niclas@kivitendo-premium.de>
Date: Mon, 3 Jun 2013 11:50:52 +0000 (+0200)
Subject: Merge branch 'master' of github.com:kivitendo/kivitendo-erp
X-Git-Tag: release-3.1.0beta1~387
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/7635f647ec7dcdef51684b21601ee0930ea2bc5b?hp=c6b2257945060625bcb86fa7e2efd27c737480ff

Merge branch 'master' of github.com:kivitendo/kivitendo-erp
---

diff --git a/locale/de/all b/locale/de/all
index 5136a93f7..5a5009ca3 100755
--- a/locale/de/all
+++ b/locale/de/all
@@ -619,7 +619,6 @@ $self->{texts} = {
   'Default Bin'                 => 'Standard-Lagerplatz',
   'Default Customer/Vendor Language' => 'Standard-Kunden-/Lieferantensprache',
   'Default Warehouse'           => 'Standard-Lager',
-  'Default Customer/Vendor Language' => 'Standard-Kunden-/Lieferantensprache',
   'Default buchungsgruppe'      => 'Standardbuchungsgruppe',
   'Default currency'            => 'Standardwährung',
   'Default currency missing!'   => 'Standardwährung fehlt!',
diff --git a/scripts/locales.pl b/scripts/locales.pl
index 93b34fda1..d8df86296 100755
--- a/scripts/locales.pl
+++ b/scripts/locales.pl
@@ -35,8 +35,6 @@ my $basedir      = "../..";
 my $locales_dir  = ".";
 my $bindir       = "$basedir/bin/mozilla";
 my @progdirs     = ( "$basedir/SL" );
-my $dbupdir      = "$basedir/sql/Pg-upgrade";
-my $dbupdir2     = "$basedir/sql/Pg-upgrade2";
 my $menufile     = "menu.ini";
 my @javascript_dirs = ($basedir .'/js', $basedir .'/templates/webpages');
 my $javascript_output_dir = $basedir .'/js';
@@ -98,11 +96,12 @@ if ($opt_n) {
   unshift @menufiles, "$basedir/$menufile";
 }
 
-tie %dir_h, 'IO::Dir', $dbupdir;
-my @dbplfiles = grep { /\.pl$/ } keys %dir_h;
-
-tie %dir_h, 'IO::Dir', $dbupdir2;
-my @dbplfiles2 = grep { /\.pl$/ } keys %dir_h;
+my @dbplfiles;
+foreach my $sub_dir ("Pg-upgrade", "Pg-upgrade2", "Pg-upgrade2-auth") {
+  my $dir = "$basedir/sql/$sub_dir";
+  tie %dir_h, 'IO::Dir', $dir;
+  push @dbplfiles, map { [ $_, $dir ] } grep { /\.pl$/ } keys %dir_h;
+}
 
 # slurp the translations in
 if (-f "$locales_dir/all") {
@@ -123,8 +122,7 @@ chomp $charset;
 my %old_texts = %{ $self->{texts} || {} };
 
 handle_file(@{ $_ })       for @progfiles;
-handle_file($_, $dbupdir)  for @dbplfiles;
-handle_file($_, $dbupdir2) for @dbplfiles2;
+handle_file(@{ $_ })       for @dbplfiles;
 scanmenu($_)               for @menufiles;
 
 for my $file_name (map({find_files($_)} @javascript_dirs)) {
diff --git a/templates/webpages/client_config/form.html b/templates/webpages/client_config/form.html
index bcbf845be..0d2d64eeb 100644
--- a/templates/webpages/client_config/form.html
+++ b/templates/webpages/client_config/form.html
@@ -1,4 +1,4 @@
-[%- USE T8 %][%- USE L %][% USE LxERP %]
+[%- USE T8 %][%- USE L %][% USE LxERP %][%- USE HTML -%]
 
 [% PROCESS 'common/select_warehouse_bin.html'  WAREHOUSES=SELF.WAREHOUSES warehouse_id=SELF.warehouse_id bin_id=SELF.bin_id %]
 <h1>[% title | html %]</h1>