Sprachauswahl wieder zulassen, aber Französisch deaktivieren, weil es nahezu komplett...

diff --git a/locale/de/all b/locale/de/all
index e04504e80b3a49fd7a8257f8ffa12e4969e6ac5d..c9490043c5900b0d5300674f521941cc37f97af9 100644 (file)
--- 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',
   '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',
   'Given Name'                  => 'Vorname',
   'Greeting'                    => 'Anrede',
   'Greetings'                   => 'Anreden',

diff --git a/locale/fr/LANGUAGE b/locale/fr/LANGUAGE
deleted file mode 100644 (file)
index 744b2c3..0000000
--- 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 (file)
index 0000000..744b2c3
--- /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 3dd35aa4f4ab770479782f3e786a38268e26f7f5..12dcae8f0808745b3973e25e6f8eaf5b1c354492 100644 (file)
--- 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>
       <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 %]
          [% 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>
 
        </td>
       </tr>
 

diff --git a/templates/webpages/admin/edit_user_master.html b/templates/webpages/admin/edit_user_master.html
index 53187ed677dfc27ec120d49da5383613a57dabaa..6b67c394b3644400d841cc0833c0a1d67561f69e 100644 (file)
--- 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>
       <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 %]
          [% 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>
 
        </td>
       </tr>
 

diff --git a/templates/webpages/am/config_de.html b/templates/webpages/am/config_de.html
index fe1627e8ae01a92c741b4a2f45a2bc77364f4f23..82b4fb48086041d75c7c4c6fd44aa78d57fb117f 100644 (file)
--- 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>
      <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 %]
         [%- FOREACH row = COUNTRYCODES %]
         <option value="[% HTML.escape(row.value) %]"[% IF row.selected %] selected[% END %]>[% HTML.escape(row.name) %]</option>
         [%- END %]

-       </select>-->
+       </select>

       </td>
      </tr>
 
       </td>
      </tr>
 

diff --git a/templates/webpages/am/config_master.html b/templates/webpages/am/config_master.html
index 8b1a97fd823d8acba1c633d18fc93de018abacbd..2c7faafde8eb5077f4d9e6279c55d116aa8debbf 100644 (file)
--- 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>
      <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 %]
         [%- FOREACH row = COUNTRYCODES %]
         <option value="[% HTML.escape(row.value) %]"[% IF row.selected %] selected[% END %]>[% HTML.escape(row.name) %]</option>
         [%- END %]

-       </select>-->
+       </select>

       </td>
      </tr>
 
       </td>
      </tr>