From 1df1278da05f11f07c7d5305223203ffb3610e12 Mon Sep 17 00:00:00 2001
From: Katrin Fischer <katrin.fischer.83@web.de>
Date: Sat, 30 Jul 2022 14:35:27 +0000
Subject: [PATCH] Bug 23538: (QA follow-up) Group system preferences into one
 entry

This makes the new perferences EmailPatronRegistrations and EmailAddressForPatronRegistrations
follow a little more closely the pattern set by the very similar
EmailPurchaseSuggestions and EmailAddressforSuggestions.

* Group both preferences into one entry
* Add line break between preferences
* Switch branch for library in pull down

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
---
 .../prog/en/modules/admin/preferences/acquisitions.pref      | 4 ++--
 .../prog/en/modules/admin/preferences/opac.pref              | 5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref
index fd9475d15e..bfe4f6e362 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref
@@ -107,9 +107,9 @@ Acquisitions:
               choices:
                   0: none
                   EmailAddressForSuggestions: EmailAddressForSuggestions
-                  BranchEmailAddress: email address of branch
+                  BranchEmailAddress: email address of library
                   KohaAdminEmailAddress: KohaAdminEmailAddress
-            - 'If you choose <a href="/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=EmailAddressForSuggestions">EmailAddressForSuggestions</a> you have to enter a valid email address:'
+            - '<br>If you choose <a href="/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=EmailAddressForSuggestions">EmailAddressForSuggestions</a> you have to enter a valid email address:'
             - pref: EmailAddressForSuggestions
               class: email
 
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 51e7b5d33c..7c3d2d2df9 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
@@ -872,10 +872,9 @@ OPAC:
               choices:
                   0: none
                   EmailAddressForPatronRegistrations: EmailAddressForPatronRegistrations
-                  BranchEmailAddress: email address of branch
+                  BranchEmailAddress: email address of library
                   KohaAdminEmailAddress: KohaAdminEmailAddress
-            - 'If you chooose <a href="/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=EmailAddressForPatronRegistrations">EmailAddressForPatronRegistrations</a> you have to enter a valid email address: '
-        -
+            - '<br>If you chooose <a href="/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=EmailAddressForPatronRegistrations">EmailAddressForPatronRegistrations</a> you have to enter a valid email address: '
             - pref: EmailAddressForPatronRegistrations
               class: email
 
-- 
2.20.1