From c7c7a09dc49483fa9b9eefb2a24d3bc4aaea5359 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Thu, 1 Sep 2011 10:53:24 -0400 Subject: [PATCH] Fix for Bug 6458 - incorrect parsing result in translation processing Fixing improperly nested template logic inside HTML tags in the system preferences editor. Signed-off-by: Katrin Fischer Signed-off-by: Chris Cormack --- .../en/modules/admin/systempreferences.tt | 71 +++++++++++++++---- 1 file 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 2b7feff3b6..18c05526d0 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 @@
[% IF ( add_form ) %] - -
- + [% IF ( type_upload ) %] + + [% ELSE %] + + [% END %]
[% IF ( modify ) %]Modify [% ELSE %]Add @@ -125,21 +127,41 @@ [% FOREACH sublanguages_loo IN languages_loo.sublanguages_loop %]
[% IF ( sublanguages_loo.sublanguage_current ) %] + [% IF ( sublanguages_loo.enabled ) %] + + [% ELSE %] + + [% END %] + [% ELSE %] + [% IF ( sublanguages_loo.enabled ) %] + + [% ELSE %] + + [% END %] + [% END %]
[% END %] [% ELSE %] [% IF ( languages_loo.current ) %] + [% IF ( languages_loo.group_enabled ) %] + + [% ELSE %] + + [% END %] + [% ELSE %] + [% IF ( languages_loo.group_enabled ) %] + + [% ELSE %] + + [% END %] + [% END %] [% END %] @@ -260,8 +282,11 @@ [% ELSE %] [% END %] - - + [% IF ( loo.type_upload ) %] + + [% ELSE %] + + [% END %] [% IF ( loo.type_free ) %] [% END %] @@ -293,21 +318,41 @@ [% FOREACH sublanguages_loo IN languages_loo.sublanguages_loop %]
[% IF ( sublanguages_loo.sublanguage_current ) %] + [% IF ( sublanguages_loo.enabled ) %] + + [% ELSE %] + + [% END %] + [% ELSE %] + [% IF ( sublanguages_loo.enabled ) %] + + [% ELSE %] + + [% END %] + [% END %]
[% END %] [% ELSE %] [% IF ( languages_loo.current ) %] + [% IF ( languages_loo.group_enabled ) %] + + [% ELSE %] + + [% END %] + [% ELSE %] + [% IF ( languages_loo.group_enabled ) %] + + [% ELSE %] + + [% END %] + [% END %] [% END %] -- 2.39.5