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 <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>

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 (file)
--- 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 @@
     <div class="dialog alert">
         <h3>No active currency is defined</h3>
         [% IF CAN_user_parameters_parameters_remaining_permissions %]
-            <p>Please <a href="/cgi-bin/koha/admin/currency.pl">specify an active currency</a>.</p>
+            <p><a href="/cgi-bin/koha/admin/currency.pl">Please specify an active currency.</a></p>
         [% ELSE %]
             <p>Your administrator must specify an active currency.</p>
         [% 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 (file)
--- 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 ) %]
-        <div class="dialog alert">You must <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">define a budget</a> in Administration</div>
+        <div class="dialog alert"><a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">You must define a budget in Administration</a></div>
         [% ELSE %]
         <div class="dialog alert">Your administrator must define a budget in Administration</div>
         [% 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 (file)
--- 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 ) %]<p><b>Currency = [% currency %]</b>.
-    [% IF ( show_actual ) %]
-        <b>Each cell contain both actual and estimated values.</b>
+    [% IF ( currency ) %]<p><b>Currency = [% currency %].</b>
+        [% IF ( show_actual ) %]
+            <b>Each cell contain both actual and estimated values.</b>
+        [% ELSE %]
+            <b>Cells contain estimated values only.</b>
+        [% END %]
+        </p>
     [% ELSE %]
-        <b>Cells contain estimated values only.</b>
-    [% END %]
-    </p>[% ELSE %]<div class="dialog alert"><h3>No active currency is defined</h3><p>Please <a href="/cgi-bin/koha/admin/currency.pl">specify an active currency</a>.</p></div>
+        [% INCLUDE 'budgets-active-currency.inc' hide = 'yes' %]
 [% IF ( show_actual ) %]
         <p><b>Each cell contain both actual and estimated values.</b></p>
     [% ELSE %]