Die Übersetzungen für die Perl-Datenbankupgradescripte werden nun in jeweils einer...

diff --git a/SL/User.pm b/SL/User.pm
index d756a2a..24774db 100644 (file)
--- a/SL/User.pm
+++ b/SL/User.pm
@@ -409,6 +409,15 @@ sub process_perl_script {
 
   $dbh->begin_work();
 
+  my %dbup_myconfig = ();
+  map({ $dbup_myconfig{$_} = $form->{$_}; }
+      qw(dbname dbuser dbpasswd dbhost dbport dbconnect));
+
+  my $nls_file = $filename;
+  $nls_file =~ s|.*/||;
+  $nls_file =~ s|.pl$||;
+  my $dbup_locale = Locale->new($main::language, $nls_file);
+
   my $result = eval($contents);
 
   if (1 != $result) {

diff --git a/locale/de/Pg-upgrade-2.2.0.25-2.2.0.26 b/locale/de/Pg-upgrade-2.2.0.25-2.2.0.26
new file mode 100644 (file)
index 0000000..8853113
--- /dev/null
+++ b/locale/de/Pg-upgrade-2.2.0.25-2.2.0.26
@@ -0,0 +1,24 @@
+$self{texts} = {
+  'A unit with this name does already exist.' => 'Eine Einheit mit diesem Namen existiert bereits.',
+  'Database update error:'      => 'Database update error:',
+  'The base unit does not exist.' => 'Die Basiseinheit existiert nicht.',
+  'The factor is missing.'      => 'Der Faktor fehlt.',
+  'The name is missing.'        => 'Der Name fehlt.',
+  'The unit has been saved.'    => 'Die Einheit wurde gespeichert.',
+};
+
+$self{subs} = {
+  'mydberror'                   => 'mydberror',
+  'myshowerror'                 => 'myshowerror',
+  'update_units'                => 'update_units',
+  'update_units_add_unit'       => 'update_units_add_unit',
+  'update_units_assign_known'   => 'update_units_assign_known',
+  'update_units_assign_units'   => 'update_units_assign_units',
+  'update_units_set_default'    => 'update_units_set_default',
+  'update_units_step_3'         => 'update_units_step_3',
+  'update_units_steps_1_2'      => 'update_units_steps_1_2',
+  'einheit_hinzufügen'     => 'add_unit',
+  'einheiten_zuweisen'          => 'assign_units',
+};
+
+1;

diff --git a/locale/de/dbupgrade b/locale/de/dbupgrade
deleted file mode 100644 (file)
index 8853113..0000000
--- a/locale/de/dbupgrade
+++ /dev/null
@@ -1,24 +0,0 @@
-$self{texts} = {
-  'A unit with this name does already exist.' => 'Eine Einheit mit diesem Namen existiert bereits.',
-  'Database update error:'      => 'Database update error:',
-  'The base unit does not exist.' => 'Die Basiseinheit existiert nicht.',
-  'The factor is missing.'      => 'Der Faktor fehlt.',
-  'The name is missing.'        => 'Der Name fehlt.',
-  'The unit has been saved.'    => 'Die Einheit wurde gespeichert.',
-};
-
-$self{subs} = {
-  'mydberror'                   => 'mydberror',
-  'myshowerror'                 => 'myshowerror',
-  'update_units'                => 'update_units',
-  'update_units_add_unit'       => 'update_units_add_unit',
-  'update_units_assign_known'   => 'update_units_assign_known',
-  'update_units_assign_units'   => 'update_units_assign_units',
-  'update_units_set_default'    => 'update_units_set_default',
-  'update_units_step_3'         => 'update_units_step_3',
-  'update_units_steps_1_2'      => 'update_units_steps_1_2',
-  'einheit_hinzufügen'     => 'add_unit',
-  'einheiten_zuweisen'          => 'assign_units',
-};
-
-1;

diff --git a/locale/de/locales.pl b/locale/de/locales.pl
index 119dfe9..36d0e47 100755 (executable)
--- a/locale/de/locales.pl
+++ b/locale/de/locales.pl
@@ -105,8 +105,7 @@ sub handle_file {
     }
   }
 
-  my $localefile = $dir eq $bindir ? $file : "dbupgrade";
-  open FH, ">$localefile" or die "$! : $localefile";
+  open FH, ">$file" or die "$! : $file";
 
   print FH q|$self{texts} = {
 |;

diff --git a/sql/Pg-upgrade/Pg-upgrade-2.2.0.25-2.2.0.26.pl b/sql/Pg-upgrade/Pg-upgrade-2.2.0.25-2.2.0.26.pl
index 1d7f9a1..cf109b7 100644 (file)
--- a/sql/Pg-upgrade/Pg-upgrade-2.2.0.25-2.2.0.26.pl
+++ b/sql/Pg-upgrade/Pg-upgrade-2.2.0.25-2.2.0.26.pl
@@ -4,12 +4,8 @@ die("This script cannot be run from the command line.") unless ($main::form);
 
 use SL::AM;
 
-%dbup_myconfig = ();
-map({ $dbup_myconfig{$_} = $main::form->{$_}; }
-    qw(dbname dbuser dbpasswd dbhost dbport dbconnect));
-
 sub mydberror {
-  my ($dbup_locale, $msg) = @_;
+  my ($msg) = @_;
   die($dbup_locale->text("Database update error:") .
       "<br>$msg<br>" . $DBI::errstr);
 }
@@ -23,8 +19,6 @@ sub myshowerror {
 }
 
 sub update_units_add_unit {
-  my ($dbup_locale, $dbh) = @_;
-
   my $form = $main::form;
 
   return 0 unless ($form->{"new_name"});
@@ -54,7 +48,7 @@ sub update_units_add_unit {
     "VALUES (?, ?, ?, ?)";
   $dbh->do($query, undef, $form->{"new_name"}, $base_unit, $factor,
            $form->{"unit_type"}) ||
-    mydberror($dbup_locale, $query .
+    mydberror($query .
               " ($form->{new_name}, $base_unit, $factor, $form->{unit_type})");
   $dbh->commit();
   $dbh->begin_work();
@@ -65,8 +59,6 @@ sub update_units_add_unit {
 }
 
 sub update_units_assign_units {
-  my ($dbup_locale, $dbh) = @_;
-
   my ($query, $sth, @values);
 
   my $form = $main::form;
@@ -79,7 +71,7 @@ sub update_units_assign_units {
       next unless ($form->{"new_unit_$i"} && $form->{"old_unit_$i"});
       @values = ($form->{"new_unit_$i"}, lc($form->{"old_unit_$i"}));
       $sth->execute(@values) ||
-        mydberror($dbup_locale, $query . " (" . join(", ", @values) . ")");
+        mydberror($query . " (" . join(", ", @values) . ")");
     }
   }
 
@@ -89,8 +81,6 @@ sub update_units_assign_units {
 }
 
 sub update_units_assign_known {
-  my ($dbup_locale, $dbh) = @_;
-
   my $form = $main::form;
 
   my %unit_name_mapping = (
@@ -109,12 +99,10 @@ sub update_units_assign_known {
   }
   $form->{"rowcount"} = scalar(keys(%unit_name_mapping));
 
-  update_units_assign_units($dbup_locale, $dbh);
+  update_units_assign_units();
 }
 
 sub update_units_steps_1_2 {
-  my ($dbup_locale, $dbh) = @_;
-
   my (%unknown_dimension_units, %unknown_service_units);
 
   my $form = $main::form;
@@ -135,7 +123,7 @@ sub update_units_steps_1_2 {
         "           t.unit IN (SELECT name FROM units))";
     }
     $sth = $dbh->prepare($query);
-    $sth->execute() || mydberror($dbup_locale, $query);
+    $sth->execute() || mydberror($query);
 
     while ($ref = $sth->fetchrow_hashref()) {
       if ($ref->{"inventory_accno_id"}) {
@@ -191,8 +179,6 @@ sub update_units_steps_1_2 {
 }
 
 sub update_units_step_3 {
-  my ($dbup_locale, $dbh) = @_;
-
   my $form = $main::form;
 
   my $query = "SELECT ";
@@ -223,8 +209,6 @@ sub update_units_step_3 {
 }
 
 sub update_units_set_default {
-  my ($dbup_locale, $dbh) = @_;
-
   my $form = $main::form;
 
   foreach my $table (qw(parts invoice orderitems rmaitems)) {
@@ -244,7 +228,7 @@ sub update_units_set_default {
         "parts_id IN (SELECT id FROM parts WHERE (inventory_accno_id > 0))";
     }
 
-    $dbh->do($query) || mydberror($dbup_locale, $query);
+    $dbh->do($query) || mydberror($query);
 
     if ($table eq "parts") {
       $query = "UPDATE $table SET unit = " .
@@ -259,39 +243,35 @@ sub update_units_set_default {
         "WHERE (inventory_accno_id ISNULL) OR (inventory_accno_id = 0))";
     }
 
-    $dbh->do($query) || mydberror($dbup_locale, $query);
+    $dbh->do($query) || mydberror($query);
   }
 }
 
 sub update_units {
-  my (@dbh) = @_;
-
   my $form = $main::form;
 
   my $res;
 
-  my $dbup_locale = Locale->new($main::language, "dbupgrade");
-
   print($form->parse_html_template("dbupgrade/units_header"));
 
   if ($form->{"action2"} eq "add_unit") {
-    $res = update_units_add_unit($dbup_locale, $dbh);
+    $res = update_units_add_unit();
     return $res if ($res);
 
   } elsif ($form->{"action2"} eq "assign_units") {
-    update_units_assign_units($dbup_locale, $dbh);
+    update_units_assign_units();
 
   } elsif ($form->{"action2"} eq "set_default") {
-    update_units_set_default($dbup_locale, $dbh);
+    update_units_set_default();
 
   }
 
-  update_units_assign_known($dbup_locale, $dbh);
+  update_units_assign_known();
 
-  $res = update_units_steps_1_2($dbup_locale, $dbh);
+  $res = update_units_steps_1_2();
   return $res if ($res);
 
-  return update_units_step_3($dbup_locale, $dbh);
+  return update_units_step_3();
 }
 
-update_units($dbh);
+update_units();