From 51d37411237f98d48ee42e41a28e48fcc68451dc Mon Sep 17 00:00:00 2001 From: Xavier Guimard Date: Sun, 10 Apr 2016 06:28:56 +0000 Subject: [PATCH] Adapt templates to new translation (#595) --- .../example/skins/bootstrap/checklogins.tpl | 2 +- .../example/skins/bootstrap/confirm.tpl | 12 +++---- .../example/skins/bootstrap/customfooter.tpl | 4 +-- .../example/skins/bootstrap/error.tpl | 12 +++---- .../example/skins/bootstrap/header.tpl | 2 +- .../example/skins/bootstrap/info.tpl | 8 ++--- .../example/skins/bootstrap/login.tpl | 8 ++--- .../example/skins/bootstrap/mail.tpl | 34 +++++++++---------- .../example/skins/bootstrap/menu.tpl | 20 +++++------ .../example/skins/bootstrap/notification.tpl | 4 +-- .../example/skins/bootstrap/openid.tpl | 4 +-- .../example/skins/bootstrap/openidform.tpl | 4 +-- .../example/skins/bootstrap/password.tpl | 8 ++--- .../example/skins/bootstrap/register.tpl | 30 +++++++--------- .../example/skins/bootstrap/standardform.tpl | 10 +++--- .../example/skins/bootstrap/yubikeyform.tpl | 4 +-- .../example/skins/common/mail_confirm.tpl | 4 +-- .../example/skins/common/mail_footer.tpl | 4 +-- .../example/skins/common/mail_password.tpl | 6 ++-- .../skins/common/mail_register_confirm.tpl | 4 +-- .../skins/common/mail_register_done.tpl | 8 ++--- .../example/skins/common/redirect.tpl | 10 +++--- 22 files changed, 99 insertions(+), 103 deletions(-) diff --git a/lemonldap-ng-portal/example/skins/bootstrap/checklogins.tpl b/lemonldap-ng-portal/example/skins/bootstrap/checklogins.tpl index da71dd5a0..134a97e4c 100644 --- a/lemonldap-ng-portal/example/skins/bootstrap/checklogins.tpl +++ b/lemonldap-ng-portal/example/skins/bootstrap/checklogins.tpl @@ -3,7 +3,7 @@
diff --git a/lemonldap-ng-portal/example/skins/bootstrap/confirm.tpl b/lemonldap-ng-portal/example/skins/bootstrap/confirm.tpl index 92661508a..cb2b3076a 100644 --- a/lemonldap-ng-portal/example/skins/bootstrap/confirm.tpl +++ b/lemonldap-ng-portal/example/skins/bootstrap/confirm.tpl @@ -19,9 +19,9 @@

- + Select your Identity Provider - + Confirmation

@@ -52,7 +52,7 @@
@@ -62,7 +62,7 @@
-

+

Automatically accept in 5 seconds

- + Service provided by LemonLDAP::NG - . + free software covered by the GPL license.

diff --git a/lemonldap-ng-portal/example/skins/bootstrap/error.tpl b/lemonldap-ng-portal/example/skins/bootstrap/error.tpl index 8c83920bd..7a92ce0a7 100644 --- a/lemonldap-ng-portal/example/skins/bootstrap/error.tpl +++ b/lemonldap-ng-portal/example/skins/bootstrap/error.tpl @@ -4,19 +4,19 @@
- + You have no access authorization for this application
- + Error occurs on the server
- + This application is in maintenance, please try to connect later
@@ -24,7 +24,7 @@
- + You were redirect from ">
@@ -32,12 +32,12 @@
" class="btn btn-primary" role="button"> - + Go to portal " class="btn btn-danger" role="button"> - + Logout
diff --git a/lemonldap-ng-portal/example/skins/bootstrap/header.tpl b/lemonldap-ng-portal/example/skins/bootstrap/header.tpl index 72dfbd726..d408b1289 100644 --- a/lemonldap-ng-portal/example/skins/bootstrap/header.tpl +++ b/lemonldap-ng-portal/example/skins/bootstrap/header.tpl @@ -1,7 +1,7 @@ - <lang en="Authentication portal" fr="Portail d'authentification"/> + Authentication portal diff --git a/lemonldap-ng-portal/example/skins/bootstrap/info.tpl b/lemonldap-ng-portal/example/skins/bootstrap/info.tpl index 175892a45..db691b468 100644 --- a/lemonldap-ng-portal/example/skins/bootstrap/info.tpl +++ b/lemonldap-ng-portal/example/skins/bootstrap/info.tpl @@ -9,23 +9,23 @@
-

+

Information

-

+

You'll be redirected in 10 seconds

diff --git a/lemonldap-ng-portal/example/skins/bootstrap/login.tpl b/lemonldap-ng-portal/example/skins/bootstrap/login.tpl index 75855c2bc..e9a3e1e7f 100644 --- a/lemonldap-ng-portal/example/skins/bootstrap/login.tpl +++ b/lemonldap-ng-portal/example/skins/bootstrap/login.tpl @@ -79,7 +79,7 @@
@@ -161,7 +161,7 @@
@@ -188,7 +188,7 @@ " class="btn btn-primary" role="button">   - + Go to portal @@ -199,7 +199,7 @@
" class="btn btn-danger" role="button"> &nbps; - + Logout
diff --git a/lemonldap-ng-portal/example/skins/bootstrap/mail.tpl b/lemonldap-ng-portal/example/skins/bootstrap/mail.tpl index 695d79f18..08a2007da 100644 --- a/lemonldap-ng-portal/example/skins/bootstrap/mail.tpl +++ b/lemonldap-ng-portal/example/skins/bootstrap/mail.tpl @@ -18,11 +18,11 @@ " value="" /> -

+

Forgot your password?

- " class="form-control" placeholder="" required /> + " class="form-control" trplaceholder="mail" required />
@@ -38,7 +38,7 @@ @@ -58,25 +58,25 @@ " name="mail"> -

+

Resend confirmation mail?

- + A password reset request was already issued on . - + Do you want the confirmation mail to be resent?

@@ -98,28 +98,28 @@ " /> -

+

Change your password

- " /> +
- " /> +
@@ -132,10 +132,10 @@ @@ -157,7 +157,7 @@
?skin=" class="btn btn-primary" role="button"> - + Go back to portal
diff --git a/lemonldap-ng-portal/example/skins/bootstrap/menu.tpl b/lemonldap-ng-portal/example/skins/bootstrap/menu.tpl index 9e5c4f363..5ac2c2119 100644 --- a/lemonldap-ng-portal/example/skins/bootstrap/menu.tpl +++ b/lemonldap-ng-portal/example/skins/bootstrap/menu.tpl @@ -36,32 +36,32 @@
  • /common/application_cascade.png" width="16" height="16" alt="appslist" /> - + Your applications
  • /common/vcard_edit.png" width="16" height="16" alt="password" /> - + Password
  • /common/calendar.png" width="16" height="16" alt="login history" /> - + Login history
  • /common/door_out.png" width="16" height="16" alt="logout" /> - + Logout
    • -

    +

    Connected as

    @@ -152,7 +152,7 @@
    -

    +

    Change your password

    @@ -166,7 +166,7 @@
    -

    +

    Last logins

    @@ -176,7 +176,7 @@
    -

    +

    Last failed logins

    @@ -190,12 +190,12 @@
    -

    +

    Are you sure ?

    " class="btn btn-success" role="button"> - + I'm sure
    diff --git a/lemonldap-ng-portal/example/skins/bootstrap/notification.tpl b/lemonldap-ng-portal/example/skins/bootstrap/notification.tpl index 99d109537..28328d116 100644 --- a/lemonldap-ng-portal/example/skins/bootstrap/notification.tpl +++ b/lemonldap-ng-portal/example/skins/bootstrap/notification.tpl @@ -12,7 +12,7 @@
    -

    +

    You have some new messages

    @@ -24,7 +24,7 @@
    diff --git a/lemonldap-ng-portal/example/skins/bootstrap/openid.tpl b/lemonldap-ng-portal/example/skins/bootstrap/openid.tpl index 12c4c1f8a..4af312a0c 100644 --- a/lemonldap-ng-portal/example/skins/bootstrap/openid.tpl +++ b/lemonldap-ng-portal/example/skins/bootstrap/openid.tpl @@ -10,7 +10,7 @@
    -

    :

    +

    Your identity is:

    @@ -25,7 +25,7 @@
    " class="positive btn btn-success"> - + Go to portal
    diff --git a/lemonldap-ng-portal/example/skins/bootstrap/openidform.tpl b/lemonldap-ng-portal/example/skins/bootstrap/openidform.tpl index aaa4d3483..53fe9578b 100644 --- a/lemonldap-ng-portal/example/skins/bootstrap/openidform.tpl +++ b/lemonldap-ng-portal/example/skins/bootstrap/openidform.tpl @@ -1,13 +1,13 @@
    - " /> +
    diff --git a/lemonldap-ng-portal/example/skins/bootstrap/password.tpl b/lemonldap-ng-portal/example/skins/bootstrap/password.tpl index 82297f00b..c3dcc11da 100644 --- a/lemonldap-ng-portal/example/skins/bootstrap/password.tpl +++ b/lemonldap-ng-portal/example/skins/bootstrap/password.tpl @@ -25,7 +25,7 @@
    - " required/> +
    @@ -33,16 +33,16 @@
    - " required /> +
    - " required/> +
    diff --git a/lemonldap-ng-portal/example/skins/bootstrap/register.tpl b/lemonldap-ng-portal/example/skins/bootstrap/register.tpl index cc8790a88..9dafc4792 100644 --- a/lemonldap-ng-portal/example/skins/bootstrap/register.tpl +++ b/lemonldap-ng-portal/example/skins/bootstrap/register.tpl @@ -20,17 +20,17 @@
    - " class="form-control" placeholder="" required /> + " class="form-control" trplaceholder="firstName" required />
    - " class="form-control" placeholder="" required /> + " class="form-control" trplaceholder="lastName" required />
    - " class="form-control" placeholder="" required /> + " class="form-control" trplaceholder="mail" required />
    @@ -46,7 +46,7 @@
    @@ -72,25 +72,25 @@ " name="mail"> -

    +

    Resend confirmation mail?

    - + A register request for this account was already issued on . - + Do you want the confirmation mail to be resent?

    @@ -101,11 +101,9 @@ @@ -127,7 +123,7 @@
    ?skin=" class="btn btn-primary" role="button"> - + Go back to portal
    diff --git a/lemonldap-ng-portal/example/skins/bootstrap/standardform.tpl b/lemonldap-ng-portal/example/skins/bootstrap/standardform.tpl index bdc0dc302..eb13c8943 100644 --- a/lemonldap-ng-portal/example/skins/bootstrap/standardform.tpl +++ b/lemonldap-ng-portal/example/skins/bootstrap/standardform.tpl @@ -1,12 +1,12 @@
    - " class="form-control" placeholder="" required /> + " trplaceholder="login" required />
    - " required /> +
    @@ -24,7 +24,7 @@
    @@ -32,14 +32,14 @@ ?skin=&="> - + Reset my password ?skin=&="> - + Create an account
    diff --git a/lemonldap-ng-portal/example/skins/bootstrap/yubikeyform.tpl b/lemonldap-ng-portal/example/skins/bootstrap/yubikeyform.tpl index 35bdd1fc1..61bdf0445 100644 --- a/lemonldap-ng-portal/example/skins/bootstrap/yubikeyform.tpl +++ b/lemonldap-ng-portal/example/skins/bootstrap/yubikeyform.tpl @@ -1,13 +1,13 @@
    - " /> +
    diff --git a/lemonldap-ng-portal/example/skins/common/mail_confirm.tpl b/lemonldap-ng-portal/example/skins/common/mail_confirm.tpl index 7cd3995b6..b2d0b0e6a 100644 --- a/lemonldap-ng-portal/example/skins/common/mail_confirm.tpl +++ b/lemonldap-ng-portal/example/skins/common/mail_confirm.tpl @@ -1,11 +1,11 @@

    - $cn,
    +Hello $cn,

    - +Click here to reset your password

    diff --git a/lemonldap-ng-portal/example/skins/common/mail_footer.tpl b/lemonldap-ng-portal/example/skins/common/mail_footer.tpl index d7a8eba8e..c5cd433da 100644 --- a/lemonldap-ng-portal/example/skins/common/mail_footer.tpl +++ b/lemonldap-ng-portal/example/skins/common/mail_footer.tpl @@ -2,8 +2,8 @@ diff --git a/lemonldap-ng-portal/example/skins/common/mail_password.tpl b/lemonldap-ng-portal/example/skins/common/mail_password.tpl index 9f6f3031f..2526c3522 100644 --- a/lemonldap-ng-portal/example/skins/common/mail_password.tpl +++ b/lemonldap-ng-portal/example/skins/common/mail_password.tpl @@ -1,14 +1,14 @@

    - $cn,
    +Hello $cn,

    - +Your new password is $password - +Your password was changed.

    diff --git a/lemonldap-ng-portal/example/skins/common/mail_register_confirm.tpl b/lemonldap-ng-portal/example/skins/common/mail_register_confirm.tpl index 7521cc502..0e684351a 100644 --- a/lemonldap-ng-portal/example/skins/common/mail_register_confirm.tpl +++ b/lemonldap-ng-portal/example/skins/common/mail_register_confirm.tpl @@ -1,11 +1,11 @@

    - $firstname $lastname,
    +Hello $firstname $lastname,

    - +Click here to confirm your account registration

    diff --git a/lemonldap-ng-portal/example/skins/common/mail_register_done.tpl b/lemonldap-ng-portal/example/skins/common/mail_register_done.tpl index 16affdd6e..3508e9288 100644 --- a/lemonldap-ng-portal/example/skins/common/mail_register_done.tpl +++ b/lemonldap-ng-portal/example/skins/common/mail_register_done.tpl @@ -1,16 +1,16 @@

    - $firstname $lastname,
    +Hello $firstname $lastname,

    - +Your account was successfully created.

    - +Your login is $login
    - +Your password is $password

    diff --git a/lemonldap-ng-portal/example/skins/common/redirect.tpl b/lemonldap-ng-portal/example/skins/common/redirect.tpl index 92ab4c174..c91e7ceeb 100644 --- a/lemonldap-ng-portal/example/skins/common/redirect.tpl +++ b/lemonldap-ng-portal/example/skins/common/redirect.tpl @@ -2,7 +2,7 @@ - <lang en="Authentication portal" fr="Portail d'authentification"/> + Authentication portal @@ -33,20 +33,20 @@ form { '"> -

    +

    Redirection in progress...

    " method="" class="login">