Bugzilla – Attachment 51351 Details for
Bug 16474
Standardize spelling of EDIFACT
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
[SIGNED-OFF]Bug 16474: Standardize spelling of EDIFACT
SIGNED-OFFBug-16474-Standardize-spelling-of-EDIFAC.patch (text/plain), 9.62 KB, created by
Héctor Eduardo Castro Avalos
on 2016-05-09 21:43:26 UTC
(
hide
)
Description:
[SIGNED-OFF]Bug 16474: Standardize spelling of EDIFACT
Filename:
MIME Type:
Creator:
Héctor Eduardo Castro Avalos
Created:
2016-05-09 21:43:26 UTC
Size:
9.62 KB
patch
obsolete
>From bc21787a609efd6ad33c60e38e8cdbd185431346 Mon Sep 17 00:00:00 2001 >From: Katrin Fischer <Katrin.Fischer.83@web.de> >Date: Sun, 8 May 2016 16:47:09 +0200 >Subject: [PATCH] [SIGNED-OFF]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 > >Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com> >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 @@ > <li><a href="/cgi-bin/koha/admin/currency.pl">Currencies</a></li> > [% END %] > [% IF CAN_user_acquisition_edi_manage %] >- <li><a href="/cgi-bin/koha/acqui/edifactmsgs.pl">Edifact Messages</a></li> >+ <li><a href="/cgi-bin/koha/acqui/edifactmsgs.pl">EDIFACT messages</a></li> > [% END %] > </ul> >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 2660a17..32d8973 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 %] > <div class="btn-group"><a href="/cgi-bin/koha/acqui/basket.pl?op=export&basketno=[% basketno %]&booksellerid=[% booksellerid %]" class="btn btn-small" id="exportbutton"><i class="fa fa-download"></i> Export this basket as CSV</a></div> > [% IF ediaccount %] >- <div class="btn-group"><a href="/cgi-bin/koha/acqui/edi_ean.pl?op=ediorder&basketno=[% basketno %]&booksellerid=[% booksellerid %]" class="btn btn-small" id="ediorderbutton"><i class="fa fa-download"></i> Create edifact order</a></div> >+ <div class="btn-group"><a href="/cgi-bin/koha/acqui/edi_ean.pl?op=ediorder&basketno=[% basketno %]&booksellerid=[% booksellerid %]" class="btn btn-small" id="ediorderbutton"><i class="fa fa-download"></i> Create EDIFACT order</a></div> > [% END %] > </div> > <!-- Modal for confirm deletion box--> >@@ -728,7 +728,7 @@ > <div id="closebasket_needsconfirmation" class="dialog alert"> > > <form action="/cgi-bin/koha/acqui/basket.pl"> >- <h1>Are you sure you want to generate an edifact order and close basket [% basketname|html %]?</h1> >+ <h1>Are you sure you want to generate an EDIFACT order and close basket [% basketname|html %]?</h1> > [% IF CAN_user_acquisition_group_manage %] > <p> > <label for="createbasketgroup">Attach this basket to a new basket group with the same name</label> >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) { > <div class="btn-group"><a href="[% script_name %]?op=reopen&basketgroupid=[% basketgroupid %]&booksellerid=[% booksellerid %]&mode=singlebg" class="btn btn-small" id="reopenbutton"><i class="fa fa-download"></i> Reopen this basket group</a></div> > <div class="btn-group"><a href="[% script_name %]?op=export&basketgroupid=[% basketgroupid %]&booksellerid=[% booksellerid %]" class="btn btn-small" id="exportbutton"><i class="fa fa-download"></i> Export this basket group as CSV</a></div> > <div class="btn-group"><a href="[% script_name %]?op=print&basketgroupid=[% basketgroupid %]&booksellerid=[% booksellerid %]" class="btn btn-small" id="printbutton"><i class="fa fa-download"></i> Print this basket group in PDF</a></div> >- <div class="btn-group"><a href="[% script_name %]?op=ediprint&basketgroupid=[% basketgroupid %]&booksellerid=[% booksellerid %]" class="btn btn-small" id="printbutton"><i class="fa fa-download"></i> Generate edifact order</a></div> >+ <div class="btn-group"><a href="[% script_name %]?op=ediprint&basketgroupid=[% basketgroupid %]&booksellerid=[% booksellerid %]" class="btn btn-small" id="printbutton"><i class="fa fa-download"></i> Generate EDIFACT order</a></div> > </div> > [% END %] > [% IF (name && closedbg) %] >@@ -381,7 +381,7 @@ function submitForm(form) { > <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="reopen" /><input type="hidden" name="booksellerid" value="[% basketgroup.booksellerid %]" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id %]" /><input type="submit" value="Reopen" /></form> > <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="print" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id %]" /><input type="submit" value="Export as PDF" /></form> > <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="export" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id %]" /><input type="submit" value="Export as CSV" /></form> >- <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="ediprint" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id %]" /><input type="submit" value="Generate edifact order" /></form> >+ <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="ediprint" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id %]" /><input type="submit" value="Generate EDIFACT order" /></form> > </td> > </tr> > [% 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() { > <div id="breadcrumbs"> > <a href="/cgi-bin/koha/mainpage.pl">Home</a> > › <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> >-› <a href="/cgi-bin/koha/acqui/edifactmsgs.pl">Edifact Messages</a> >+› <a href="/cgi-bin/koha/acqui/edifactmsgs.pl">EDIFACT messages</a> > </div> > > <div id="doc3" class="yui-t2"> >@@ -29,7 +29,7 @@ $(document).ready(function() { > <div class="yui-b"> > > >-<h1>Edifact Messages</h1> >+<h1>EDIFACT messages</h1> > <div id="acqui_edifactmsgs"> > > >@@ -70,7 +70,7 @@ $(document).ready(function() { > </td> > </td> > <td>[% msg.filename %]</td> >-<td><a class="popup" target="_blank" title="View Message" href="/cgi-bin/koha/acqui/edimsg.pl?id=[% msg.id %]"</a>View Message</td> >+<td><a class="popup" target="_blank" title="View Message" href="/cgi-bin/koha/acqui/edimsg.pl?id=[% msg.id %]"</a>View message</td> > <td> > <a href="/cgi-bin/koha/acqui/edifactmsgs.pl?op=delete&message_id=[% msg.id %]">Delete</a> > </td> >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' %] >-<title>Koha › Acquisitions › Edifact Message Display</title> >+<title>Koha › Acquisitions › EDIFACT message display</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > <body id="acq_edifactmsgs" class="acq"> >@@ -8,7 +8,7 @@ > <div id="breadcrumbs"> > <a href="/cgi-bin/koha/mainpage.pl">Home</a> > › <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> >-› <a href="/cgi-bin/koha/acqui/edifactmsgs.pl">Edifact Messages</a> >+› <a href="/cgi-bin/koha/acqui/edifactmsgs.pl">EDIFACT messages</a> > </div> > > <div id="doc3" class="yui-t2"> >-- >1.7.10.4
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 16474
:
51312
|
51351
|
51403