From f9162d41f7bb48d0a404b235e8ab309f81ccca32 Mon Sep 17 00:00:00 2001 From: yflory Date: Wed, 17 Jul 2019 12:15:28 +0200 Subject: [PATCH] Fix translation keys --- customize.dist/src/less2/include/notifications.less | 2 +- www/common/notifications.js | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/customize.dist/src/less2/include/notifications.less b/customize.dist/src/less2/include/notifications.less index e68b3a72d..f27d6ed60 100644 --- a/customize.dist/src/less2/include/notifications.less +++ b/customize.dist/src/less2/include/notifications.less @@ -58,7 +58,7 @@ display: flex; align-items: center; &> span.cp-avatar { - .avatar_main(50px); + .avatar_main(30px); } &> span { margin-right: 10px; diff --git a/www/common/notifications.js b/www/common/notifications.js index a72edb856..2783ee686 100644 --- a/www/common/notifications.js +++ b/www/common/notifications.js @@ -127,18 +127,20 @@ define([ href: '#' }, Messages.requestEdit_viewPad); var verified = h('p.cp-notifications-requestedit-verified'); + var $verified = $(verified); if (priv.friends && priv.friends[msg.author]) { var f = priv.friends[msg.author]; - var $verified = $(verified); $verified.append(h('span.fa.fa-certificate')); var $avatar = $(h('span.cp-avatar')).appendTo($verified); - $verified.append(h('p', Messages._getKey('requestEdit_verified', [f.displayName]))); + $verified.append(h('p', Messages._getKey('requestEdit_fromFriend', [f.displayName]))); common.displayAvatar($avatar, f.avatar, f.displayName); + } else { + $verified.append(Messages.requestEdit_fromStranger); } var div = h('div', [ - h('p', Messages._getKey('requestEdit_confirm', [msg.content.title, msg.content.displayName])), + h('p', Messages._getKey('requestEdit_confirm', [msg.content.title, msg.content.user.displayName])), verified, link ]); @@ -156,7 +158,7 @@ define([ defaultDismiss(common, data)(); }, { ok: Messages.friendRequest_accept, - cancel: Messages.requestEdit_later + cancel: Messages.later }); };