From e7fa9a265c0bbb5ed54de0d322e63c45b2efd709 Mon Sep 17 00:00:00 2001
From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Fri, 5 Jun 2009 11:59:56 +0000
Subject: [PATCH] =?utf8?q?Die=20Sprachauswahl=20tempor=C3=A4r=20deaktivier?=
 =?utf8?q?en=20und=20auf=20"Deutsch"=20hardcodieren.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Wird die Sprache von "Deutsch" auf eine beliebige andere umgestellt,
so bekommt man sofort Perl-Fehler wegen Objektzugriffe auf nicht
definierte Variablen. Der Grund ist, dass das anzulegende
Locale-Objekt halb leer ist und nicht die Iconv-Instanzen enthält.

Temporärer Fix für Bug 1037.
---
 locale/de/all                                  | 1 +
 templates/webpages/admin/edit_user_de.html     | 6 ++++--
 templates/webpages/admin/edit_user_master.html | 6 ++++--
 templates/webpages/am/config_de.html           | 6 ++++--
 templates/webpages/am/config_master.html       | 6 ++++--
 5 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/locale/de/all b/locale/de/all
index da1f6a913..984d0985a 100644
--- a/locale/de/all
+++ b/locale/de/all
@@ -728,6 +728,7 @@ $self->{texts} = {
   'General ledger and cash'     => 'Finanzbuchhaltung und Zahlungsverkehr',
   'General ledger corrections'  => 'Korrekturen im Hauptbuch',
   'Generic Tax Report'          => 'USTVA Bericht',
+  'German'                      => 'Deutsch',
   'Given Name'                  => 'Vorname',
   'Greeting'                    => 'Anrede',
   'Group'                       => 'Warengruppe',
diff --git a/templates/webpages/admin/edit_user_de.html b/templates/webpages/admin/edit_user_de.html
index ebe3a9905..7ab878812 100644
--- a/templates/webpages/admin/edit_user_de.html
+++ b/templates/webpages/admin/edit_user_de.html
@@ -126,10 +126,12 @@
       <tr>
        <th align="right">Sprache</th>
        <td>
-        <select name="countrycode">
+        Deutsch
+        <input type="hidden" name="countrycode" value="de">
+<!--        <select name="countrycode">
          [% FOREACH row = ALL_COUNTRYCODES %]<option value="[% HTML.escape(row.value) %]" [% IF row.selected %]selected[% END %]>[% HTML.escape(row.name) %]</option>
          [% END %]
-        </select>
+        </select>-->
        </td>
       </tr>
 
diff --git a/templates/webpages/admin/edit_user_master.html b/templates/webpages/admin/edit_user_master.html
index bb89a5a27..ef9c3b66f 100644
--- a/templates/webpages/admin/edit_user_master.html
+++ b/templates/webpages/admin/edit_user_master.html
@@ -126,10 +126,12 @@
       <tr>
        <th align="right"><translate>Language</translate></th>
        <td>
-        <select name="countrycode">
+        <translate>German</translate>
+        <input type="hidden" name="countrycode" value="de">
+<!--        <select name="countrycode">
          [% FOREACH row = ALL_COUNTRYCODES %]<option value="[% HTML.escape(row.value) %]" [% IF row.selected %]selected[% END %]>[% HTML.escape(row.name) %]</option>
          [% END %]
-        </select>
+        </select>-->
        </td>
       </tr>
 
diff --git a/templates/webpages/am/config_de.html b/templates/webpages/am/config_de.html
index 417a52f8e..88c24b70c 100644
--- a/templates/webpages/am/config_de.html
+++ b/templates/webpages/am/config_de.html
@@ -101,11 +101,13 @@
      <tr>
       <th align="right">Sprache</th>
       <td>
-       <select name="countrycode">
+       Deutsch
+       <input type="hidden" name="countrycode" value="de">
+<!--       <select name="countrycode">
         [%- FOREACH row = COUNTRYCODES %]
         <option value="[% HTML.escape(row.value) %]"[% IF row.selected %] selected[% END %]>[% HTML.escape(row.name) %]</option>
         [%- END %]
-       </select>
+       </select>-->
       </td>
      </tr>
 
diff --git a/templates/webpages/am/config_master.html b/templates/webpages/am/config_master.html
index 08494352e..43347ee04 100644
--- a/templates/webpages/am/config_master.html
+++ b/templates/webpages/am/config_master.html
@@ -101,11 +101,13 @@
      <tr>
       <th align="right"><translate>Language</translate></th>
       <td>
-       <select name="countrycode">
+       <translate>German</translate>
+       <input type="hidden" name="countrycode" value="de">
+<!--       <select name="countrycode">
         [%- FOREACH row = COUNTRYCODES %]
         <option value="[% HTML.escape(row.value) %]"[% IF row.selected %] selected[% END %]>[% HTML.escape(row.name) %]</option>
         [%- END %]
-       </select>
+       </select>-->
       </td>
      </tr>
 
-- 
2.20.1