Bug 24870: Translate installer data label

This patch enable the translation of the
labels 'Mandatory' or 'Optional' present at install time
for groups of installer files.

To test:
1) Try install using de-DE language,
   at step3 verify 'Mandatory' and 'Optional'
   labels for marc21 or other data checklist
   Do not close this window!
2) Apply this patch
3) Update de-DE translation files, reinstall lang files
   cd misc/translator
   ./translate update de-DE
   ./translate install de-DE
4) Reload page at step3, now 'Mandatory' label
is translated to 'Pflichtfeld'
5) Verify strings in translation file
Search for
^msgid \"Mandatory\"
^msgid \"Optional\"
in po/de-DE-staff-prog.po.

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Signed-off-by: Joy Nelson <joy@bywatersolutions.com>
(cherry picked from commit 1adc4986e9d2f715f44ef4b99b5dece79845f885)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
(cherry picked from commit 42bc9671ca47272258cecde2abccdef521a58b56)

Signed-off-by: Hayley Mapley <hayleymapley@catalyst.net.nz>

diff --git a/C4/Installer.pm b/C4/Installer.pm
index b62f843..1b21660 100644 (file)
--- a/C4/Installer.pm
+++ b/C4/Installer.pm
@@ -169,7 +169,7 @@ sub marc_framework_sql_list {
           sort { $a->{'fwkname'} cmp $b->{'fwkname'} } @frameworklist;
 
         $cell{"frameworks"} = \@fwks;
-        $cell{"label"}      = ucfirst($requirelevel);
+        $cell{"label"}      = ($requirelevel =~ /(mandatory|requi|oblig|necess)/i)?'mandatory':'optional';
         $cell{"code"}       = lc($requirelevel);
         push @fwklist, \%cell;
     }
@@ -245,7 +245,7 @@ sub sample_data_sql_list {
         my @fwks = sort { $a->{'fwkname'} cmp $b->{'fwkname'} } @frameworklist;
 
         $cell{"frameworks"} = \@fwks;
-        $cell{"label"}      = ucfirst($requirelevel);
+        $cell{"label"}      = ($requirelevel =~ /(mandatory|requi|oblig|necess)/i)?'mandatory':'optional';
         $cell{"code"}       = lc($requirelevel);
         push @levellist, \%cell;
     }

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt
index 9f37a5a..d6bcaed 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt
@@ -88,7 +88,10 @@
                                 Defaulting to the frameworks supplied for English (en)<span></h4>
                             [% END %]
                             [% FOREACH frameworksloo IN frameworksloop %]
-                                <h4>[% frameworksloo.label | html %]</h4>
+                                [%- SWITCH frameworksloo.label -%]
+                                  [%- CASE 'mandatory' -%]<h4>Mandatory</h4>
+                                  [%- CASE 'optional'  -%]<h4>Optional</h4>
+                                [%- END -%]
 
                                 <div class="checkboxes">
 
@@ -125,7 +128,10 @@
                         [% END %]
 
                         [% FOREACH levelloo IN levelloop %]
-                            <h4>[% levelloo.label | html %]</h4>
+                            [%- SWITCH levelloo.label -%]
+                              [%- CASE 'mandatory' -%]<h4>Mandatory</h4>
+                              [%- CASE 'optional'  -%]<h4>Optional</h4>
+                            [%- END -%]
 
                             <div class="checkboxes">