@@ -, +, @@ - Review code to verify that no functionality change is introduced and to verify that the text changes make sense. - Apply patch, verify that OPAC login page behaves as before. --- .../opac-tmpl/bootstrap/en/modules/opac-auth.tt | 152 ++++++++++----------- 1 file changed, 75 insertions(+), 77 deletions(-) --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt +++ a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt @@ -30,7 +30,7 @@
Sorry, the system doesn't think you have permission to access this page.
[% IF SCO_login %] -Logout and try again with a different user
+Log out and try again with a different user.
[% END %] [% END %] @@ -42,14 +42,14 @@ [% IF ( timed_out ) %]Sorry, your session has timed out. Please log in again.
+Sorry, your session has timed out. Please log in again.
You are logging from a different IP address. Please log in again.
+You are logging from a different IP address. Please log in again.
- Sorry, your Shibboleth identity does not match a valid library identity. + +
Sorry, your Shibboleth identity does not match a valid library identity.
[% IF ( casAuthentication ) %] - [% IF ( invalidCasLogin ) %] - -Sorry, the CAS login also failed, if you have a local login you may use that below.
- [% ELSE %] - If you have a CAS account, you may use that below. - [% END %] + [% IF ( invalidCasLogin ) %] + +Sorry, the CAS login also failed. If you have a local login you may use that below.
+ [% ELSE %] +If you have a CAS account, you may use that below.
+ [% END %] [% ELSE %] - If you have a local account, you may use that below. +If you have a local account, you may use that below.
[% END %] - -If you have a Shibboleth account, - please click here to login.
- [% END %] - [% IF ( casAuthentication ) %] +If you have a Shibboleth account, please click here to log in.
+ [% END %] + [% IF ( casAuthentication ) %]If you do not have a Shibboleth account, but you do have a CAS account, - [% ELSE %] +
If you do not have a Shibboleth account, but you do have a CAS account, you can use CAS.
+ [% ELSE %]If you do not have a Shibboleth account, but you do have a local login, then you may login below:
- [% END %] - +If you do not have a Shibboleth account, but you do have a local login, then you may login below.
[% END %] - [% IF ( casAuthentication ) %] - [% IF ( shibbolethAuthentication ) %] + [% END %] + + [% IF ( casAuthentication ) %] + [% IF ( shibbolethAuthentication ) %] [% IF ( casServerUrl ) %] - please click here to login.+
[% END %] [% IF ( casServersLoop ) %] - please choose against which one you would like to authenticate:
+Please choose against which one you would like to authenticate:
Sorry, the CAS login failed.
[% END %] -If you have a CAS account, [% IF ( casServerUrl ) %] - please click here to login.
+
If you have a CAS account, please click here to log in.
[% END %] [% IF ( casServersLoop ) %] - please choose against which one you would like to authenticate:
+If you have a CAS account, please choose against which one you would like to authenticate:
Nothing
- [% ELSE %] + [% ELSE %]If you do not have a CAS account, but do have a local account, you can still log in:
- [% END %] + [% END %] - [% END # / IF casAuthentication %] + [% END # / IF casAuthentication %] - [% IF ( Koha.Preference('GoogleOpenIDConnect') == 1 ) %] - [% IF ( invalidGoogleOpenIDConnectLogin ) %] + [% IF ( Koha.Preference('GoogleOpenIDConnect') == 1 ) %] + [% IF ( invalidGoogleOpenIDConnectLogin ) %]Sorry, your Google login failed. [% invalidGoogleOpenIDConnectLogin %]
Please note that the Google login will only work if you are using the e-mail address registered with this library.
If you want to, you can try to log in using a different account - [% END %] - Log in with Google -
If you do not have a Google account, but do have a local account, you can still log in:
- [% END %] + [% END %] + Log in with Google +If you do not have a Google account, but do have a local account, you can still log in:
+ [% END %] - [% IF SCO_login %] -