View | Details | Raw Unified | Return to bug 15717
Collapse All | Expand All

(-)a/C4/Installer.pm (-8 / +8 lines)
Lines 137-151 sub marc_framework_sql_list { Link Here
137
        map {
137
        map {
138
            my $name = substr( $_, 0, -4 );
138
            my $name = substr( $_, 0, -4 );
139
            open my $fh, "<:encoding(UTF-8)", "$dir/$requirelevel/$name.txt";
139
            open my $fh, "<:encoding(UTF-8)", "$dir/$requirelevel/$name.txt";
140
            my $lines = <$fh>;
140
            my $line = <$fh>;
141
            $lines =~ s/\n|\r/<br \/>/g;
141
            $line = Encode::encode('UTF-8', $line) unless ( Encode::is_utf8($line) );
142
            $lines = Encode::encode('UTF-8', $lines) unless ( Encode::is_utf8($lines) );
142
            my @lines = split /\n/, $line;
143
            my $mandatory = ($requirelevel =~ /(mandatory|requi|oblig|necess)/i);
143
            my $mandatory = ($requirelevel =~ /(mandatory|requi|oblig|necess)/i);
144
            push @frameworklist,
144
            push @frameworklist,
145
              {
145
              {
146
                'fwkname'        => $name,
146
                'fwkname'        => $name,
147
                'fwkfile'        => "$dir/$requirelevel/$_",
147
                'fwkfile'        => "$dir/$requirelevel/$_",
148
                'fwkdescription' => $lines,
148
                'fwkdescription' => \@lines,
149
                'checked'        => ( ( $frameworksloaded{$_} || $mandatory ) ? 1 : 0 ),
149
                'checked'        => ( ( $frameworksloaded{$_} || $mandatory ) ? 1 : 0 ),
150
                'mandatory'      => $mandatory,
150
                'mandatory'      => $mandatory,
151
              };
151
              };
Lines 214-228 sub sample_data_sql_list { Link Here
214
        map {
214
        map {
215
            my $name = substr( $_, 0, -4 );
215
            my $name = substr( $_, 0, -4 );
216
            open my $fh , "<:encoding(UTF-8)", "$dir/$requirelevel/$name.txt";
216
            open my $fh , "<:encoding(UTF-8)", "$dir/$requirelevel/$name.txt";
217
            my $lines = <$fh>;
217
            my $line = <$fh>;
218
            $lines =~ s/\n|\r/<br \/>/g;
218
            $line = Encode::encode('UTF-8', $line) unless ( Encode::is_utf8($line) );
219
            $lines = Encode::encode('UTF-8', $lines) unless ( Encode::is_utf8($lines) );
219
            my @lines = split /\n/, $line;
220
            my $mandatory = ($requirelevel =~ /(mandatory|requi|oblig|necess)/i);
220
            my $mandatory = ($requirelevel =~ /(mandatory|requi|oblig|necess)/i);
221
            push @frameworklist,
221
            push @frameworklist,
222
              {
222
              {
223
                'fwkname'        => $name,
223
                'fwkname'        => $name,
224
                'fwkfile'        => "$dir/$requirelevel/$_",
224
                'fwkfile'        => "$dir/$requirelevel/$_",
225
                'fwkdescription' => $lines,
225
                'fwkdescription' => \@lines,
226
                'checked'        => ( ( $frameworksloaded{$_} || $mandatory ) ? 1 : 0 ),
226
                'checked'        => ( ( $frameworksloaded{$_} || $mandatory ) ? 1 : 0 ),
227
                'mandatory'      => $mandatory,
227
                'mandatory'      => $mandatory,
228
              };
228
              };
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt (-3 / +6 lines)
Lines 117-123 Link Here
117
        </td>
117
        </td>
118
        <td>
118
        <td>
119
            <label for="[% framework.fwkname %]">
119
            <label for="[% framework.fwkname %]">
120
                [% framework.fwkdescription %]
120
                [% FOREACH description IN framework.fwkdescription %]
121
                    [% description %]<br />
122
                [% END %]
121
                <em>([% framework.fwkname %])</em>
123
                <em>([% framework.fwkname %])</em>
122
            </label>
124
            </label>
123
        </td>
125
        </td>
Lines 146-152 Link Here
146
        </td>
148
        </td>
147
        <td>
149
        <td>
148
            <label for="[% framework.fwkname %]">
150
            <label for="[% framework.fwkname %]">
149
                [% framework.fwkdescription %]
151
                [% FOREACH description IN framework.fwkdescription %]
152
                    [% description %]<br />
153
                [% END %]
150
                <em>([% framework.fwkname %])</em>
154
                <em>([% framework.fwkname %])</em>
151
            </label>
155
            </label>
152
        </td>
156
        </td>
153
- 

Return to bug 15717