web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't display 'Hello null' if we can't get the account name

Browse Source
This commit is contained in:
yflory 2017-02-03 10:48:15 +01:00
parent 8648ff208e
commit 46b48df966
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
customize.dist/main.js
View File

@ -35,7 +35,11 @@ define([
var $hello = $loggedInBlock.find('#loggedInHello'); var $hello = $loggedInBlock.find('#loggedInHello');
var $logout = $loggedInBlock.find('#loggedInLogOut'); var $logout = $loggedInBlock.find('#loggedInLogOut');
if (name) {
$hello.text(Messages._getKey('login_hello', [name])); $hello.text(Messages._getKey('login_hello', [name]));
} else {
$hello.text(Messages.login_helloNoName);
}
$('#buttons').find('.nologin').hide(); $('#buttons').find('.nologin').hide();
$logout.click(function () { $logout.click(function () {

1
customize.dist/translations/messages.fr.js
View File

@ -280,6 +280,7 @@ define(function () {
out.loginText = '<p>Votre nom d\'utilisateur et votre mot d epasse sont utilisés pour générer une clé unique qui reste inconnue de notre serveur.</p>\n' + out.loginText = '<p>Votre nom d\'utilisateur et votre mot d epasse sont utilisés pour générer une clé unique qui reste inconnue de notre serveur.</p>\n' +
'<p>Faîtes attention de ne pas perdre vos identifiants, puisqu\'il est impossible de les récupérer</p>'; '<p>Faîtes attention de ne pas perdre vos identifiants, puisqu\'il est impossible de les récupérer</p>';
out.login_hello = 'Bonjour {0},'; // {0} is the username out.login_hello = 'Bonjour {0},'; // {0} is the username
out.login_helloNoName = 'Bonjour,';
out.login_accessDrive = 'Accédez à votre drive'; out.login_accessDrive = 'Accédez à votre drive';
// index.html // index.html

1
customize.dist/translations/messages.js
View File

@ -282,6 +282,7 @@ define(function () {
out.loginText = '<p>Your username and password are used to generate a unique key which is never known by our server.</p>\n' + out.loginText = '<p>Your username and password are used to generate a unique key which is never known by our server.</p>\n' +
'<p>Be careful not to forget your credentials, as they are impossible to recover</p>'; '<p>Be careful not to forget your credentials, as they are impossible to recover</p>';
out.login_hello = 'Hello {0},'; // {0} is the username out.login_hello = 'Hello {0},'; // {0} is the username
out.login_helloNoName = 'Hello,';
out.login_accessDrive = 'Access your drive'; out.login_accessDrive = 'Access your drive';
// index.html // index.html