[Koha-patches] [PATCH] bug 4921 moved language prefs to i18n-l10n tab

[Nicole Engard]

 opaclanguagesdisplay appeared in multiple tabs, now
only on 1. other language prefs were also moved to
internationalization tab.
---
 .../en/modules/admin/preferences/i18n-l10n.pref    |   42 ++++++++++++-------
 .../prog/en/modules/admin/preferences/opac.pref    |   10 -----
 .../en/modules/admin/preferences/staff-client.pref |    4 --
 3 files changed, 26 insertions(+), 30 deletions(-)

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..a319137 100644
--- 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
@@ -1,17 +1,27 @@
 I18N/L10N:
-    -
-        - Format dates like
-        - pref: dateformat
-          default: us
-          choices:
-              us: mm/dd/yyyy
-              metric: dd/mm/yyyy
-              iso: yyyy/mm/dd
-        - .
-    -
-        - pref: opaclanguagesdisplay
-          default: 0
-          choices:
-              yes: Allow
-              no: "Don't allow"
-        - patrons to change the language they see on the OPAC.
+    General:
+        -
+            - Format dates like
+            - pref: dateformat
+              default: us
+              choices:
+                  us: mm/dd/yyyy
+                  metric: dd/mm/yyyy
+                  iso: yyyy/mm/dd
+            - .
+    OPAC:
+        -
+            - pref: opaclanguagesdisplay
+              choices:
+                  yes: Allow
+                  no: "Don't allow"
+            - patrons to select their language on the OPAC.
+        -
+            - "Enable the following languages on the OPAC:"
+            - pref: opaclanguages
+              type: opac-languages
+    Staff Client:              
+        -
+            - "Enable the following languages on the staff interface:"
+            - pref: language
+              type: staff-languages             
\ No newline at end of file
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 e919dd1..c5d919c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
@@ -9,16 +9,6 @@ OPAC:
               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
               class: url
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 7d7135e..9f26ff1 100644
--- 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
@@ -8,10 +8,6 @@ Staff Client:
               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
               class: url
-- 
1.5.6.5