From a39f1ea0427f605c698dd6660024253a89b02204 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20V=C3=A9ron?= Date: Fri, 18 Dec 2015 16:01:12 +0100 Subject: [PATCH] Bug 15049: (followup) Add warning about "No active currency" Fix translatibiity issues and use include in admin/aqplan.tt as well. See comment #24 Signed-off-by: Jonathan Druart --- .../prog/en/includes/budgets-active-currency.inc | 2 +- .../intranet-tmpl/prog/en/modules/acqui/acqui-home.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt | 14 ++++++++------ 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-active-currency.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-active-currency.inc index fbaa7e8..1862059 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-active-currency.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-active-currency.inc @@ -6,7 +6,7 @@

No active currency is defined

[% IF CAN_user_parameters_parameters_remaining_permissions %] -

Please specify an active currency.

+

Please specify an active currency.

[% ELSE %]

Your administrator must specify an active currency.

[% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt index ab06267..82f201f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt @@ -101,7 +101,7 @@ $(document).ready(function() { [% INCLUDE 'budgets-active-currency.inc' hide = 'yes' %] [% UNLESS ( loop_budget ) %] [% IF ( CAN_user_acquisition_period_manage ) %] -
You must define a budget in Administration
+ [% ELSE %]
Your administrator must define a budget in Administration
[% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt index 9b2f2af..86a1962 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt @@ -85,13 +85,15 @@ [% IF ( budget_lines ) %] - [% IF ( currency ) %]

Currency = [% currency %]. - [% IF ( show_actual ) %] - Each cell contain both actual and estimated values. + [% IF ( currency ) %]

Currency = [% currency %]. + [% IF ( show_actual ) %] + Each cell contain both actual and estimated values. + [% ELSE %] + Cells contain estimated values only. + [% END %] +

[% ELSE %] - Cells contain estimated values only. - [% END %] -

[% ELSE %]

No active currency is defined

Please specify an active currency.

+ [% INCLUDE 'budgets-active-currency.inc' hide = 'yes' %] [% IF ( show_actual ) %]

Each cell contain both actual and estimated values.

[% ELSE %] -- 2.1.0