From 2616faf1329fbe34401f353ad3ad6cc1a7d44cfb Mon Sep 17 00:00:00 2001 From: Nicole Engard Date: Wed, 3 Feb 2010 08:42:51 -0500 Subject: [PATCH] follow-up to bug 3854: resolve budget period language issues top level: "Root Budget" becomes "Budget" second level: "Budget" becomes "Fund" third level and below: "Sub-Budget" is also a "Fund", but for things like the "create sub-budget" link, they'll be changed to "create child fund". Signed-off-by: Galen Charlton --- .../prog/en/includes/acquisitions-menu.inc | 4 +- .../prog/en/includes/budgetperiods-admin.inc | 4 +- .../en/includes/budgets-admin-toolbar.inc | 12 +++--- .../prog/en/modules/acqui/acqui-home.tmpl | 4 +- .../prog/en/modules/acqui/basket.tmpl | 2 +- .../prog/en/modules/admin/admin-home.tmpl | 6 +-- .../en/modules/admin/aqbudgetperiods.tmpl | 40 +++++++++---------- .../prog/en/modules/admin/aqbudgets.tmpl | 36 ++++++++--------- .../prog/en/modules/admin/aqplan.tmpl | 19 ++++----- 9 files changed, 64 insertions(+), 63 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc index a02832e35d..75fd20f114 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc @@ -1,6 +1,6 @@ diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/budgetperiods-admin.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/budgetperiods-admin.inc index 368d6a8a65..2d4adefa7f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/budgetperiods-admin.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/budgetperiods-admin.inc @@ -29,8 +29,8 @@ //]]> diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-toolbar.inc index b364dabd90..f0c041cba2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-toolbar.inc @@ -20,8 +20,8 @@ function yuiToolbar() { var budgets_menu = [ - { text: _("New root budget"), url: "/cgi-bin/koha/admin/aqbudgetperiods.pl?op=add_form" }, - { text: _("New budget for ''"), url: "/cgi-bin/koha/admin/aqbudgets.pl?op=add_form&budget_period_id=" + { text: _("New budget"), url: "/cgi-bin/koha/admin/aqbudgetperiods.pl?op=add_form" }, + { text: _("New fund for ''"), url: "/cgi-bin/koha/admin/aqbudgets.pl?op=add_form&budget_period_id=" , disabled:true , disabled:true } @@ -32,8 +32,8 @@ var periods_menu = [ - { text: _("Edit root budget ''"), url: "/cgi-bin/koha/admin/aqbudgetperiods.pl?op=add_form&budget_period_id=" }, - { text: _("Duplicate root budget ''") } + { text: _("Edit budget ''"), url: "/cgi-bin/koha/admin/aqbudgetperiods.pl?op=add_form&budget_period_id=" }, + { text: _("Duplicate budget ''") } ] @@ -102,9 +102,9 @@ //]]> diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl index 697443317f..4760c9c8a0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl @@ -59,7 +59,7 @@ -

All available budgets for branch

+

All available funds for branch

@@ -70,7 +70,7 @@ - + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl index c04ad121ca..096bc710fc 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl @@ -183,7 +183,7 @@ - + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl index 7a07beae28..05ca4e4433 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl @@ -81,11 +81,11 @@
Currencies and exchange rates
Define currencies and exchange rates used for acquisitions.
-
Budgets, periods, planning
+
Budgets
Define your budgets
-
Root Budgets
-
Define your root budgets
+
Funds
+
Define funds within your budgets
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tmpl index c283dfccb5..85661f40c1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tmpl @@ -57,18 +57,18 @@ - Koha › Administration › Root Budgets + Koha › Administration › Budgets <!-- TMPL_IF name="add_form" -->› <!-- TMPL_IF name="budget_period_id" --> - Modify root budget'<!-- TMPL_VAR name="budget_period_id" -->' + Modify budget'<!-- TMPL_VAR name="budget_period_id" -->' <!-- TMPL_ELSE --> - Add root budget + Add budget <!-- /TMPL_IF --> <!-- /TMPL_IF --> <!-- TMPL_IF name="delete_confirm" -->› - Delete root budget '<!-- TMPL_VAR name="budget_period_description" -->'? + Delete budget '<!-- TMPL_VAR name="budget_period_description" -->'? <!-- /TMPL_IF --> <!-- TMPL_IF name="delete_confirmed" -->› Data Deleted @@ -94,30 +94,30 @@ <!-- add or modify a budget period --> <!-- ####################################### --> <!-- TMPL_IF name="add_form" --> - <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Root Budget</a> › + <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Budget</a> › <!-- TMPL_IF name="budget_period_id" --> - Modify root budget <!-- TMPL_VAR name="budget_period_description" --> + Modify budget <!-- TMPL_VAR name="budget_period_description" --> <!-- TMPL_ELSE --> - Add root budget + Add budget <!-- /TMPL_IF --> <!-- /TMPL_IF --> <!-- delete a budget period --> <!-- ################################ --> <!-- TMPL_IF name="delete_confirm" --> - <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Root budgets</a> › + <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Budgets</a> › <!-- TMPL_IF name="total" --> - Cannot delete root budget '<!-- TMPL_VAR name="budget_period_description" -->' + Cannot delete budget '<!-- TMPL_VAR name="budget_period_description" -->' <!-- TMPL_ELSE --> - Delete root budget '<!-- TMPL_VAR name="budget_period_description" -->'? + Delete budget '<!-- TMPL_VAR name="budget_period_description" -->'? <!-- /TMPL_IF --> <!-- /TMPL_IF --> <!-- display budget periods list --> <!-- ########################################## --> <!-- TMPL_IF name="else" --> - Root budgets administration + Budgets administration <!-- /TMPL_IF --> </div> @@ -132,9 +132,9 @@ <!-- add or modify a budget period --> <!-- TMPL_IF name="budget_period_id" --> - <h3>Modify root budget</h3> + <h3>Modify budget</h3> <!-- TMPL_ELSE --> - <h3>Add root budget</h3> + <h3>Add budget</h3> <!-- /TMPL_IF --> <form action="/cgi-bin/koha/admin/aqbudgetperiods.pl" name="f" method="post"> <fieldset class="rows"> @@ -225,12 +225,12 @@ <!-- TMPL_IF name="delete_confirm" --> <!-- TMPL_IF name="total" --> <div class="dialog message"> - <h3>Cannot delete root budget</h3> + <h3>Cannot delete budget</h3> <p><strong>This record is used <!-- TMPL_VAR name="total" --> times</strong> . Deletion is not possible.</p> <!-- TMPL_ELSE --> <div class="dialog alert"> - <h3>Delete root budget '<!-- TMPL_VAR name="budget_period_description" -->'?</h3> + <h3>Delete budget '<!-- TMPL_VAR name="budget_period_description" -->'?</h3> <!-- /TMPL_IF --> <!-- ############################################################# --> @@ -251,12 +251,12 @@ <!-- /TMPL_IF --> <!-- DEFAULT display budget periods list --> <!-- TMPL_IF name="else" --> - <h2>Root budgets administration</h2> + <h2>Budgets administration</h2> <!-- TMPL_IF name="cur" --><p><b>Currency = <!-- TMPL_VAR name="cur" --></b></p><!-- TMPL_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><!-- /TMPL_IF --> <table id="periodsh"> <thead> <tr> - <th>Root Budget Name</th> + <th>Budget Name</th> <th>Start Date</th> <th>End Date</th> <th>Active</th> @@ -272,7 +272,7 @@ <!-- TMPL_ELSE --> <tr class="highlight"> <!-- /TMPL_IF --> - <td><a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=<!-- TMPL_VAR name="budget_period_id" -->" title="View budgets for <!-- TMPL_VAR name="budget_period_description" -->"><!-- TMPL_VAR name="budget_period_description" --></a></td> + <td><a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=<!-- TMPL_VAR name="budget_period_id" -->" title="View funds for <!-- TMPL_VAR name="budget_period_description" -->"><!-- TMPL_VAR name="budget_period_description" --></a></td> <td><!-- TMPL_VAR name="budget_period_startdate" --></td> <td><!-- TMPL_VAR name="budget_period_enddate" --></td> <td><!-- TMPL_IF name="budget_period_active" --><span style="color:green;">Active</span> <!-- TMPL_ELSE --><!-- /TMPL_IF --> </td> @@ -281,12 +281,12 @@ <td> <a href="<!-- TMPL_VAR name="script_name" -->?op=add_form&budget_period_id=<!-- TMPL_VAR name="budget_period_id" escape="HTML" -->">Edit</a> <a href="<!-- TMPL_VAR name="script_name"-->?op=delete_confirm&budget_period_id=<!-- TMPL_VAR name="budget_period_id" -->">Delete</a> - <a href="/cgi-bin/koha/admin/aqbudgets.pl?op=add_form&budget_period_id=<!-- TMPL_VAR NAME="budget_period_id" -->">Add Budget</a> + <a href="/cgi-bin/koha/admin/aqbudgets.pl?op=add_form&budget_period_id=<!-- TMPL_VAR NAME="budget_period_id" -->">Add Fund</a> </td> </tr> <!-- /TMPL_LOOP --> <!-- TMPL_UNLESS NAME="period_loop" --> - <tr><td colspan="7">No root budget</td></tr> + <tr><td colspan="7">No budget</td></tr> <!-- /TMPL_UNLESS --> </tbody> </table> diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tmpl index 96b79a2215..1de452f214 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tmpl @@ -1,5 +1,5 @@ <!-- TMPL_INCLUDE NAME="doc-head-open.inc" --> -<title>Koha › Administration › Budgets<!-- TMPL_IF name="add_form" --> › <!--TMPL_IF NAME="budget_id" -->Modify Budget<!-- TMPL_IF NAME="budget_name" --> '<!-- TMPL_VAR NAME="budget_name" -->'<!-- /TMPL_IF --><!-- TMPL_ELSE -->Add Budget <!-- /TMPL_IF --><!-- /TMPL_IF --> +Koha › Administration › Funds<!-- TMPL_IF name="add_form" --> › <!--TMPL_IF NAME="budget_id" -->Modify Fund<!-- TMPL_IF NAME="budget_name" --> '<!-- TMPL_VAR NAME="budget_name" -->'<!-- /TMPL_IF --><!-- TMPL_ELSE -->Add Fund <!-- /TMPL_IF --><!-- /TMPL_IF --> @@ -141,9 +141,9 @@ + AdministrationBudgets › Funds for '' + ">Funds › Modify fund ''Add fund + Funds › Delete fund?
@@ -155,12 +155,12 @@

No active currency is defined

Please specify an active currency.

-

Budgets for ''

+

Funds for ''

BudgetFund Owner Branch AmountEst. Qty. TotalBudgetFund Modify
- - + + @@ -206,13 +206,13 @@ - +
Budget hierarchyBudget nameFund codeFund name Total
allocated
Base-level
allocated
Base-level
spent
&budget_period_id=" >Edit &budget_period_id=">Delete - &budget_period_id=">Add Sub-Budget + &budget_period_id=">Add Child Fund
No budget found
No fund found
@@ -227,9 +227,9 @@
- ModifyAdd Budget + ModifyAdd Fund - for period + for Budget '' @@ -238,19 +238,19 @@
  1. - Budget Parent: + Fund Parent: - " />
  2. - + " size="30" />
  3. - + " size="60" />
  4. @@ -350,10 +350,10 @@ -

    Delete Budget ?

    +

    Delete Fund ?

    - +
    Budget Amount:Fund Amount:
    @@ -376,7 +376,7 @@
    -

    Budget filters

    +

    Fund filters

    1. @@ -389,7 +389,7 @@
    2. - + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tmpl index 28235184cf..3660b0fb7c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tmpl @@ -79,7 +79,7 @@ YAHOO.util.Event.onAvailable("popmenu", function () { -Budget planning +Budget & Fund Planning @@ -89,7 +89,8 @@ Budget planning @@ -114,7 +115,7 @@ Budget planning - + @@ -129,7 +130,7 @@ Budget planning - + @@ -160,8 +161,8 @@ Budget planning - - + + @@ -177,10 +178,10 @@ Budget planning - + + + @@ -294,7 +295,7 @@ Budget planning -No budgets to display for this search criteria +No funds to display for this search criteria -- 2.39.5
      Budget nameBudget totalFund nameFund total Budget remaining Fund remaining - +