Bugzilla – Attachment 46324 Details for
Bug 15288
Error pages: Code duplication removal and better translatability
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 15288: (followup) Better wording for OPAC error page
Bug-15288-followup-Better-wording-for-OPAC-error-p.patch (text/plain), 4.20 KB, created by
Marcel de Rooy
on 2016-01-06 13:03:52 UTC
(
hide
)
Description:
Bug 15288: (followup) Better wording for OPAC error page
Filename:
MIME Type:
Creator:
Marcel de Rooy
Created:
2016-01-06 13:03:52 UTC
Size:
4.20 KB
patch
obsolete
>From abc34921c5f575b633629295e01c245b3f68196b Mon Sep 17 00:00:00 2001 >From: =?utf-8?q?Marc=20V=C3=A9ron?= <veron@veron.ch> >Date: Wed, 6 Jan 2016 06:35:35 +0100 >Subject: [PATCH] Bug 15288: (followup) Better wording for OPAC error page >Content-Type: text/plain; charset=utf-8 > >This patch changes the wording of the OPAC error page (See Bug 14573). > >Additionally, it displays the link to the login page only if the system >preference 'opacuserlogin' is set. > >To test: >- Apply patch >- Review koha-tmpl/opac-tmpl/bootstrap/en/modules/errors/errorpage.tt > >Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> >No errors > >Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> >Amended: Replaced following reasons by 'the following reasons'. Reads better. >--- > .../bootstrap/en/modules/errors/errorpage.tt | 19 +++++++++---------- > 1 file changed, 9 insertions(+), 10 deletions(-) > >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/errors/errorpage.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/errors/errorpage.tt >index 63ede2d..bfd6275 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/errors/errorpage.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/errors/errorpage.tt >@@ -1,4 +1,4 @@ >-NCLUDE 'doc-head-open.inc' %] >+[% INCLUDE 'doc-head-open.inc' %] > <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › An error has occurred</title> > [% INCLUDE 'doc-head-close.inc' %] > [% BLOCK cssinclude %][% END %] >@@ -27,23 +27,22 @@ NCLUDE 'doc-head-open.inc' %] > <div id="errormsg[% errno %]"> > <h3>Sorry, the requested page is not available</h3> > <h4>Error [% errno %]</h4> >- <h3>This message can have following reason(s)</h3> >+ <h3>This message can have the following reason(s):</h3> > <ul> > [% IF ( errno == 400 ) %] >- <li>Koha is pointed an invalid link.</li> >+ <li>The link is broken and the page does not exist.</li> > [% END %] > > [% IF ( errno == 401 ) %] >- <li>You are trying to access a link that you're not authorized to see.</li> >- <li>Try logging in to the catalog.</li> >+ <li>You are not authorized to view this page.</li> > [% END %] > > [% IF ( errno == 402 ) %] >- <li>Koha is pointed an invalid link.</li> >+ <li>The link is invalid.</li> > [% END %] > > [% IF ( errno == 403 ) %] >- <li>You are forbidden for some reason to see this page.</li> >+ <li>You are forbidden to view this page.</li> > [% END %] > > [% IF ( errno == 404 ) %] >@@ -53,13 +52,13 @@ NCLUDE 'doc-head-open.inc' %] > <li>An internal link in our catalog home page is broken and the page does not exist.</li> > [% END %] > [% IF ( errno == 500 ) %] >- <li>An error occurred while try to process your request.</li> >+ <li>An error occurred while processing your request.</li> > [% END %] > </ul> > <h3>What's next?</h3> > <ul> >- [% IF ( errno == 401 ) %] >- <li>Try logging in to the catalog.</li> >+ [% IF ( errno == 401 ) && ( Koha.Preference( 'opacuserlogin' ) == 1 ) %] >+ <li>Please log in to the catalog and try again. <a href="/cgi-bin/koha/opac-user.pl">Login page</a></li> > [% END %] > <li>You can use the menu and links at the top of the page</li> > <li>You can search our catalog using the search form at the top of this page.</li> >-- >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 15288
:
45354
|
45355
|
45356
|
45357
|
45396
|
45422
|
45424
|
45425
|
45426
|
46303
|
46316
|
46322
|
46323
| 46324 |
47464
|
48476