Instanzen der Klasse Locale haben leider die package-globale Variable %self anstelle...

diff --git a/SL/Form.pm b/SL/Form.pm
index 3354a2f1b5368e2dd0f97470c52e5922622f2960..3b683f4f4e9512bcddc611774e2b077bdf4e570b 100644 (file)
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -2300,10 +2300,14 @@ sub new {
   my ($type, $country, $NLS_file) = @_;
   my $self = {};
 
   my ($type, $country, $NLS_file) = @_;
   my $self = {};
 

-  %self = ();

   if ($country && -d "locale/$country") {
   if ($country && -d "locale/$country") {

+    local *IN;

     $self->{countrycode} = $country;
     $self->{countrycode} = $country;

-    eval { require "locale/$country/$NLS_file"; };
+    if (open(IN, "locale/$country/$NLS_file")) {
+      my $code = join("", <IN>);
+      eval($code);
+      close(IN);
+    }

   }
 
   $self->{NLS_file} = $NLS_file;
   }
 
   $self->{NLS_file} = $NLS_file;


@@ -2323,7 +2327,7 @@ sub new {
 sub text {
   my ($self, $text) = @_;
 
 sub text {
   my ($self, $text) = @_;
 

-  return (exists $self{texts}{$text}) ? $self{texts}{$text} : $text;
+  return (exists $self->{texts}{$text}) ? $self->{texts}{$text} : $text;

 }
 
 sub findsub {
 }
 
 sub findsub {


@@ -2331,8 +2335,8 @@ sub findsub {
 
   my ($self, $text) = @_;
 
 
   my ($self, $text) = @_;
 

-  if (exists $self{subs}{$text}) {
-    $text = $self{subs}{$text};
+  if (exists $self->{subs}{$text}) {
+    $text = $self->{subs}{$text};

   } else {
     if ($self->{countrycode} && $self->{NLS_file}) {
       Form->error(
   } else {
     if ($self->{countrycode} && $self->{NLS_file}) {
       Form->error(

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
index 71899dc6f40f4a71c7209b18f1a47ab193aa791f..1a79fbdd309921a1d1c7703ee10ebf40e50581ad 100644 (file)
--- 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
@@ -1,4 +1,4 @@
-$self{texts} = {
+$self->{texts} = {

   'A unit with this name does already exist.' => 'Eine Einheit mit diesem Namen existiert bereits.',
   'Database update error:'      => 'Fehler beim Datenbankupgrade:',
   'The base unit does not exist.' => 'Die Basiseinheit existiert nicht.',
   'A unit with this name does already exist.' => 'Eine Einheit mit diesem Namen existiert bereits.',
   'Database update error:'      => 'Fehler beim Datenbankupgrade:',
   'The base unit does not exist.' => 'Die Basiseinheit existiert nicht.',


@@ -7,7 +7,7 @@ $self{texts} = {
   'The unit has been saved.'    => 'Die Einheit wurde gespeichert.',
 };
 
   'The unit has been saved.'    => 'Die Einheit wurde gespeichert.',
 };
 

-$self{subs} = {
+$self->{subs} = {

   'mydberror'                   => 'mydberror',
   'myshowerror'                 => 'myshowerror',
   'update_units'                => 'update_units',
   'mydberror'                   => 'mydberror',
   'myshowerror'                 => 'myshowerror',
   'update_units'                => 'update_units',

diff --git a/locale/de/Pg-upgrade-2.2.0.27-2.2.0.28 b/locale/de/Pg-upgrade-2.2.0.27-2.2.0.28
index 2b678236c2b47639573e03bd3d538c03fb8fba7e..39314f88f7c138ab6306940d3544901e63383a30 100644 (file)
--- a/locale/de/Pg-upgrade-2.2.0.27-2.2.0.28
+++ b/locale/de/Pg-upgrade-2.2.0.27-2.2.0.28
@@ -1,8 +1,8 @@
-$self{texts} = {
+$self->{texts} = {

   'Database update error:'      => 'Fehler beim Datenbankupgrade:',
 };
 
   'Database update error:'      => 'Fehler beim Datenbankupgrade:',
 };
 

-$self{subs} = {
+$self->{subs} = {

   'look_for_accno'              => 'look_for_accno',
   'mydberror'                   => 'mydberror',
   'myshowerror'                 => 'myshowerror',
   'look_for_accno'              => 'look_for_accno',
   'mydberror'                   => 'mydberror',
   'myshowerror'                 => 'myshowerror',

diff --git a/locale/de/Pg-upgrade-2.2.0.28-2.2.0.29 b/locale/de/Pg-upgrade-2.2.0.28-2.2.0.29
index 0d2074d8c2fcd8dc765c3b7a1017b41435e77ea1..5ac8898154d40f9c9ec9ddb5739fc78ececfc4a2 100644 (file)
--- a/locale/de/Pg-upgrade-2.2.0.28-2.2.0.29
+++ b/locale/de/Pg-upgrade-2.2.0.28-2.2.0.29
@@ -1,8 +1,8 @@
-$self{texts} = {
+$self->{texts} = {

   'Database update error:'      => 'Fehler beim Datenbankupgrade:',
 };
 
   'Database update error:'      => 'Fehler beim Datenbankupgrade:',
 };
 

-$self{subs} = {
+$self->{subs} = {

   'create_standard_buchungsgruppen' => 'create_standard_buchungsgruppen',
   'create_standard_buchungsgruppen_skr03' => 'create_standard_buchungsgruppen_skr03',
   'create_standard_buchungsgruppen_skr04' => 'create_standard_buchungsgruppen_skr04',
   'create_standard_buchungsgruppen' => 'create_standard_buchungsgruppen',
   'create_standard_buchungsgruppen_skr03' => 'create_standard_buchungsgruppen_skr03',
   'create_standard_buchungsgruppen_skr04' => 'create_standard_buchungsgruppen_skr04',

diff --git a/locale/de/admin b/locale/de/admin
index c8163f56cf8efc24c4291b8200f758ab5dff220b..0ebbd1755c9dc7c958249647b6021a9f15886a16 100644 (file)
--- a/locale/de/admin
+++ b/locale/de/admin
@@ -1,4 +1,4 @@
-$self{texts} = {
+$self->{texts} = {

   'Access Control'              => 'Zugriffkontrolle',
   'Add User'                    => 'Benutzer erfassen',
   'Address'                     => 'Adresse',
   'Access Control'              => 'Zugriffkontrolle',
   'Add User'                    => 'Benutzer erfassen',
   'Address'                     => 'Adresse',


@@ -95,7 +95,7 @@ $self{texts} = {
   'website'                     => 'Webseite',
 };
 
   'website'                     => 'Webseite',
 };
 

-$self{subs} = {
+$self->{subs} = {

   'add_user'                    => 'add_user',
   'adminlogin'                  => 'adminlogin',
   'change_admin_password'       => 'change_admin_password',
   'add_user'                    => 'add_user',
   'adminlogin'                  => 'adminlogin',
   'change_admin_password'       => 'change_admin_password',

diff --git a/locale/de/all b/locale/de/all
index 7a8e8e1180c5fddeadf0baea2ef7a7db091f13fc..230e05b67ecf91fa524fe7fcc8f511b23cd9a3ca 100644 (file)
--- a/locale/de/all
+++ b/locale/de/all
@@ -3,7 +3,7 @@
 # you can add the translation in this file or in the 'missing' file
 # run locales.pl from this directory to rebuild the translation files
 
 # you can add the translation in this file or in the 'missing' file
 # run locales.pl from this directory to rebuild the translation files
 

-$self{texts} = {
+$self->{texts} = {

   ' Date missing!'              => ' Datum fehlt!',
   ' Number'                     => ' Nummer',
   ' Part Number missing!'       => ' Artikelnummer fehlt!',
   ' Date missing!'              => ' Datum fehlt!',
   ' Number'                     => ' Nummer',
   ' Part Number missing!'       => ' Artikelnummer fehlt!',

diff --git a/locale/de/am b/locale/de/am
index 5512907c9ea3960e456e135473ca0b5efa65fd73..894bc0d4b20f92f2ec5b206bac2491e48190eaa3 100644 (file)
--- a/locale/de/am
+++ b/locale/de/am
@@ -1,4 +1,4 @@
-$self{texts} = {
+$self->{texts} = {

   '1000,00 or 1000.00'          => '1000,00 oder 1000.00',
   'A unit with this name does already exist.' => 'Eine Einheit mit diesem Namen existiert bereits.',
   'AP'                          => 'Einkauf',
   '1000,00 or 1000.00'          => '1000,00 oder 1000.00',
   'A unit with this name does already exist.' => 'Eine Einheit mit diesem Namen existiert bereits.',
   'AP'                          => 'Einkauf',


@@ -251,7 +251,7 @@ $self{texts} = {
   'service units'               => 'Dienstleistungseinheiten',
 };
 
   'service units'               => 'Dienstleistungseinheiten',
 };
 

-$self{subs} = {
+$self->{subs} = {

   'acc_menu'                    => 'acc_menu',
   'account_header'              => 'account_header',
   'add'                         => 'add',
   'acc_menu'                    => 'acc_menu',
   'account_header'              => 'account_header',
   'add'                         => 'add',

diff --git a/locale/de/ap b/locale/de/ap
index 9390dbf0df92c72d89a8f261efea990337ab5290..8d3bc6366fdc291c24cbbb995e0ef0dccfd70e3f 100644 (file)
--- a/locale/de/ap
+++ b/locale/de/ap
@@ -1,4 +1,4 @@
-$self{texts} = {
+$self->{texts} = {

   'AP Transaction'              => 'Kreditorenbuchung',
   'AP Transactions'             => 'Kreditorenbuchungen',
   'Account'                     => 'Konto',
   'AP Transaction'              => 'Kreditorenbuchung',
   'AP Transactions'             => 'Kreditorenbuchungen',
   'Account'                     => 'Konto',


@@ -97,7 +97,7 @@ $self{texts} = {
   'button'                      => '?',
 };
 
   'button'                      => '?',
 };
 

-$self{subs} = {
+$self->{subs} = {

   'acc_menu'                    => 'acc_menu',
   'add'                         => 'add',
   'add_transaction'             => 'add_transaction',
   'acc_menu'                    => 'acc_menu',
   'add'                         => 'add',
   'add_transaction'             => 'add_transaction',

diff --git a/locale/de/ar b/locale/de/ar
index f5fa45af92800699cef43da6ae6acca5760e2414..ad32f795d0f54fb83d3123705b316eff891c95ae 100644 (file)
--- a/locale/de/ar
+++ b/locale/de/ar
@@ -1,4 +1,4 @@
-$self{texts} = {
+$self->{texts} = {

   'AR Transaction'              => 'Debitorenbuchung',
   'AR Transactions'             => 'Debitorenbuchungen',
   'Account'                     => 'Konto',
   'AR Transaction'              => 'Debitorenbuchung',
   'AR Transactions'             => 'Debitorenbuchungen',
   'Account'                     => 'Konto',


@@ -99,7 +99,7 @@ $self{texts} = {
   'button'                      => '?',
 };
 
   'button'                      => '?',
 };
 

-$self{subs} = {
+$self->{subs} = {

   'acc_menu'                    => 'acc_menu',
   'add'                         => 'add',
   'add_transaction'             => 'add_transaction',
   'acc_menu'                    => 'acc_menu',
   'add'                         => 'add',
   'add_transaction'             => 'add_transaction',

diff --git a/locale/de/arap b/locale/de/arap
index 7070ce14457ddf10a1d0532a55f836617e687cfa..af375c4e8025ca31e75283b5588ed8a0977c17ba 100644 (file)
--- a/locale/de/arap
+++ b/locale/de/arap
@@ -1,4 +1,4 @@
-$self{texts} = {
+$self->{texts} = {

   'Address'                     => 'Adresse',
   'Continue'                    => 'Weiter',
   'Customer not on file!'       => 'Kunde ist nicht in der Datenbank!',
   'Address'                     => 'Adresse',
   'Continue'                    => 'Weiter',
   'Customer not on file!'       => 'Kunde ist nicht in der Datenbank!',


@@ -10,7 +10,7 @@ $self{texts} = {
   'Vendor not on file!'         => 'Lieferant ist nicht in der Datenbank!',
 };
 
   'Vendor not on file!'         => 'Lieferant ist nicht in der Datenbank!',
 };
 

-$self{subs} = {
+$self->{subs} = {

   'add_transaction'             => 'add_transaction',
   'ap_transaction'              => 'ap_transaction',
   'ar_transaction'              => 'ar_transaction',
   'add_transaction'             => 'add_transaction',
   'ap_transaction'              => 'ap_transaction',
   'ar_transaction'              => 'ar_transaction',

diff --git a/locale/de/bp b/locale/de/bp
index de4888fae7201a5308c76218f10838e2fd4facaf..ce21844419f7278b60e8a10e45247e9f62e76a1a 100644 (file)
--- a/locale/de/bp
+++ b/locale/de/bp
@@ -1,4 +1,4 @@
-$self{texts} = {
+$self->{texts} = {

   'Account'                     => 'Konto',
   'Accounting Menu'             => 'Kontoverwaltung',
   'Are you sure you want to remove the marked entries from the queue?' => 'Sind Sie sicher, dass die markierten Einträge von der Warteschlange gelöscht werden sollen?',
   'Account'                     => 'Konto',
   'Accounting Menu'             => 'Kontoverwaltung',
   'Are you sure you want to remove the marked entries from the queue?' => 'Sind Sie sicher, dass die markierten Einträge von der Warteschlange gelöscht werden sollen?',


@@ -39,7 +39,7 @@ $self{texts} = {
   'done'                        => 'erledigt',
 };
 
   'done'                        => 'erledigt',
 };
 

-$self{subs} = {
+$self->{subs} = {

   'acc_menu'                    => 'acc_menu',
   'continue'                    => 'continue',
   'display'                     => 'display',
   'acc_menu'                    => 'acc_menu',
   'continue'                    => 'continue',
   'display'                     => 'display',

diff --git a/locale/de/ca b/locale/de/ca
index e0482e0375af8b8973d9c6bdcc4c4c277be000bc..08ef37a481a7d1812d303ce24e34b9b605e1b12b 100644 (file)
--- a/locale/de/ca
+++ b/locale/de/ca
@@ -1,4 +1,4 @@
-$self{texts} = {
+$self->{texts} = {

   'Account'                     => 'Konto',
   'Apr'                         => 'Apr',
   'April'                       => 'April',
   'Account'                     => 'Konto',
   'Apr'                         => 'Apr',
   'April'                       => 'April',


@@ -41,7 +41,7 @@ $self{texts} = {
   'To'                          => 'An',
 };
 
   'To'                          => 'An',
 };
 

-$self{subs} = {
+$self->{subs} = {

   'ca_subtotal'                 => 'ca_subtotal',
   'chart_of_accounts'           => 'chart_of_accounts',
   'list'                        => 'list',
   'ca_subtotal'                 => 'ca_subtotal',
   'chart_of_accounts'           => 'chart_of_accounts',
   'list'                        => 'list',

diff --git a/locale/de/cn b/locale/de/cn
index ceb2b2ce995e6e8ad8a81b4e58620733609f71b9..9470f5bc794d802c9a311bef26d7d0294d807aa5 100644 (file)
--- a/locale/de/cn
+++ b/locale/de/cn
@@ -1,4 +1,4 @@
-$self{texts} = {
+$self->{texts} = {

   ' Date missing!'              => ' Datum fehlt!',
   '*/'                          => '*/',
   'Account'                     => 'Konto',
   ' Date missing!'              => ' Datum fehlt!',
   '*/'                          => '*/',
   'Account'                     => 'Konto',


@@ -183,7 +183,7 @@ $self{texts} = {
   'sent to printer'             => 'an Drucker geschickt',
 };
 
   'sent to printer'             => 'an Drucker geschickt',
 };
 

-$self{subs} = {
+$self->{subs} = {

   'acc_menu'                    => 'acc_menu',
   'add'                         => 'add',
   'add_transaction'             => 'add_transaction',
   'acc_menu'                    => 'acc_menu',
   'add'                         => 'add',
   'add_transaction'             => 'add_transaction',

diff --git a/locale/de/common b/locale/de/common
index f485084adf23182de7ce542fa8e7a194bcb61630..075f99918c52940519ef771fa438479c75ab4e55 100644 (file)
--- a/locale/de/common
+++ b/locale/de/common
@@ -1,4 +1,4 @@
-$self{texts} = {
+$self->{texts} = {

   'Address'                     => 'Adresse',
   'Customer Number'             => 'Kundennummer',
   'Enter longdescription'       => 'Langtext eingeben',
   'Address'                     => 'Adresse',
   'Customer Number'             => 'Kundennummer',
   'Enter longdescription'       => 'Langtext eingeben',


@@ -22,7 +22,7 @@ $self{texts} = {
   'Variable'                    => 'Variable',
 };
 
   'Variable'                    => 'Variable',
 };
 

-$self{subs} = {
+$self->{subs} = {

   'calculate_qty'               => 'calculate_qty',
   'delivery_customer_selection' => 'delivery_customer_selection',
   'employee_selection_internal' => 'employee_selection_internal',
   'calculate_qty'               => 'calculate_qty',
   'delivery_customer_selection' => 'delivery_customer_selection',
   'employee_selection_internal' => 'employee_selection_internal',

diff --git a/locale/de/cp b/locale/de/cp
index 12c8460427090f2280790fa53ac50652df2ea0e6..9ad4d0476e15bf4af36eac525c585d5e1944861f 100644 (file)
--- a/locale/de/cp
+++ b/locale/de/cp
@@ -1,4 +1,4 @@
-$self{texts} = {
+$self->{texts} = {

   'AP'                          => 'Einkauf',
   'AR'                          => 'Verkauf',
   'Account'                     => 'Konto',
   'AP'                          => 'Einkauf',
   'AR'                          => 'Verkauf',
   'Account'                     => 'Konto',


@@ -49,7 +49,7 @@ $self{texts} = {
   'button'                      => '?',
 };
 
   'button'                      => '?',
 };
 

-$self{subs} = {
+$self->{subs} = {

   'acc_menu'                    => 'acc_menu',
   'add_transaction'             => 'add_transaction',
   'ap_transaction'              => 'ap_transaction',
   'acc_menu'                    => 'acc_menu',
   'add_transaction'             => 'add_transaction',
   'ap_transaction'              => 'ap_transaction',

diff --git a/locale/de/ct b/locale/de/ct
index a840ec8ff6718573a91912a4cb1d2243115d12cf..b6909c914be239004fdccc3e62d3aca063c3ec77 100644 (file)
--- a/locale/de/ct
+++ b/locale/de/ct
@@ -1,4 +1,4 @@
-$self{texts} = {
+$self->{texts} = {

   ' Number'                     => ' Nummer',
   'Abteilung'                   => 'Abteilung',
   'Account Number'              => 'Kontonummer',
   ' Number'                     => ' Nummer',
   'Abteilung'                   => 'Abteilung',
   'Account Number'              => 'Kontonummer',


@@ -112,7 +112,7 @@ $self{texts} = {
   's'                           => 's',
 };
 
   's'                           => 's',
 };
 

-$self{subs} = {
+$self->{subs} = {

   'acc_menu'                    => 'acc_menu',
   'add'                         => 'add',
   'add_transaction'             => 'add_transaction',
   'acc_menu'                    => 'acc_menu',
   'add'                         => 'add',
   'add_transaction'             => 'add_transaction',

diff --git a/locale/de/datev b/locale/de/datev
index c701b97edd6859b069f652b82d51650af0541036..699f5b32742a435a8ecb6380be673395616a1faf 100644 (file)
--- a/locale/de/datev
+++ b/locale/de/datev
@@ -1,4 +1,4 @@
-$self{texts} = {
+$self->{texts} = {

   'Abrechnungsnummer'           => 'Abrechnungsnummer',
   'April'                       => 'April',
   'August'                      => 'August',
   'Abrechnungsnummer'           => 'Abrechnungsnummer',
   'April'                       => 'April',
   'August'                      => 'August',


@@ -40,7 +40,7 @@ $self{texts} = {
   'bis'                         => 'bis',
 };
 
   'bis'                         => 'bis',
 };
 

-$self{subs} = {
+$self->{subs} = {

   'continue'                    => 'continue',
   'export'                      => 'export',
   'export2'                     => 'export2',
   'continue'                    => 'continue',
   'export'                      => 'export',
   'export2'                     => 'export2',

diff --git a/locale/de/dn b/locale/de/dn
index 3f6be92dcd697cef09041a2b6db2c84a503d7d8f..96738b8d1df4a9b433da812ac9cdeeca39be7f29 100644 (file)
--- a/locale/de/dn
+++ b/locale/de/dn
@@ -1,4 +1,4 @@
-$self{texts} = {
+$self->{texts} = {

   ' Date missing!'              => ' Datum fehlt!',
   '*/'                          => '*/',
   'Accounting Menu'             => 'Kontoverwaltung',
   ' Date missing!'              => ' Datum fehlt!',
   '*/'                          => '*/',
   'Accounting Menu'             => 'Kontoverwaltung',


@@ -174,7 +174,7 @@ gestartet',
   'sent to printer'             => 'an Drucker geschickt',
 };
 
   'sent to printer'             => 'an Drucker geschickt',
 };
 

-$self{subs} = {
+$self->{subs} = {

   'acc_menu'                    => 'acc_menu',
   'add'                         => 'add',
   'add_transaction'             => 'add_transaction',
   'acc_menu'                    => 'acc_menu',
   'add'                         => 'add',
   'add_transaction'             => 'add_transaction',

diff --git a/locale/de/fa b/locale/de/fa
index 203a8ca1a77c85a02b9401337b7c71c54334af64..da41edac3290cd9ba33d359ab0563ec08a3a197b 100644 (file)
--- a/locale/de/fa
+++ b/locale/de/fa
@@ -1,4 +1,4 @@
-$self{texts} = {
+$self->{texts} = {

   'Address'                     => 'Adresse',
   'Angaben zum Finanzamt'       => 'Angaben zum Finanzamt',
   'Bankleitzahl (BLZ)'          => 'Bankleitzahl (BLZ)',
   'Address'                     => 'Adresse',
   'Angaben zum Finanzamt'       => 'Angaben zum Finanzamt',
   'Bankleitzahl (BLZ)'          => 'Bankleitzahl (BLZ)',


@@ -46,7 +46,7 @@ $self{texts} = {
   'Öffnungszeiten'              => 'Öffnungszeiten',
 };
 
   'Öffnungszeiten'              => 'Öffnungszeiten',
 };
 

-$self{subs} = {
+$self->{subs} = {

   'add_transaction'             => 'add_transaction',
   'ap_transaction'              => 'ap_transaction',
   'ar_transaction'              => 'ar_transaction',
   'add_transaction'             => 'add_transaction',
   'ap_transaction'              => 'ap_transaction',
   'ar_transaction'              => 'ar_transaction',

diff --git a/locale/de/gl b/locale/de/gl
index 119853667489e47b1c4849808fa4e044682a7558..77567e963fbb0fe6012a5e2603bd53e0efaa1523 100644 (file)
--- a/locale/de/gl
+++ b/locale/de/gl
@@ -1,4 +1,4 @@
-$self{texts} = {
+$self->{texts} = {

   'AP Transaction'              => 'Kreditorenbuchung',
   'AR Transaction'              => 'Debitorenbuchung',
   'Account'                     => 'Konto',
   'AP Transaction'              => 'Kreditorenbuchung',
   'AR Transaction'              => 'Debitorenbuchung',
   'Account'                     => 'Konto',


@@ -100,7 +100,7 @@ $self{texts} = {
   'button'                      => '?',
 };
 
   'button'                      => '?',
 };
 

-$self{subs} = {
+$self->{subs} = {

   'acc_menu'                    => 'acc_menu',
   'add'                         => 'add',
   'add_transaction'             => 'add_transaction',
   'acc_menu'                    => 'acc_menu',
   'add'                         => 'add',
   'add_transaction'             => 'add_transaction',

diff --git a/locale/de/ic b/locale/de/ic
index e971f07108334ac7f6a01055901eb8e8998249ff..a5d26cd51cff8ade58d70355c1338ffea5c411db 100644 (file)
--- a/locale/de/ic
+++ b/locale/de/ic
@@ -1,4 +1,4 @@
-$self{texts} = {
+$self->{texts} = {

   ' Date missing!'              => ' Datum fehlt!',
   ' Part Number missing!'       => ' Artikelnummer fehlt!',
   '*/'                          => '*/',
   ' Date missing!'              => ' Datum fehlt!',
   ' Part Number missing!'       => ' Artikelnummer fehlt!',
   '*/'                          => '*/',


@@ -222,7 +222,7 @@ aktualisieren wollen?',
   'soldtotal'                   => 'Verkaufte Anzahl',
 };
 
   'soldtotal'                   => 'Verkaufte Anzahl',
 };
 

-$self{subs} = {
+$self->{subs} = {

   'acc_menu'                    => 'acc_menu',
   'add'                         => 'add',
   'addtop100'                   => 'addtop100',
   'acc_menu'                    => 'acc_menu',
   'add'                         => 'add',
   'addtop100'                   => 'addtop100',

diff --git a/locale/de/io b/locale/de/io
index bd29e21b0d58fffdab3fcd6db9709279e1d1a7c3..35a95f7847dc54909b1b6b0e644e41f37babdf29 100644 (file)
--- a/locale/de/io
+++ b/locale/de/io
@@ -1,4 +1,4 @@
-$self{texts} = {
+$self->{texts} = {

   ' Date missing!'              => ' Datum fehlt!',
   '*/'                          => '*/',
   'Add Purchase Order'          => 'Lieferantenauftrag erfassen',
   ' Date missing!'              => ' Datum fehlt!',
   '*/'                          => '*/',
   'Add Purchase Order'          => 'Lieferantenauftrag erfassen',


@@ -117,7 +117,7 @@ $self{texts} = {
   'sent to printer'             => 'an Drucker geschickt',
 };
 
   'sent to printer'             => 'an Drucker geschickt',
 };
 

-$self{subs} = {
+$self->{subs} = {

   'check_form'                  => 'check_form',
   'customer_details'            => 'customer_details',
   'display_form'                => 'display_form',
   'check_form'                  => 'check_form',
   'customer_details'            => 'customer_details',
   'display_form'                => 'display_form',

diff --git a/locale/de/ir b/locale/de/ir
index ddd41d4e274ffb35b3b26b39c8ddfe407688b79f..e13808ae525ee05dbbb5ca04edd5aec4c557294a 100644 (file)
--- a/locale/de/ir
+++ b/locale/de/ir
@@ -1,4 +1,4 @@
-$self{texts} = {
+$self->{texts} = {

   ' Date missing!'              => ' Datum fehlt!',
   ' Payment posted!'            => 'Zahlung gebucht!',
   '*/'                          => '*/',
   ' Date missing!'              => ' Datum fehlt!',
   ' Payment posted!'            => 'Zahlung gebucht!',
   '*/'                          => '*/',


@@ -173,7 +173,7 @@ $self{texts} = {
   'sent to printer'             => 'an Drucker geschickt',
 };
 
   'sent to printer'             => 'an Drucker geschickt',
 };
 

-$self{subs} = {
+$self->{subs} = {

   'acc_menu'                    => 'acc_menu',
   'add'                         => 'add',
   'add_transaction'             => 'add_transaction',
   'acc_menu'                    => 'acc_menu',
   'add'                         => 'add',
   'add_transaction'             => 'add_transaction',

diff --git a/locale/de/is b/locale/de/is
index 7d331e2cf1c4547dc7cb6bcf2b11b64fedb6a03f..00d832ed3208cb9139f9953b12b5b2e83a6234f5 100644 (file)
--- a/locale/de/is
+++ b/locale/de/is
@@ -1,4 +1,4 @@
-$self{texts} = {
+$self->{texts} = {

   ' Date missing!'              => ' Datum fehlt!',
   ' Payment posted!'            => 'Zahlung gebucht!',
   '*/'                          => '*/',
   ' Date missing!'              => ' Datum fehlt!',
   ' Payment posted!'            => 'Zahlung gebucht!',
   '*/'                          => '*/',


@@ -198,7 +198,7 @@ $self{texts} = {
   'sent to printer'             => 'an Drucker geschickt',
 };
 
   'sent to printer'             => 'an Drucker geschickt',
 };
 

-$self{subs} = {
+$self->{subs} = {

   'acc_menu'                    => 'acc_menu',
   'add'                         => 'add',
   'add_transaction'             => 'add_transaction',
   'acc_menu'                    => 'acc_menu',
   'add'                         => 'add',
   'add_transaction'             => 'add_transaction',

diff --git a/locale/de/kopf b/locale/de/kopf
index 894334b9bb4c43da31b3ea801a7737887fa952ac..41715d9b4ecf9f2ac1793c17198917ddd267f7fe 100644 (file)
--- a/locale/de/kopf
+++ b/locale/de/kopf
@@ -1,8 +1,8 @@
-$self{texts} = {
+$self->{texts} = {

   'Logout'                      => 'Abmeldung',
 };
 
   'Logout'                      => 'Abmeldung',
 };
 

-$self{subs} = {
+$self->{subs} = {

 };
 
 1;
 };
 
 1;

diff --git a/locale/de/licenses b/locale/de/licenses
index 95189e27b2916deb88c9b0e60bdc3769a046a819..17ce5eeb0de7165032f5183a9f0edb34c8ffefd7 100644 (file)
--- a/locale/de/licenses
+++ b/locale/de/licenses
@@ -1,4 +1,4 @@
-$self{texts} = {
+$self->{texts} = {

   'Add'                         => 'Erfassen',
   'Add License'                 => 'Lizenz erfassen',
   'All'                         => 'Alle',
   'Add'                         => 'Erfassen',
   'Add License'                 => 'Lizenz erfassen',
   'All'                         => 'Alle',


@@ -32,7 +32,7 @@ $self{texts} = {
   'Zipcode'                     => 'PLZ',
 };
 
   'Zipcode'                     => 'PLZ',
 };
 

-$self{subs} = {
+$self->{subs} = {

   'add'                         => 'add',
   'continue'                    => 'continue',
   'details'                     => 'details',
   'add'                         => 'add',
   'continue'                    => 'continue',
   'details'                     => 'details',

diff --git a/locale/de/locales.pl b/locale/de/locales.pl
index 36d0e4785dc67c3f785693f1a44a8ebf88a62344..7a73120e82e727da35a315f17c33adb2cf86cedd 100755 (executable)
--- a/locale/de/locales.pl
+++ b/locale/de/locales.pl
@@ -99,20 +99,20 @@ sub handle_file {
 
   foreach $text (keys %$missing) {
     if ($locale{$text} || $htmllocale{$text}) {
 
   foreach $text (keys %$missing) {
     if ($locale{$text} || $htmllocale{$text}) {

-      unless ($self{texts}{$text}) {
-        $self{texts}{$text} = $missing->{$text};
+      unless ($self->{texts}{$text}) {
+        $self->{texts}{$text} = $missing->{$text};

       }
     }
   }
 
   open FH, ">$file" or die "$! : $file";
 
       }
     }
   }
 
   open FH, ">$file" or die "$! : $file";
 

-  print FH q|$self{texts} = {
+  print FH q|$self->{texts} = {

 |;
 
   foreach $key (sort keys %locale) {
 |;
 
   foreach $key (sort keys %locale) {

-    if ($self{texts}{$key}) {
-      $text = $self{texts}{$key};
+    if ($self->{texts}{$key}) {
+      $text = $self->{texts}{$key};

     } else {
       $text = $key;
     }
     } else {
       $text = $key;
     }


@@ -130,7 +130,7 @@ sub handle_file {
 
   print FH q|};
 
 
   print FH q|};
 

-$self{subs} = {
+$self->{subs} = {

 |;
 
   foreach $key (sort keys %subrt) {
 |;
 
   foreach $key (sort keys %subrt) {


@@ -141,7 +141,7 @@ $self{subs} = {
   }
 
   foreach $key (sort keys %submit) {
   }
 
   foreach $key (sort keys %submit) {

-    $text = ($self{texts}{$key}) ? $self{texts}{$key} : $key;
+    $text = ($self->{texts}{$key}) ? $self->{texts}{$key} : $key;

     $text =~ s/'/\\'/g;
     $text =~ s/\\$/\\\\/;
 
     $text =~ s/'/\\'/g;
     $text =~ s/\\$/\\\\/;
 


@@ -180,11 +180,11 @@ print FH q|# These are all the texts to build the translations files.
 # you can add the translation in this file or in the 'missing' file
 # run locales.pl from this directory to rebuild the translation files
 
 # you can add the translation in this file or in the 'missing' file
 # run locales.pl from this directory to rebuild the translation files
 

-$self{texts} = {
+$self->{texts} = {

 |;
 
 foreach $key (sort keys %alllocales) {
 |;
 
 foreach $key (sort keys %alllocales) {

-  $text = $self{texts}{$key};
+  $text = $self->{texts}{$key};

 
   $count++;
 
 
   $count++;
 


@@ -551,7 +551,7 @@ sub converthtmlfile {
           $copying = 0;
           $alllocales{$text} = 1;
           $htmllocale{$text} = 1;
           $copying = 0;
           $alllocales{$text} = 1;
           $htmllocale{$text} = 1;

-          print(OUT $self{"texts"}{$text} || $text);
+          print(OUT $self->{"texts"}{$text} || $text);

           print(OUT "\n") if ("" eq $line);
           $text = "";
 
           print(OUT "\n") if ("" eq $line);
           $text = "";
 

diff --git a/locale/de/login b/locale/de/login
index 53a5955f9791a0ffad20e65273857ee589ff90a0..4eb2c7953a65aee74d91ca69e0c4b582dfe5cf8f 100644 (file)
--- a/locale/de/login
+++ b/locale/de/login
@@ -1,4 +1,4 @@
-$self{texts} = {
+$self->{texts} = {

   'About'                       => 'über',
   'Database Host'               => 'Datenbankcomputer',
   'Dataset'                     => 'Datenbank',
   'About'                       => 'über',
   'Database Host'               => 'Datenbankcomputer',
   'Dataset'                     => 'Datenbank',


@@ -15,7 +15,7 @@ $self{texts} = {
   'localhost'                   => 'lokaler Rechner',
 };
 
   'localhost'                   => 'lokaler Rechner',
 };
 

-$self{subs} = {
+$self->{subs} = {

   'company_logo'                => 'company_logo',
   'login'                       => 'login',
   'login_screen'                => 'login_screen',
   'company_logo'                => 'company_logo',
   'login'                       => 'login',
   'login_screen'                => 'login_screen',

diff --git a/locale/de/menu b/locale/de/menu
index 0132e32047eb9f956f502167fd20570bc8a3ed99..4f164a8353d2ecd9d53617fc2bec0f1d0295b427 100644 (file)
--- a/locale/de/menu
+++ b/locale/de/menu
@@ -1,4 +1,4 @@
-$self{texts} = {
+$self->{texts} = {

   'AP'                          => 'Einkauf',
   'AP Aging'                    => 'Offene Verbindlichkeiten',
   'AR'                          => 'Verkauf',
   'AP'                          => 'Einkauf',
   'AP Aging'                    => 'Offene Verbindlichkeiten',
   'AR'                          => 'Verkauf',


@@ -120,7 +120,7 @@ $self{texts} = {
   'Version'                     => 'Version',
 };
 
   'Version'                     => 'Version',
 };
 

-$self{subs} = {
+$self->{subs} = {

   'acc_menu'                    => 'acc_menu',
   'display'                     => 'display',
   'section_menu'                => 'section_menu',
   'acc_menu'                    => 'acc_menu',
   'display'                     => 'display',
   'section_menu'                => 'section_menu',

diff --git a/locale/de/menunew b/locale/de/menunew
index fb2a34467fc679c79a9ded4bd3435f64bd01fb6c..b31368fd97d6b78a2bbb282bf2ebe0608439201b 100644 (file)
--- a/locale/de/menunew
+++ b/locale/de/menunew
@@ -1,4 +1,4 @@
-$self{texts} = {
+$self->{texts} = {

   'AP'                          => 'Einkauf',
   'AP Aging'                    => 'Offene Verbindlichkeiten',
   'AR'                          => 'Verkauf',
   'AP'                          => 'Einkauf',
   'AP Aging'                    => 'Offene Verbindlichkeiten',
   'AR'                          => 'Verkauf',


@@ -119,7 +119,7 @@ $self{texts} = {
   'Version'                     => 'Version',
 };
 
   'Version'                     => 'Version',
 };
 

-$self{subs} = {
+$self->{subs} = {

   'acc_menu'                    => 'acc_menu',
   'clock_line'                  => 'clock_line',
   'display'                     => 'display',
   'acc_menu'                    => 'acc_menu',
   'clock_line'                  => 'clock_line',
   'display'                     => 'display',

diff --git a/locale/de/oe b/locale/de/oe
index 3139fc9eeb24b5779b28607fe2cc52cd9a04937c..124ad05083ef2370d40adcf754787bedda9f667b 100644 (file)
--- a/locale/de/oe
+++ b/locale/de/oe
@@ -1,4 +1,4 @@
-$self{texts} = {
+$self->{texts} = {

   ' Date missing!'              => ' Datum fehlt!',
   ' missing!'                   => ' fehlt!',
   '*/'                          => '*/',
   ' Date missing!'              => ' Datum fehlt!',
   ' missing!'                   => ' fehlt!',
   '*/'                          => '*/',


@@ -236,7 +236,7 @@ $self{texts} = {
   'sent to printer'             => 'an Drucker geschickt',
 };
 
   'sent to printer'             => 'an Drucker geschickt',
 };
 

-$self{subs} = {
+$self->{subs} = {

   'acc_menu'                    => 'acc_menu',
   'add'                         => 'add',
   'add_transaction'             => 'add_transaction',
   'acc_menu'                    => 'acc_menu',
   'add'                         => 'add',
   'add_transaction'             => 'add_transaction',

diff --git a/locale/de/pe b/locale/de/pe
index d1544d1ad431e8a376239129707bd231b7199427..8728d9e7f5b174fa58de9327045ef3acc7281e8f 100644 (file)
--- a/locale/de/pe
+++ b/locale/de/pe
@@ -1,4 +1,4 @@
-$self{texts} = {
+$self->{texts} = {

   'Accounting Menu'             => 'Kontoverwaltung',
   'Add'                         => 'Erfassen',
   'Add Group'                   => 'Warengruppe erfassen',
   'Accounting Menu'             => 'Kontoverwaltung',
   'Add'                         => 'Erfassen',
   'Add Group'                   => 'Warengruppe erfassen',


@@ -31,7 +31,7 @@ $self{texts} = {
   'Save'                        => 'Speichern',
 };
 
   'Save'                        => 'Speichern',
 };
 

-$self{subs} = {
+$self->{subs} = {

   'acc_menu'                    => 'acc_menu',
   'add'                         => 'add',
   'continue'                    => 'continue',
   'acc_menu'                    => 'acc_menu',
   'add'                         => 'add',
   'continue'                    => 'continue',

diff --git a/locale/de/rc b/locale/de/rc
index 1f6f6597c550c44e4a69745330bccd69920e1942..9aa0a617d3fcb7170ade548d4488ce9920f7c714 100644 (file)
--- a/locale/de/rc
+++ b/locale/de/rc
@@ -1,4 +1,4 @@
-$self{texts} = {
+$self->{texts} = {

   'Account'                     => 'Konto',
   'Accounting Menu'             => 'Kontoverwaltung',
   'Balance'                     => 'Bilanz',
   'Account'                     => 'Konto',
   'Accounting Menu'             => 'Kontoverwaltung',
   'Balance'                     => 'Bilanz',


@@ -23,7 +23,7 @@ $self{texts} = {
   'Update'                      => 'Erneuern',
 };
 
   'Update'                      => 'Erneuern',
 };
 

-$self{subs} = {
+$self->{subs} = {

   'acc_menu'                    => 'acc_menu',
   'continue'                    => 'continue',
   'display'                     => 'display',
   'acc_menu'                    => 'acc_menu',
   'continue'                    => 'continue',
   'display'                     => 'display',

diff --git a/locale/de/rp b/locale/de/rp
index 4eb07d9293c74a8e24352469d08a96f186cbd89a..9030222dbe341e87a8ab8ce3e2dd3d207b7e721a 100644 (file)
--- a/locale/de/rp
+++ b/locale/de/rp
@@ -1,4 +1,4 @@
-$self{texts} = {
+$self->{texts} = {

   'AP Aging'                    => 'Offene Verbindlichkeiten',
   'AR Aging'                    => 'Offene Forderungen',
   'Account'                     => 'Konto',
   'AP Aging'                    => 'Offene Verbindlichkeiten',
   'AR Aging'                    => 'Offene Forderungen',
   'Account'                     => 'Konto',


@@ -122,7 +122,7 @@ $self{texts} = {
   'winston_export'              => 'Winston-Export',
 };
 
   'winston_export'              => 'Winston-Export',
 };
 

-$self{subs} = {
+$self->{subs} = {

   'acc_menu'                    => 'acc_menu',
   'add_transaction'             => 'add_transaction',
   'aging'                       => 'aging',
   'acc_menu'                    => 'acc_menu',
   'add_transaction'             => 'add_transaction',
   'aging'                       => 'aging',

diff --git a/locale/de/ustva b/locale/de/ustva
index ea3bfb84a497379ac2bcdb08fa953bd560180716..dff6c30f43a60f1efe115bcb3769b158313771a5 100644 (file)
--- a/locale/de/ustva
+++ b/locale/de/ustva
@@ -1,4 +1,4 @@
-$self{texts} = {
+$self->{texts} = {

   '1. Quarter'                  => '1. Quartal',
   '2. Quarter'                  => '2. Quartal',
   '3. Quarter'                  => '3. Quartal',
   '1. Quarter'                  => '1. Quartal',
   '2. Quarter'                  => '2. Quartal',
   '3. Quarter'                  => '3. Quartal',


@@ -116,7 +116,7 @@ $self{texts} = {
   'Öffnungszeiten'              => 'Öffnungszeiten',
 };
 
   'Öffnungszeiten'              => 'Öffnungszeiten',
 };
 

-$self{subs} = {
+$self->{subs} = {

   'add_transaction'             => 'add_transaction',
   'ap_transaction'              => 'ap_transaction',
   'ar_transaction'              => 'ar_transaction',
   'add_transaction'             => 'add_transaction',
   'ap_transaction'              => 'ap_transaction',
   'ar_transaction'              => 'ar_transaction',