Attachment 5262 Details for Bug 6458 – Proposed fix for admin/systempreferences.tt

[patch] Proposed fix for admin/systempreferences.tt

0001-Fix-for-Bug-6458-incorrect-parsing-systempreferences.patch (text/plain), 10.26 KB, created by Owen Leonard on 2011-09-01 14:56:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Owen Leonard

Created: 2011-09-01 14:56:36 UTC

Size: 10.26 KB

patch

obsolete

>From 8b24893ec85fe31b90b1b08cf6cec2eae7020a38 Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Thu, 1 Sep 2011 10:53:24 -0400
>Subject: [PATCH] Fix for Bug 6458 - incorrect parsing result in translation processing
>Content-Type: text/plain; charset="utf-8"
>
>Fixing improperly nested template logic inside HTML tags in the
>system preferences editor.
>---
> .../prog/en/modules/admin/systempreferences.tt     |   71 ++++++++++++++++----
> 1 files changed, 58 insertions(+), 13 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt
>index 2b7feff..18c0552 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt
>@@ -87,9 +87,11 @@
>     <div class="yui-b">
> 
> [% IF ( add_form ) %]
>-    
>-        <form action="[% script_name %]" name="Aform" method="post" [% IF ( type_upload ) %]enctype="multipart/form-data"[% END %]>
>-                
>+        [% IF ( type_upload ) %]
>+            <form action="[% script_name %]" name="Aform" method="post" enctype="multipart/form-data">
>+        [% ELSE %]
>+            <form action="[% script_name %]" name="Aform" method="post">
>+        [% END %]
>         <fieldset class="rows"><legend>
>         [% IF ( modify ) %]Modify
>         [% ELSE %]Add
>@@ -125,21 +127,41 @@
>             [% FOREACH sublanguages_loo IN languages_loo.sublanguages_loop %]<table><tr><td>
>                 [% IF ( sublanguages_loo.sublanguage_current ) %]
>                     <label for="[% sublanguages_loo.rfc4646_subtag %]">[% sublanguages_loo.native_description %] [% sublanguages_loo.script_description %] [% sublanguages_loo.region_description %] [% sublanguages_loo.variant_description %]([% sublanguages_loo.rfc4646_subtag %])
>-                    <input value="[% sublanguages_loo.rfc4646_subtag %]" name="value" id="[% sublanguages_loo.rfc4646_subtag %]" type="checkbox" [% IF ( sublanguages_loo.enabled ) %]checked="checked"[% END %] /> </label>
>+                    [% IF ( sublanguages_loo.enabled ) %]
>+                        <input value="[% sublanguages_loo.rfc4646_subtag %]" name="value" id="[% sublanguages_loo.rfc4646_subtag %]" type="checkbox" checked="checked" />
>+                    [% ELSE %]
>+                        <input value="[% sublanguages_loo.rfc4646_subtag %]" name="value" id="[% sublanguages_loo.rfc4646_subtag %]" type="checkbox" />
>+                    [% END %]
>+                    </label>
> 
>                 [% ELSE %]
>                     <label for="[% sublanguages_loo.rfc4646_subtag %]">[% sublanguages_loo.native_description %] [% sublanguages_loo.script_description %] [% sublanguages_loo.region_description %] [% sublanguages_loo.variant_description %]([% sublanguages_loo.rfc4646_subtag %])
>-                    <input value="[% sublanguages_loo.rfc4646_subtag %]" name="value" id="[% sublanguages_loo.rfc4646_subtag %]" type="checkbox" [% IF ( sublanguages_loo.enabled ) %]checked="checked"[% END %] /> </label>
>+                    [% IF ( sublanguages_loo.enabled ) %]
>+                        <input value="[% sublanguages_loo.rfc4646_subtag %]" name="value" id="[% sublanguages_loo.rfc4646_subtag %]" type="checkbox" checked="checked" />
>+                    [% ELSE %]
>+                        <input value="[% sublanguages_loo.rfc4646_subtag %]" name="value" id="[% sublanguages_loo.rfc4646_subtag %]" type="checkbox" />
>+                    [% END %]
>+                    </label>
>                 [% END %]</td></tr></table>
>             [% END %]
> 
>             [% ELSE %]
>                 [% IF ( languages_loo.current ) %]
>             <label for="[% languages_loo.rfc4646_subtag %]">[% languages_loo.native_description %]([% languages_loo.rfc4646_subtag %])
>-                    <input value="[% languages_loo.rfc4646_subtag %]" name="value" id="[% languages_loo.rfc4646_subtag %]" type="checkbox" [% IF ( languages_loo.group_enabled ) %]checked="checked"[% END %] /> </label>
>+                [% IF ( languages_loo.group_enabled ) %]
>+                    <input value="[% languages_loo.rfc4646_subtag %]" name="value" id="[% languages_loo.rfc4646_subtag %]" type="checkbox" checked="checked" />
>+                [% ELSE %]
>+                    <input value="[% languages_loo.rfc4646_subtag %]" name="value" id="[% languages_loo.rfc4646_subtag %]" type="checkbox" />
>+                [% END %]
>+                    </label>
>                 [% ELSE %]
>             <label for="[% languages_loo.rfc4646_subtag %]">[% languages_loo.native_description %]([% languages_loo.rfc4646_subtag %])
>-                    <input value="[% languages_loo.rfc4646_subtag %]" name="value" id="[% languages_loo.rfc4646_subtag %]" type="checkbox" [% IF ( languages_loo.group_enabled ) %]checked="checked"[% END %] /> </label>
>+                [% IF ( languages_loo.group_enabled ) %]
>+                    <input value="[% languages_loo.rfc4646_subtag %]" name="value" id="[% languages_loo.rfc4646_subtag %]" type="checkbox" checked="checked" />
>+                [% ELSE %]
>+                    <input value="[% languages_loo.rfc4646_subtag %]" name="value" id="[% languages_loo.rfc4646_subtag %]" type="checkbox" />
>+                [% END %]
>+                    </label>
>                 [% END %]
>             [% END %]
>         </td></tr>
>@@ -260,8 +282,11 @@
>         [% ELSE %]
>         <td>
>         [% END %]
>-            <form action="/cgi-bin/koha/admin/systempreferences.pl" method="post" [% IF ( loo.type_upload ) %]enctype="multipart/form-data"[% END %]>
>-
>+        [% IF ( loo.type_upload ) %]
>+            <form action="/cgi-bin/koha/admin/systempreferences.pl" method="post" enctype="multipart/form-data">
>+        [% ELSE %]
>+            <form action="/cgi-bin/koha/admin/systempreferences.pl" method="post">
>+        [% END %]
>                 [% IF ( loo.type_free ) %]
>                 <input type="text" name="value" size="[% loo.fieldlength %]" value="[% loo.value |html %]" />
>                 [% END %]
>@@ -293,21 +318,41 @@
>                     [% FOREACH sublanguages_loo IN languages_loo.sublanguages_loop %]<table><tr><td>
>                         [% IF ( sublanguages_loo.sublanguage_current ) %]
>                             <label for="[% sublanguages_loo.rfc4646_subtag %]">[% sublanguages_loo.native_description %] [% sublanguages_loo.script_description %] [% sublanguages_loo.region_description %] [% sublanguages_loo.variant_description %]([% sublanguages_loo.rfc4646_subtag %])
>-                            <input value="[% sublanguages_loo.rfc4646_subtag %]" name="value" id="[% sublanguages_loo.rfc4646_subtag %]" type="checkbox" [% IF ( sublanguages_loo.enabled ) %]checked="checked"[% END %] /> </label>
>+                            [% IF ( sublanguages_loo.enabled ) %]
>+                                <input value="[% sublanguages_loo.rfc4646_subtag %]" name="value" id="[% sublanguages_loo.rfc4646_subtag %]" type="checkbox" checked="checked" />
>+                            [% ELSE %]
>+                                <input value="[% sublanguages_loo.rfc4646_subtag %]" name="value" id="[% sublanguages_loo.rfc4646_subtag %]" type="checkbox" />
>+                            [% END %]
>+                            </label>
> 
>                         [% ELSE %]
>                             <label for="[% sublanguages_loo.rfc4646_subtag %]">[% sublanguages_loo.native_description %] [% sublanguages_loo.script_description %] [% sublanguages_loo.region_description %] [% sublanguages_loo.variant_description %]([% sublanguages_loo.rfc4646_subtag %])
>-                            <input value="[% sublanguages_loo.rfc4646_subtag %]" name="value" id="[% sublanguages_loo.rfc4646_subtag %]" type="checkbox" [% IF ( sublanguages_loo.enabled ) %]checked="checked"[% END %] /> </label>
>+                            [% IF ( sublanguages_loo.enabled ) %]
>+                                <input value="[% sublanguages_loo.rfc4646_subtag %]" name="value" id="[% sublanguages_loo.rfc4646_subtag %]" type="checkbox" checked="checked" />
>+                            [% ELSE %]
>+                                <input value="[% sublanguages_loo.rfc4646_subtag %]" name="value" id="[% sublanguages_loo.rfc4646_subtag %]" type="checkbox" />
>+                            [% END %]
>+                            </label>
>                         [% END %]</td></tr></table>
>                     [% END %]
> 
>                     [% ELSE %]
>                         [% IF ( languages_loo.current ) %]
>                     <label for="[% languages_loo.rfc4646_subtag %]">[% languages_loo.native_description %]([% languages_loo.rfc4646_subtag %])
>-                            <input value="[% languages_loo.rfc4646_subtag %]" name="value" id="opac[% languages_loo.rfc4646_subtag %]" type="checkbox" [% IF ( languages_loo.group_enabled ) %]checked="checked"[% END %] /> </label>
>+                        [% IF ( languages_loo.group_enabled ) %]
>+                            <input value="[% languages_loo.rfc4646_subtag %]" name="value" id="opac[% languages_loo.rfc4646_subtag %]" type="checkbox" checked="checked" />
>+                        [% ELSE %]
>+                            <input value="[% languages_loo.rfc4646_subtag %]" name="value" id="opac[% languages_loo.rfc4646_subtag %]" type="checkbox" />
>+                        [% END %]
>+                            </label>
>                         [% ELSE %]
>                     <label for="[% languages_loo.rfc4646_subtag %]">[% languages_loo.native_description %]([% languages_loo.rfc4646_subtag %])
>-                            <input value="[% languages_loo.rfc4646_subtag %]" name="value" id="opac[% languages_loo.rfc4646_subtag %]" type="checkbox" [% IF ( languages_loo.group_enabled ) %]checked="checked"[% END %] /> </label>
>+                        [% IF ( languages_loo.group_enabled ) %]
>+                            <input value="[% languages_loo.rfc4646_subtag %]" name="value" id="opac[% languages_loo.rfc4646_subtag %]" type="checkbox" checked="checked" />
>+                        [% ELSE %]
>+                            <input value="[% languages_loo.rfc4646_subtag %]" name="value" id="opac[% languages_loo.rfc4646_subtag %]" type="checkbox" />
>+                        [% END %]
>+                            </label>
>                         [% END %]
>                     [% END %]
>                 </td></tr>
>-- 
>1.7.3
>

Actions: View | Diff | Splinter Review

Attachments on bug 6458: 4695 | 4697 | 4699 | 4729 | 4968 | 5070 | 5071 | 5072 | 5074 | 5078 | 5079 | 5080 | 5081 | 5082 | 5090 | 5091 | 5092 | 5093 | 5094 | 5095 | 5096 | 5121 | 5125 | 5126 | 5127 | 5128 | 5129 | 5130 | 5131 | 5132 | 5133 | 5147 | 5148 | 5149 | 5150 | 5152 | 5153 | 5155 | 5156 | 5157 | 5158 | 5159 | 5160 | 5168 | 5169 | 5170 | 5258 | 5259 | 5260 | 5261 | 5262 | 5263 | 5273 | 5274 | 5286 | 5287 | 5288 | 5289 | 5292 | 5293 | 5299 | 5300 | 5416 | 5417 | 5418 | 5419 | 5420 | 5425 | 5426 | 5427