From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Fri, 2 Oct 2009 14:52:37 +0000 (+0200)
Subject: Sprachauswahl wieder zulassen, aber Französisch deaktivieren, weil es nahezu komplett... 
X-Git-Tag: release-2.6.1beta1~256
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=d14f6a63c883476cf2dfe9c3a488759633fd45fe;p=kivitendo-erp.git

Sprachauswahl wieder zulassen, aber Französisch deaktivieren, weil es nahezu komplett unübersetzt ist.
---

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
deleted file mode 100644
index 744b2c3f1..000000000
--- a/locale/fr/LANGUAGE
+++ /dev/null
@@ -1 +0,0 @@
-French
diff --git a/locale/fr/LANGUAGE.deactivated b/locale/fr/LANGUAGE.deactivated
new file mode 100644
index 000000000..744b2c3f1
--- /dev/null
+++ b/locale/fr/LANGUAGE.deactivated
@@ -0,0 +1 @@
+French
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>