From db12b5e89695175c987a1f6d6fc78bbf2610d2ec Mon Sep 17 00:00:00 2001 From: ansuz Date: Tue, 27 Dec 2016 12:31:16 +0100 Subject: [PATCH] move text for login page into translation file --- customize.dist/translations/messages.js | 19 ++++++++-- www/user/index.html | 48 ++++++++++++++++++------- 2 files changed, 53 insertions(+), 14 deletions(-) diff --git a/customize.dist/translations/messages.js b/customize.dist/translations/messages.js index 1292c36bf..b3a1ea63b 100644 --- a/customize.dist/translations/messages.js +++ b/customize.dist/translations/messages.js @@ -113,7 +113,10 @@ define(function () { out.recentPadsIframe = 'Your recent pads'; out.okButton = 'OK (enter)'; + + out.cancel = "cancel"; out.cancelButton = 'Cancel (esc)'; + out.forget = "Forget"; // Polls @@ -220,12 +223,19 @@ define(function () { // login out.login_login = "log in"; out.login_register = "register"; + out.logoutButton = "log out"; + + out.login_migrate = "Would you like to migrate existing data from your anonymous session?"; + + out.username_label = "Username: "; out.login_username = "your username"; out.login_password = "your password"; out.login_confirm = "confirm your password"; out.login_remember = "remember me"; + out.login_cancel_prompt = "...or if you may have entered the wrong username or password, cancel to try again."; + out.login_warning = [ '

WARNING

', '

Cryptpad stores your personal information in an encrypted realtime document, as it does with all other types of realtime documents.

', @@ -235,10 +245,15 @@ define(function () { ].join('\n'); out.login_logout = [ - '

It seems you are already logged in

', - '

Would you like to log out and authenticate as another user?

', + //'

It seems you are already logged in

', + //'

Would you like to log out and authenticate as another user?

', ].join('\n'); + out.login_hashing = "Hashing your password, this might take some time."; + + out.login_no_user = "There is no user associated with the username and password that you entered."; + out.login_confirm_password = "Re-enter your password to register..."; + out.loginText = '

Your username and password are used to generate a unique key which is never known by our server.

\n' + '

Be careful not to forget your credentials, as they are impossible to recover

'; diff --git a/www/user/index.html b/www/user/index.html index 18e33064a..29b30ace7 100644 --- a/www/user/index.html +++ b/www/user/index.html @@ -3,6 +3,7 @@ + Cryptpad: login @@ -42,20 +51,35 @@

- -
- -
-
+
+

+
+ +
+

+

+ + + + +
+

+ + +
+
- +
- +
+ + +