Show help text for unknown contact identity
Adds a new message string "theirIdentityUnknown". Fixes #576 // FREEBIE
This commit is contained in:
parent
b2948e541e
commit
6c7f2cf0fc
5 changed files with 21 additions and 2 deletions
|
@ -104,6 +104,9 @@
|
||||||
"yourIdentity": {
|
"yourIdentity": {
|
||||||
"message": "Your identity (you read):"
|
"message": "Your identity (you read):"
|
||||||
},
|
},
|
||||||
|
"theirIdentityUnknown": {
|
||||||
|
"message": "You haven't talked with this contact yet. Their identity will be received with their first message."
|
||||||
|
},
|
||||||
"deleteMessages": {
|
"deleteMessages": {
|
||||||
"message": "Delete messages"
|
"message": "Delete messages"
|
||||||
},
|
},
|
||||||
|
|
|
@ -217,8 +217,12 @@
|
||||||
</div>
|
</div>
|
||||||
<div class='container'>
|
<div class='container'>
|
||||||
<p> {{theirIdentity}} </p>
|
<p> {{theirIdentity}} </p>
|
||||||
|
<div class='key placeholder'>
|
||||||
|
{{ #their_key_unknown }} <span>{{ their_key_unknown }}</span>{{ /their_key_unknown }}
|
||||||
|
</div>
|
||||||
<div class='key'>
|
<div class='key'>
|
||||||
{{ #their_key }} <span>{{ . }}</span> {{ /their_key }}
|
{{ #their_key }} <span>{{ . }}</span> {{ /their_key }}
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
<p> {{yourIdentity}} </p>
|
<p> {{yourIdentity}} </p>
|
||||||
<div class='key'>
|
<div class='key'>
|
||||||
|
|
|
@ -25,13 +25,18 @@
|
||||||
return octets;
|
return octets;
|
||||||
},
|
},
|
||||||
render_attributes: function() {
|
render_attributes: function() {
|
||||||
return {
|
var attributes = {
|
||||||
verifyIdentity: i18n('verifyIdentity'),
|
verifyIdentity: i18n('verifyIdentity'),
|
||||||
yourIdentity: i18n('yourIdentity'),
|
yourIdentity: i18n('yourIdentity'),
|
||||||
theirIdentity: i18n('theirIdentity'),
|
theirIdentity: i18n('theirIdentity'),
|
||||||
your_key: this.splitKey(this.model.your_key),
|
your_key: this.splitKey(this.model.your_key),
|
||||||
their_key: this.splitKey(this.model.their_key)
|
|
||||||
};
|
};
|
||||||
|
if(this.model.their_key) {
|
||||||
|
attributes.their_key = this.splitKey(this.model.their_key);
|
||||||
|
} else {
|
||||||
|
attributes.their_key_unknown = i18n('theirIdentityUnknown');
|
||||||
|
}
|
||||||
|
return attributes;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
})();
|
})();
|
||||||
|
|
|
@ -54,6 +54,10 @@
|
||||||
padding: 0 1em;
|
padding: 0 1em;
|
||||||
-webkit-user-select: text;
|
-webkit-user-select: text;
|
||||||
}
|
}
|
||||||
|
.key.placeholder {
|
||||||
|
font-family: inherit;
|
||||||
|
font-weight: bold;
|
||||||
|
}
|
||||||
.container {
|
.container {
|
||||||
height: calc(100% - (#{$header-height} + 5px + 1px + 4px));
|
height: calc(100% - (#{$header-height} + 5px + 1px + 4px));
|
||||||
}
|
}
|
||||||
|
|
|
@ -620,6 +620,9 @@ input.search {
|
||||||
font-family: monospace;
|
font-family: monospace;
|
||||||
padding: 0 1em;
|
padding: 0 1em;
|
||||||
-webkit-user-select: text; }
|
-webkit-user-select: text; }
|
||||||
|
.key-verification .key.placeholder {
|
||||||
|
font-family: inherit;
|
||||||
|
font-weight: bold; }
|
||||||
.key-verification .container {
|
.key-verification .container {
|
||||||
height: calc(100% - (36px + 5px + 1px + 4px)); }
|
height: calc(100% - (36px + 5px + 1px + 4px)); }
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue