bug 5050 move language prefs to I18N/L10N tab

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/i18n-l10n.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/i18n-l10n.pref
index f36a264..591e6ca 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/i18n-l10n.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/i18n-l10n.pref
@@ -8,6 +8,10 @@ I18N/L10N:
               metric: dd/mm/yyyy
               iso: yyyy/mm/dd
         - .
+    -
+        - "Enable the following languages on the staff interface:"
+        - pref: language
+          type: staff-languages
     -
         - pref: opaclanguagesdisplay
           default: 0
@@ -15,3 +19,7 @@ I18N/L10N:
               yes: Allow
               no: "Don't allow"
         - patrons to change the language they see on the OPAC.
+    -
+        - "Enable the following languages on the OPAC:"
+        - pref: opaclanguages
+          type: opac-languages

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
index c844df4..2619d8c 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
@@ -5,16 +5,6 @@ OPAC:
             - pref: opacthemes
               choices: opac-templates
             - theme on the OPAC.
-        -
-            - "Enable the following languages on the OPAC:"
-            - pref: opaclanguages
-              type: opac-languages
-        -
-            - pref: opaclanguagesdisplay
-              choices:
-                  yes: Allow
-                  no: "Don't allow"
-            - patrons to select their language on the OPAC.
         -
             - "The OPAC is located at http://"
             - pref: OPACBaseURL

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff-client.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff-client.pref
index 4abe419..324f8af 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff-client.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff-client.pref
@@ -5,10 +5,6 @@ Staff Client:
             - pref: template
               choices: staff-templates
             - theme on the staff interface.
-        -
-            - "Enable the following languages on the staff interface:"
-            - pref: language
-              type: staff-languages
         -
             - "The staff client is located at http://"
             - pref: staffClientBaseURL