Move all instances of 'verify identity' to 'show identity'
As discussed in standup this morning - only the act of verifying or a statement about current status should use that word 'verify.' FREEBIE
This commit is contained in:
parent
ee0b0f5ffb
commit
ae3587f05e
6 changed files with 13 additions and 13 deletions
|
@ -179,8 +179,8 @@
|
||||||
"message": "Reset session",
|
"message": "Reset session",
|
||||||
"description": "This is a menu item for resetting the session, using the imperative case, as in a command."
|
"description": "This is a menu item for resetting the session, using the imperative case, as in a command."
|
||||||
},
|
},
|
||||||
"verifySafetyNumbers": {
|
"showSafetyNumber": {
|
||||||
"message": "Verify safety number"
|
"message": "Show safety number"
|
||||||
},
|
},
|
||||||
"theirIdentityUnknown": {
|
"theirIdentityUnknown": {
|
||||||
"message": "You haven't exchanged any messages with this contact yet. Your safety number with them will be available after the first message."
|
"message": "You haven't exchanged any messages with this contact yet. Your safety number with them will be available after the first message."
|
||||||
|
@ -203,7 +203,7 @@
|
||||||
},
|
},
|
||||||
"installTagline": {
|
"installTagline": {
|
||||||
"message": "Privacy is possible. Signal makes it easy.",
|
"message": "Privacy is possible. Signal makes it easy.",
|
||||||
"description": "Tagline displayed under installWelcome on the install page"
|
"description": "Tagline displayed under 'installWelcome' string on the install page"
|
||||||
},
|
},
|
||||||
"installGetStartedButton": {
|
"installGetStartedButton": {
|
||||||
"message": "Get started"
|
"message": "Get started"
|
||||||
|
|
|
@ -85,7 +85,7 @@
|
||||||
{{/group}}
|
{{/group}}
|
||||||
{{^group}}
|
{{^group}}
|
||||||
<li class='end-session'>{{ end-session }}</li>
|
<li class='end-session'>{{ end-session }}</li>
|
||||||
<li class='verify-identity'>{{ verify-identity }}</li>
|
<li class='show-identity'>{{ show-identity }}</li>
|
||||||
{{/group}}
|
{{/group}}
|
||||||
<li class='disappearing-messages'>{{ disappearing-messages }}</li>
|
<li class='disappearing-messages'>{{ disappearing-messages }}</li>
|
||||||
<li class='destroy'>{{ destroy }}</li>
|
<li class='destroy'>{{ destroy }}</li>
|
||||||
|
|
|
@ -74,7 +74,7 @@
|
||||||
expireTimer: this.model.get('expireTimer'),
|
expireTimer: this.model.get('expireTimer'),
|
||||||
'view-members' : i18n('members'),
|
'view-members' : i18n('members'),
|
||||||
'end-session' : i18n('resetSession'),
|
'end-session' : i18n('resetSession'),
|
||||||
'verify-identity' : i18n('verifySafetyNumbers'),
|
'show-identity' : i18n('showSafetyNumber'),
|
||||||
'destroy' : i18n('deleteMessages'),
|
'destroy' : i18n('deleteMessages'),
|
||||||
'send-message' : i18n('sendMessage'),
|
'send-message' : i18n('sendMessage'),
|
||||||
'disappearing-messages': i18n('disappearingMessages'),
|
'disappearing-messages': i18n('disappearingMessages'),
|
||||||
|
@ -144,7 +144,7 @@
|
||||||
'click .end-session': 'endSession',
|
'click .end-session': 'endSession',
|
||||||
'click .leave-group': 'leaveGroup',
|
'click .leave-group': 'leaveGroup',
|
||||||
'click .update-group': 'newGroupUpdate',
|
'click .update-group': 'newGroupUpdate',
|
||||||
'click .verify-identity': 'verifyIdentity',
|
'click .show-identity': 'showIdentity',
|
||||||
'click .view-members': 'viewMembers',
|
'click .view-members': 'viewMembers',
|
||||||
'click .conversation-menu .hamburger': 'toggleMenu',
|
'click .conversation-menu .hamburger': 'toggleMenu',
|
||||||
'click .openInbox' : 'openInbox',
|
'click .openInbox' : 'openInbox',
|
||||||
|
@ -165,7 +165,7 @@
|
||||||
'close .menu': 'closeMenu',
|
'close .menu': 'closeMenu',
|
||||||
'select .message-list .entry': 'messageDetail',
|
'select .message-list .entry': 'messageDetail',
|
||||||
'force-resize': 'forceUpdateMessageFieldSize',
|
'force-resize': 'forceUpdateMessageFieldSize',
|
||||||
'verify-identity': 'verifyIdentity'
|
'show-identity': 'showIdentity'
|
||||||
},
|
},
|
||||||
enableDisappearingMessages: function() {
|
enableDisappearingMessages: function() {
|
||||||
if (!this.model.get('expireTimer')) {
|
if (!this.model.get('expireTimer')) {
|
||||||
|
@ -493,7 +493,7 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
verifyIdentity: function(ev, model) {
|
showIdentity: function(ev, model) {
|
||||||
if (!model && this.model.isPrivate()) {
|
if (!model && this.model.isPrivate()) {
|
||||||
model = this.model;
|
model = this.model;
|
||||||
}
|
}
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
|
|
||||||
// TODO; find all uses of that removed panel
|
// TODO; find all uses of that removed panel
|
||||||
// Add the Verify functionality to this view
|
// Add the Verify functionality to this view
|
||||||
Whisper.KeyVerificationView = Whisper.View.extend({
|
Whisper.KeyVerificationPanelView = Whisper.View.extend({
|
||||||
className: 'key-verification panel',
|
className: 'key-verification panel',
|
||||||
templateName: 'key-verification',
|
templateName: 'key-verification',
|
||||||
initialize: function(options) {
|
initialize: function(options) {
|
||||||
|
|
|
@ -86,15 +86,15 @@
|
||||||
this.listenTo(this.conversation, 'change', this.render);
|
this.listenTo(this.conversation, 'change', this.render);
|
||||||
},
|
},
|
||||||
events: {
|
events: {
|
||||||
'click .content': 'verifyIdentity'
|
'click .content': 'showIdentity'
|
||||||
},
|
},
|
||||||
render_attributes: function() {
|
render_attributes: function() {
|
||||||
return {
|
return {
|
||||||
content: this.model.getNotificationText()
|
content: this.model.getNotificationText()
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
verifyIdentity: function() {
|
showIdentity: function() {
|
||||||
this.$el.trigger('verify-identity', this.conversation);
|
this.$el.trigger('show-identity', this.conversation);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -99,7 +99,7 @@
|
||||||
{{/group}}
|
{{/group}}
|
||||||
{{^group}}
|
{{^group}}
|
||||||
<li class='end-session'>{{ end-session }}</li>
|
<li class='end-session'>{{ end-session }}</li>
|
||||||
<li class='verify-identity'>{{ verify-identity }}</li>
|
<li class='show-identity'>{{ show-identity }}</li>
|
||||||
{{/group}}
|
{{/group}}
|
||||||
<li class='destroy'>{{ destroy }}</li>
|
<li class='destroy'>{{ destroy }}</li>
|
||||||
</ul>
|
</ul>
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue