From 6b432d2b213101d2e8d0bf41fbc4a0e5b4ecb4e1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marc=20V=C3=A9ron?= Date: Wed, 1 Jun 2016 16:41:55 +0200 Subject: [PATCH] Bug 16540 - Clean up opac-auth.tt for translatability This patch fixes translatability issues in opac-auth.tt (ugly translations caused by sentence splitting). It was necessary to change indentation to make the the file more readable and to make sure that changes have no side effects. The changes do not touch the overall functionallity. To test: - 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. UPDATE: Amended for comment #10 / mv Signed-off-by: Owen Leonard Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall --- .../bootstrap/en/modules/opac-auth.tt | 152 +++++++++--------- 1 file changed, 75 insertions(+), 77 deletions(-) diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt index 3b1aac31f1..75e5742524 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt @@ -30,7 +30,7 @@

Access denied

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.

[% END %] [% IF ( different_ip ) %]
-

You are logging from a different IP address. Please log in again.

+

You are logging from a different IP address. Please log in again.

[% END %] @@ -61,55 +61,50 @@ [% END %] [% IF ( shibbolethAuthentication ) %] - [% IF ( invalidShibLogin ) %] - -
-

- 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 %] -

-
- [% ELSE %] +
+ [% ELSE %]

Shibboleth Login

- -

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 ) %]

CAS login

-

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 %]

Local login

-

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.

+

Please click here to log in.

[% END %] [% IF ( casServersLoop ) %] - please choose against which one you would like to authenticate:

+

Please choose against which one you would like to authenticate:

[% END %] - [% ELSE %] + [% ELSE %]

CAS login

[% IF ( invalidCasLogin ) %] @@ -117,78 +112,81 @@

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:

[% END %] - [% END %] + [% END %] - [% IF ( shibbolethAuthentication ) %] + [% IF ( shibbolethAuthentication ) %]

Nothing

- [% ELSE %] + [% ELSE %]

Local login

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 ) %]

Google login

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 %] -
- [% ELSE %] - + [% IF SCO_login %] + + [% ELSE %] + + [% END %] + +
+ [% FOREACH INPUT IN INPUTS %] + [% END %] - -
- [% FOREACH INPUT IN INPUTS %] - - [% END %] - - - -
- - - [% IF Koha.Preference('OpacPasswordChange') && Koha.Preference('OpacResetPassword') %] - - [% END %] -
- [% IF Koha.Preference('NoLoginInstructions') %] - [% Koha.Preference('NoLoginInstructions') %] - [% ELSE %] -
Don't have a password yet?

If you don't have a password yet, stop by the circulation desk the next time you're in the library. We'll happily set one up for you.

-
Don't have a library card?

If you don't have a library card, stop by your local library to sign up.

- [% END # / IF Koha.Preference('NoLoginInstructions') %] - [% IF PatronSelfRegistration && PatronSelfRegistrationDefaultCategory %]You may register here.[% END %] + + + +
+ + + [% IF Koha.Preference('OpacPasswordChange') && Koha.Preference('OpacResetPassword') %] + + [% END %] +
+ [% IF Koha.Preference('NoLoginInstructions') %] + [% Koha.Preference('NoLoginInstructions') %] + [% ELSE %] +
Don't have a password yet?
+

If you don't have a password yet, stop by the circulation desk the next time you're in the library. We'll happily set one up for you.

+
Don't have a library card?
+

If you don't have a library card, stop by your local library to sign up.

+ [% END # / IF Koha.Preference('NoLoginInstructions') %] + + [% IF PatronSelfRegistration && PatronSelfRegistrationDefaultCategory %]You may register here. + [% END %] +
[% END # / IF loginprompt %] [% ELSE %]

Logging on to the catalog has not been enabled by the library.

    -
  • To report this error, you can email the Koha Administrator.
    • +
  • To report this error, you can email the Koha Administrator.Email
  • Use top menu bar to navigate to another part of Koha.
[% END # / IF opacuserlogin %] -- 2.39.5