From d14f6a63c883476cf2dfe9c3a488759633fd45fe Mon Sep 17 00:00:00 2001
From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Fri, 2 Oct 2009 16:52:37 +0200
Subject: [PATCH] =?utf8?q?Sprachauswahl=20wieder=20zulassen,=20aber=20Fran?=
 =?utf8?q?z=C3=B6sisch=20deaktivieren,=20weil=20es=20nahezu=20komplett=20u?=
 =?utf8?q?n=C3=BCbersetzt=20ist.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 locale/de/all                                  | 1 -
 locale/fr/{LANGUAGE => LANGUAGE.deactivated}   | 0
 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 ++----
 6 files changed, 8 insertions(+), 17 deletions(-)
 rename locale/fr/{LANGUAGE => LANGUAGE.deactivated} (100%)

diff --git a/locale/de/all b/locale/de/all
index e04504e80..c9490043c 100644
--- a/locale/de/all
+++ b/locale/de/all
@@ -737,7 +737,6 @@ $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',
   'Greetings'                   => 'Anreden',
diff --git a/locale/fr/LANGUAGE b/locale/fr/LANGUAGE.deactivated
similarity index 100%
rename from locale/fr/LANGUAGE
rename to locale/fr/LANGUAGE.deactivated
diff --git a/templates/webpages/admin/edit_user_de.html b/templates/webpages/admin/edit_user_de.html
index 3dd35aa4f..12dcae8f0 100644
--- a/templates/webpages/admin/edit_user_de.html
+++ b/templates/webpages/admin/edit_user_de.html
@@ -126,12 +126,10 @@
       <tr>
        <th align="right">Sprache</th>
        <td>
-        Deutsch
-        <input type="hidden" name="countrycode" value="de">
-<!--        <select name="countrycode">
+        <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 53187ed67..6b67c394b 100644
--- a/templates/webpages/admin/edit_user_master.html
+++ b/templates/webpages/admin/edit_user_master.html
@@ -126,12 +126,10 @@
       <tr>
        <th align="right"><translate>Language</translate></th>
        <td>
-        <translate>German</translate>
-        <input type="hidden" name="countrycode" value="de">
-<!--        <select name="countrycode">
+        <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 fe1627e8a..82b4fb480 100644
--- a/templates/webpages/am/config_de.html
+++ b/templates/webpages/am/config_de.html
@@ -101,13 +101,11 @@
      <tr>
       <th align="right">Sprache</th>
       <td>
-       Deutsch
-       <input type="hidden" name="countrycode" value="de">
-<!--       <select name="countrycode">
+       <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 8b1a97fd8..2c7faafde 100644
--- a/templates/webpages/am/config_master.html
+++ b/templates/webpages/am/config_master.html
@@ -101,13 +101,11 @@
      <tr>
       <th align="right"><translate>Language</translate></th>
       <td>
-       <translate>German</translate>
-       <input type="hidden" name="countrycode" value="de">
-<!--       <select name="countrycode">
+       <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