From ea586bc61587aff1f281a027dfd956b0ae1e92a1 Mon Sep 17 00:00:00 2001 From: Katrin Fischer Date: Sun, 8 May 2016 16:47:09 +0200 Subject: [PATCH] Bug 16474: Standardize spelling of EDIFACT Some templates use Edifact and edifact. As EDIFACT is an abbreviation, we should spell it like one. To test: - Check templates for occurrences of EDIFACT - acquisitions navigation menu - basket page - basketgroup page - EDIFACT messages page - Verify changes are correct --- koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt | 6 +++--- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt | 4 ++-- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt | 6 +++--- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edimsg.tt | 4 ++-- 5 files changed, 11 insertions(+), 11 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 c33d6d4..f61dfa8 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc @@ -10,6 +10,6 @@
  • Currencies
  • [% END %] [% IF CAN_user_acquisition_edi_manage %] -
  • Edifact Messages
  • +
  • EDIFACT messages
  • [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt index d2f49ea..4c2c8b7 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt @@ -65,7 +65,7 @@ } function confirm_ediorder() { - var is_confirmed = confirm(_("Are you sure you want to close this basket and generate an Edifact order?")); + var is_confirmed = confirm(_("Are you sure you want to close this basket and generate an EDIFACT order?")); if (is_confirmed) { window.location = "/cgi-bin/koha/acqui/basket.pl?op=edi_confirm&basketno=[% basketno %]"; } @@ -198,7 +198,7 @@ [% END %]
    Export this basket as CSV
    [% IF ediaccount %] -
    Create edifact order
    +
    Create EDIFACT order
    [% END %] @@ -728,7 +728,7 @@
    -

    Are you sure you want to generate an edifact order and close basket [% basketname|html %]?

    +

    Are you sure you want to generate an EDIFACT order and close basket [% basketname|html %]?

    [% IF CAN_user_acquisition_group_manage %]

    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt index e4f7b75..100565c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt @@ -144,7 +144,7 @@ function submitForm(form) {

    - +
    [% END %] [% IF (name && closedbg) %] @@ -381,7 +381,7 @@ function submitForm(form) {
    -
    +
    [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt index daf8096..15ed26d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt @@ -19,7 +19,7 @@ $(document).ready(function() {
    @@ -29,7 +29,7 @@ $(document).ready(function() {
    -

    Edifact Messages

    +

    EDIFACT messages

    @@ -70,7 +70,7 @@ $(document).ready(function() { [% msg.filename %] -View Message +View message Delete diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edimsg.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edimsg.tt index 508ddc2..8f0dba4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edimsg.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edimsg.tt @@ -1,5 +1,5 @@ [% INCLUDE 'doc-head-open.inc' %] -Koha › Acquisitions › Edifact Message Display +Koha › Acquisitions › EDIFACT message display [% INCLUDE 'doc-head-close.inc' %] @@ -8,7 +8,7 @@
    -- 1.9.1