Commit 0e2d2d60 authored by lilia's avatar lilia
Browse files

i18n KeyConflictDialogue

// FREEBIE
parent 3172c494
{ {
"verifyContact": {
"message": "You may wish to <span class='verify'>verify</span> this contact."
},
"acceptNewKey": {
"message": "Accept new key"
},
"verify": { "verify": {
"message": "Verify" "message": "Verify"
}, },
......
...@@ -290,12 +290,10 @@ ...@@ -290,12 +290,10 @@
<script type='text/x-tmpl-mustache' id='key-conflict-dialogue'> <script type='text/x-tmpl-mustache' id='key-conflict-dialogue'>
<div class='content'> <div class='content'>
<p> {{ message }} </p> <p> {{ message }} </p>
<p> {{ verifyContact }} </p>
<p> <p>
You may wish to <span class='verify'>verify</span> this contact. <button class='cancel'>{{ cancel }}</button>
</p> <button class='resolve'>{{ resolve }}</button>
<p>
<button class='cancel'>Cancel</button>
<button class='resolve'>Accept new key</button>
</p> </p>
</div> </div>
</script> </script>
......
...@@ -32,7 +32,12 @@ ...@@ -32,7 +32,12 @@
this.conversation.resolveConflicts(this.model); this.conversation.resolveConflicts(this.model);
}, },
render_attributes: function() { render_attributes: function() {
return this.model; return {
message: this.model.message,
cancel: i18n('cancel'),
resolve: i18n('acceptNewKey'),
verifyContact: i18n('verifyContact')
};
} }
}); });
})(); })();
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment