Die Sprachauswahl temporär deaktivieren und auf "Deutsch" hardcodieren.

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.

diff --git a/locale/de/all b/locale/de/all
index da1f6a9136aa515b906fdf0b4a6a53f41cb2f3db..984d0985ac190b5736c1f9fafdd75cf3bbb12015 100644 (file)
--- 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 ebe3a9905496256e420a9faba0409d7f4d698648..7ab87881289ad3d65deceb9a9fb22985bbfcf812 100644 (file)
--- 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 bb89a5a27dcf4307efc930752eedde04b8902675..ef9c3b66fe6c7603a6572e8a1a109e3e412916a3 100644 (file)
--- 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 417a52f8e92e7cfff789c6fe2d477e79bc369fd1..88c24b70cef4c609403f23ec35b61aad6e978885 100644 (file)
--- 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 08494352e428324d6c6f45f29b13533a4fbe11c3..43347ee044921389c8f8dbda32e117a988237bcf 100644 (file)
--- 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>