From 10b4930b2cd6881ffc39c58a5a531ec5ab22427b Mon Sep 17 00:00:00 2001
From: Thomas Heck <theck@linet-services.de>
Date: Mon, 4 Mar 2013 10:04:18 +0100
Subject: [PATCH] =?utf8?q?JS-=C3=9Cbersetzungen=20in=20den=20js-Ordner=20v?=
 =?utf8?q?erschoben?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 locale/de/js.js => js/locale/de.js | 0
 locale/de/all                      | 1 -
 scripts/locales.pl                 | 7 ++++++-
 3 files changed, 6 insertions(+), 2 deletions(-)
 rename locale/de/js.js => js/locale/de.js (100%)

diff --git a/locale/de/js.js b/js/locale/de.js
similarity index 100%
rename from locale/de/js.js
rename to js/locale/de.js
diff --git a/locale/de/all b/locale/de/all
index f606fad29..7b561143e 100644
--- a/locale/de/all
+++ b/locale/de/all
@@ -350,7 +350,6 @@ $self->{texts} = {
   'CSV import: projects'        => 'CSV-Import: Projekte',
   'CSV import: shipping addresses' => 'CSV-Import: Lieferadressen',
   'Calculate'                   => 'Berechnen',
-  'Calendar'                    => 'Kalender',
   'Can not create that quantity with current stock' => 'Diese Anzahl kann mit dem gegenwärtigen Lagerbestand nicht hergestellt werden.',
   'Cancel'                      => 'Abbrechen',
   'Cancel Accounts Payables Transaction' => 'Kreditorenbuchung stornieren',
diff --git a/scripts/locales.pl b/scripts/locales.pl
index 5e90423f4..b6cccf118 100755
--- a/scripts/locales.pl
+++ b/scripts/locales.pl
@@ -29,6 +29,7 @@ my $debug  = 0;
 
 parse_args();
 
+my $locale;
 my $basedir      = "../..";
 my $locales_dir  = ".";
 my $bindir       = "$basedir/bin/mozilla";
@@ -37,6 +38,7 @@ 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';
 my $submitsearch = qr/type\s*=\s*[\"\']?submit/i;
 our $self        = {};
 our $missing     = {};
@@ -139,7 +141,7 @@ generate_file(
   data_sub  => sub { _print_line($_, $self->{texts}{$_}, @_) for sort keys %alllocales },
 );
 
-open(my $js_file, '>:encoding(utf8)', $locales_dir .'/js.js') || die;
+open(my $js_file, '>:encoding(utf8)', $javascript_output_dir .'/locale/'. $locale .'js') || die;
 print $js_file '{';
 my $first_entry = 1;
 for my $key (sort(keys(%jslocale))) {
@@ -248,6 +250,9 @@ sub parse_args {
     my $ok  = 0;
     foreach my $dir ("../locale/$arg", "locale/$arg", "../$arg", $arg) {
       next unless -d $dir && -f "$dir/all" && -f "$dir/LANGUAGE";
+
+      $locale = $arg;
+
       $ok = chdir $dir;
       last;
     }
-- 
2.20.1