From 226f83cbb916285b13eaa5b0ec7badb006b83fca Mon Sep 17 00:00:00 2001
From: Katrin Fischer <katrin.fischer.83@web.de>
Date: Sun, 5 Feb 2023 14:05:32 +0100
Subject: [PATCH] Bug 32567: (QA follow-up) Fix some labelling inconsistencies

This makes sure that the descriptions in the pull-downs always
match for selected/unselected.
This is not only for consistency, but will also ease translations
as simple things like an additional space will create a new
string to translate.

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
---
 .../value_builder/unimarc_field_100.tt        | 54 +++++++------------
 1 file changed, 20 insertions(+), 34 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_100.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_100.tt
index da7018d38a..103e8949cc 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_100.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_100.tt
@@ -50,11 +50,9 @@
                             [% END %]
 
                             [% IF ( f2f ) %]
-                                <option value="f" selected="selected">f - monograph, date of
-                                publication uncertain</option>
+                                <option value="f" selected="selected">f - monograph, date of publication uncertain</option>
                             [% ELSE %]
-                                <option value="f">f - monograph, date of
-                                publication uncertain</option>
+                                <option value="f">f - monograph, date of publication uncertain</option>
                             [% END %]
 
                             [% IF ( f2g ) %]
@@ -179,7 +177,7 @@
                             [% END %]
 
                             [% IF ( f6a ) %]
-                                <option value="a" selected="selected">a- juvenile, general </option>
+                                <option value="a" selected="selected">a- juvenile, general</option>
                             [% ELSE %]
                                 <option value="a">a- juvenile, general</option>
                             [% END %]
@@ -320,11 +318,9 @@
                             [% END %]
                             [% IF ( f8e ) %]
                                 <option value="e"
-                                    selected="selected">e- multi-local (interstate departments, etc. below the national
-                                    level)</option>
+                                    selected="selected">e- multi-local (interstate departments, etc. below the national level)</option>
                             [% ELSE %]
-                                <option value="e">e- multi-local (interstate departments, etc. below the national
-                                    level)</option>
+                                <option value="e">e- multi-local (interstate departments, etc. below the national level)</option>
                             [% END %]
 
                             [% IF ( f8f ) %]
@@ -491,12 +487,10 @@
                             [% END %]
 
                             [% IF ( f1211 ) %]
-                                <option value="11" selected="selected">11- ISO 5426-2 (Latin characters used in minor European
-                                    languages and obsolete typography)
+                                <option value="11" selected="selected">11- ISO 5426-2 (Latin characters used in minor European languages and obsolete typography)
                                 </option>
                             [% ELSE %]
-                                <option value="11">11- ISO 5426-2 (Latin characters used in minor European
-                                    languages and obsolete typography)
+                                <option value="11">11- ISO 5426-2 (Latin characters used in minor European languages and obsolete typography)
                                 </option>
                             [% END %]
 
@@ -572,17 +566,15 @@
                             [% END %]
 
                             [% IF ( f1311 ) %]
-                                <option value="11" selected="selected">11- ISO 5426-2 (Latin characters used in minor European
-                                    languages and obsolete typography)</option>
+                                <option value="11" selected="selected">11- ISO 5426-2 (Latin characters used in minor European languages and obsolete typography)</option>
                             [% ELSE %]
-                                <option value="11">11- ISO 5426-2 (Latin characters used in minor European
-                                    languages and obsolete typography)</option>
+                                <option value="11">11- ISO 5426-2 (Latin characters used in minor European languages and obsolete typography)</option>
                             [% END %]
 
                             [% IF ( f1350 ) %]
                                 <option value="50" selected="selected">50- ISO 10646 Level 3 (Unicode, UTF-8)</option>
                             [% ELSE %]
-                                <option value="50">ISO 10646 Level 3 (Unicode, UTF-8)</option>
+                                <option value="50">50- ISO 10646 Level 3 (Unicode, UTF-8)</option>
                             [% END %]
                         </select>
                     </td>
@@ -623,15 +615,13 @@
                             [% END %]
 
                             [% IF ( f15db ) %]
-                                <option value="db" selected="selected">db- Japanese -
-                                Kanji</option>
+                                <option value="db" selected="selected">db- Japanese - Kanji</option>
                             [% ELSE %]
                                 <option value="db">db- Japanese - Kanji</option>
                             [% END %]
 
                             [% IF ( f15dc ) %]
-                                <option value="dc" selected="selected">dc- Japanese -
-                                Kana</option>
+                                <option value="dc" selected="selected">dc- Japanese - Kana</option>
                             [% ELSE %]
                                 <option value="dc">dc- Japanese - Kana</option>
                             [% END %]
@@ -641,16 +631,14 @@
                                 <option value="ea">ea- Chinese</option>
                             [% END %]
                             [% IF ( f15eb ) %]
-                                <option value="eb" selected="selected">eb- Chinese -
-                                Han ideograms - simplified version</option>
+                                <option value="eb" selected="selected">eb- Chinese - Han ideograms (simplified version)</option>
                             [% ELSE %]
-                                <option value="eb">eb- Chinese han ideograms (simplified version)</option>
+                                <option value="eb">eb- Chinese - Han ideograms (simplified version)</option>
                             [% END %]
                             [% IF ( f15ec ) %]
-                                <option value="ec" selected="selected">ec- Chinese -
-                                Han ideograms - traditional version</option>
+                                <option value="ec" selected="selected">ec- Chinese - Han ideograms (traditional version)</option>
                             [% ELSE %]
-                                <option value="ec">ec- Chinese han ideograms (traditional version)</option>
+                                <option value="ec">ec- Chinese - Han ideograms (traditional version)</option>
                             [% END %]
                             [% IF ( f15ed ) %]
                                 <option value="ed" selected="selected">ed- Mongol biching</option>
@@ -668,14 +656,12 @@
                                 <option value="ef">ef- Yi</option>
                             [% END %]
                             [% IF ( f15eg ) %]
-                                <option value="eg" selected="selected">eg- Dongba -
-                                Naxi</option>
+                                <option value="eg" selected="selected">eg- Dongba (Naxi)</option>
                             [% ELSE %]
                                 <option value="eg">eg- Dongba (Naxi)</option>
                             [% END %]
                             [% IF ( f15eh ) %]
-                                <option value="eh" selected="selected">eh- Geba -
-                                Naxi</option>
+                                <option value="eh" selected="selected">eh- Geba (Naxi)</option>
                             [% ELSE %]
                                 <option value="eh">eh- Geba (Naxi)</option>
                             [% END %]
@@ -750,7 +736,7 @@
                                 <option value="mb">mb- Armenian</option>
                             [% END %]
                             [% IF ( f15nb ) %]
-                                <option value="nb" selected="selected">nb- Tifinagh</option>
+                                <option value="nb" selected="selected">nb- Tifinagh (Berber alphabet)</option>
                             [% ELSE %]
                                 <option value="nb">nb- Tifinagh (Berber alphabet)</option>
                             [% END %]
@@ -765,7 +751,7 @@
                                 <option value="oa">oa- Syriac</option>
                             [% END %]
                             [% IF ( f15pa ) %]
-                                <option value="pa" selected="selected">pa- Hieroglyphs</option>
+                                <option value="pa" selected="selected">pa- Hieroglyphs (Egypt)</option>
                             [% ELSE %]
                                 <option value="pa">pa- Hieroglyphs (Egypt)</option>
                             [% END %]