infra
/
cryptpad
2
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity

unify keys that say 'X is/is not in your contacts'

pull/1/head
David Benqué 2020-01-27 14:06:57 +00:00
parent beaea7bb74
commit cd586b626d
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
www/common/common-ui-elements.js
View File

@ -4602,10 +4602,10 @@ define([
var f = priv.friends[curve];
$verified.append(h('span.fa.fa-certificate'));
var $avatar = $(h('span.cp-avatar')).appendTo($verified);
$verified.append(h('p', Messages._getKey('requestEdit_fromFriend', [f.displayName])));
$verified.append(h('p', Messages._getKey('isContact', [f.displayName])));
common.displayAvatar($avatar, f.avatar, f.displayName);
} else {
$verified.append(Messages._getKey('requestEdit_fromStranger', [name]));
$verified.append(Messages._getKey('isNotContact', [name]));
}
return verified;
};

5
www/common/translations/messages.json
View File

@ -1086,7 +1086,8 @@
"profile_addLink": "Add a link to your website",
"profile_info": "Other users can find your profile through your avatar in document user lists.",
"profile_friendRequestSent": "Contact request pending...",
"profile_friend": "{0} is your friend",
"isContact": "{0} is in your contacts",
"isNotContact": "{0} is <b>not</b> in your contacts",
"notification_padShared": "{0} has shared a pad with you: <b>{1}</b>",
"notification_fileShared": "{0} has shared a file with you: <b>{1}</b>",
"notification_folderShared": "{0} has shared a folder with you: <b>{1}</b>",
@ -1138,8 +1139,6 @@
"requestEdit_button": "Request edit rights",
"requestEdit_dialog": "Are you sure you'd like to ask the owner of this pad for the ability to edit?",
"requestEdit_confirm": "{1} has asked for the ability to edit the pad <b>{0}</b>. Would you like to grant them access?",
"requestEdit_fromFriend": "You are friends with {0}",
"requestEdit_fromStranger": "You are <b>not</b> friends with {0}",
"requestEdit_viewPad": "Open the pad in a new tab",
"later": "Decide later",
"requestEdit_request": "{1} wants to edit the pad <b>{0}</b>",

2
www/profile/inner.js
View File

@ -201,7 +201,7 @@ define([
// Add friend message
APP.$friend.append(h('p.cp-app-profile-friend', [
h('i.fa.fa-address-book'),
Messages._getKey('profile_friend', [name])
Messages._getKey('isContact', [name])
]));
if (!friends[data.curvePublic].notifications) { return; }
// Add unfriend button