From d9a06c94afa5361f9dc0ae201dac13fb5734fd00 Mon Sep 17 00:00:00 2001 From: Kyle M Hall <kyle@bywatersolutions.com> Date: Tue, 22 Oct 2013 12:55:02 -0400 Subject: [PATCH] Bug 8015: QA Followup * Add bug number to database update * Fix capitalization errors * Fix JavaScript string translation errors --- installer/data/mysql/updatedatabase.pl | 4 ++-- .../modules/tools/marc_modification_templates.tt | 20 ++++++++++---------- .../prog/en/modules/tools/tools-home.tt | 2 +- tools/marc_modification_templates.pl | 2 +- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 289d252..715ffd8 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -7306,7 +7306,7 @@ if ( CheckVersion($DBversion) ) { SetVersion($DBversion); } -$DBversion = "3.11.00.XXX"; +$DBversion = "3.13.00.XXX"; if (C4::Context->preference("Version") < TransformToNum($DBversion)) { $dbh->do("CREATE TABLE IF NOT EXISTS marc_modification_templates ( template_id int(11) NOT NULL auto_increment, @@ -7344,7 +7344,7 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) { $dbh->do("INSERT INTO permissions (module_bit, code, description) VALUES ('13', 'marc_modification_templates', 'Manage marc modification templates')"); - print "Upgrade to $DBversion done ( Added tables for MARC Modification Framework )\n"; + print "Upgrade to $DBversion done ( Bug 8015: Added tables for MARC Modification Framework )\n"; SetVersion($DBversion); } diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/marc_modification_templates.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/marc_modification_templates.tt index 1003271..899dec1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/marc_modification_templates.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/marc_modification_templates.tt @@ -141,7 +141,7 @@ function clearFormElements(divId) { } function confirmDelete() { - var agree = confirm("Are you sure you wish to delete this template?"); + var agree = confirm(_("Are you sure you wish to delete this template?")); return agree; } @@ -187,10 +187,10 @@ function editAction( mmta_id, ordering, action, field_number, from_field, from_s document.getElementById('description').value = description; window.modaction_legend_innerhtml = document.getElementById('modaction_legend').innerhtml; - document.getElementById('modaction_legend').innerhtml = "Edit Action " + ordering; + document.getElementById('modaction_legend').innerhtml = _("Edit action") + ordering; window.action_submit_value = document.getElementById('action_submit').value; - document.getElementById('action_submit').value = "Update Action"; + document.getElementById('action_submit').value = _("Update action"); show('cancel_edit'); } @@ -287,7 +287,7 @@ function setSelectByValue( selectId, value ) { <caption>Actions for this template</caption> <tr> - <th>Change Order</th> + <th>Change order</th> <th>Order</th> <th>Action</th> <th>Description</th> @@ -298,19 +298,19 @@ function setSelectByValue( selectId, value ) { [% FOREACH ActionsLoo IN ActionsLoop %] <tr> <td style="white-space:nowrap;"> - <a title="Move Action Up" href="marc_modification_templates.pl?op=move_action&where=up&template_id=[% ActionsLoo.template_id %]&mmta_id=[% ActionsLoo.mmta_id %]"> + <a title="Move action up" href="marc_modification_templates.pl?op=move_action&where=up&template_id=[% ActionsLoo.template_id %]&mmta_id=[% ActionsLoo.mmta_id %]"> <img src="[% interface %]/[% theme %]/img/go-up.png" border="0" alt="Go up" /> </a> - <a title="Move Action To Top" href="marc_modification_templates.pl?op=move_action&where=top&template_id=[% ActionsLoo.template_id %]&mmta_id=[% ActionsLoo.mmta_id %]"> + <a title="Move action to top" href="marc_modification_templates.pl?op=move_action&where=top&template_id=[% ActionsLoo.template_id %]&mmta_id=[% ActionsLoo.mmta_id %]"> <img src="[% interface %]/[% theme %]/img/go-top.png" border="0" alt="Go top" /> </a> - <a title="Move Action To Bottom" href="marc_modification_templates.pl?op=move_action&where=bottom&template_id=[% ActionsLoo.template_id %]&mmta_id=[% ActionsLoo.mmta_id %]"> + <a title="Move action to bottom" href="marc_modification_templates.pl?op=move_action&where=bottom&template_id=[% ActionsLoo.template_id %]&mmta_id=[% ActionsLoo.mmta_id %]"> <img src="[% interface %]/[% theme %]/img/go-bottom.png" border="0" alt="Go bottom" /> </a> - <a title="Move Action Down" href="marc_modification_templates.pl?op=move_action&where=down&template_id=[% ActionsLoo.template_id %]&mmta_id=[% ActionsLoo.mmta_id %]"> + <a title="Move action down" href="marc_modification_templates.pl?op=move_action&where=down&template_id=[% ActionsLoo.template_id %]&mmta_id=[% ActionsLoo.mmta_id %]"> <img src="[% interface %]/[% theme %]/img/go-down.png" border="0" alt="Go down" /> </a> </td> @@ -391,7 +391,7 @@ function setSelectByValue( selectId, value ) { <form method="post" action="/cgi-bin/koha/tools/marc_modification_templates.pl" id="add_action" > <a name="modaction"></a> <fieldset> - <legend id="modaction_legend">Add A New Action</legend> + <legend id="modaction_legend">Add a new action</legend> <select name="action" id="action" onchange="onActionChange(this);"> <option value="delete_field">Delete</option> @@ -468,7 +468,7 @@ function setSelectByValue( selectId, value ) { <input type="text" name="description" id="description" size="60" /> <br/><br/> - <input id="action_submit" type="submit" value="Add Action" /> <a href="#modaction" id="cancel_edit" onclick="cancelEditAction();" style="display:none;">Cancel</a> + <input id="action_submit" type="submit" value="Add action" /> <a href="#modaction" id="cancel_edit" onclick="cancelEditAction();" style="display:none;">Cancel</a> </fieldset> </form> diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt index 97cc29d..2e5bbcf 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt @@ -150,7 +150,7 @@ --> [% IF ( CAN_user_tools_marc_modification_templates ) %] - <dt><a href="/cgi-bin/koha/tools/marc_modification_templates.pl">MARC Modification Templates</a></dt> + <dt><a href="/cgi-bin/koha/tools/marc_modification_templates.pl">MARC modification templates</a></dt> <dd>Manage templates for modifying MARC records during import.</dd> [% END %] diff --git a/tools/marc_modification_templates.pl b/tools/marc_modification_templates.pl index e815f60..f9c3ee1 100755 --- a/tools/marc_modification_templates.pl +++ b/tools/marc_modification_templates.pl @@ -32,7 +32,7 @@ my $template_id = $cgi->param('template_id'); my ($template, $loggedinuser, $cookie) = get_template_and_user({ - template_name => "tools/marc_modification_templates.tmpl", + template_name => "tools/marc_modification_templates.tt", query => $cgi, type => "intranet", authnotrequired => 0, -- 1.7.2.5