Skip to content
This repository has been archived by the owner on May 16, 2018. It is now read-only.

Commit

Permalink
Merge pull request #29 from Sneezry/master
Browse files Browse the repository at this point in the history 
misspelling
  • Loading branch information
@Sneezry
Sneezry committed Sep 24, 2015
2 parents 4205803 + 1504996 commit 1503f22
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 22 deletions.
8 changes: 4 additions & 4 deletions _locales/en/messages.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -135,9 +135,9 @@
"message": "Sync Clock with Google",
"description": "Sync Clock"
},
"remeber_phrase": {
"message": "Remeber Passphrase",
"description": "Remeber Passphrase"
"remember_phrase": {
"message": "Remember Passphrase",
"description": "Remember Passphrase"
},
"clock_too_far_off": {
"message": "Caution! Your local clock is too far off, please fix it before continuing.",
Expand Down Expand Up @@ -171,4 +171,4 @@
"message": "Scale",
"description": "Scale"
}
}
}
6 changes: 3 additions & 3 deletions _locales/zh_CN/messages.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -135,9 +135,9 @@
"message": "通过Google校准时间",
"description": "Sync Clock"
},
"remeber_phrase": {
"remember_phrase": {
"message": "记住密码",
"description": "Remeber Passphrase"
"description": "Remember Passphrase"
},
"clock_too_far_off": {
"message": "注意！您的本地时钟时间差过大，请修正后再进行操作。",
Expand Down Expand Up @@ -171,4 +171,4 @@
"message": "比例",
"description": "Scale"
}
}
}
20 changes: 10 additions & 10 deletions javascript/popup.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ document.getElementById('resize_save').innerText = chrome.i18n.getMessage('ok');
document.getElementById('security_save').innerText = chrome.i18n.getMessage('ok');
document.getElementById('passphrase_info').innerText = chrome.i18n.getMessage('passphrase_info');
document.getElementById('passphrase_phrase_label').innerText = chrome.i18n.getMessage('passphrase');
document.getElementById('remeber_new_phrase_label').innerText = chrome.i18n.getMessage('remeber_phrase');
document.getElementById('remeber_phrase_label').innerText = chrome.i18n.getMessage('remeber_phrase');
document.getElementById('remember_new_phrase_label').innerText = chrome.i18n.getMessage('remember_phrase');
document.getElementById('remember_phrase_label').innerText = chrome.i18n.getMessage('remember_phrase');
document.getElementById('resize_list_label').innerText = chrome.i18n.getMessage('scale');
document.getElementById('passphrase_ok').innerText = chrome.i18n.getMessage('ok');
document.getElementById('version').innerText = 'Version ' + chrome.runtime.getManifest().version;
Expand All @@ -59,8 +59,8 @@ document.getElementById('menuSource').innerHTML += chrome.i18n.getMessage('sourc
document.getElementById('menuFeedback').innerHTML += chrome.i18n.getMessage('feedback');

if (localStorage.notRememberPassphrase === 'true') {
document.getElementById('remeber_new_phrase').checked = false;
document.getElementById('remeber_phrase').checked = false;
document.getElementById('remember_new_phrase').checked = false;
document.getElementById('remember_phrase').checked = false;
}

chrome.storage.sync.get(showCodes);
Expand Down Expand Up @@ -119,8 +119,8 @@ document.getElementById('security_save').onclick = function () {
if (phrase === phrase2) {
document.getElementById('security_new_phrase').value = '';
document.getElementById('security_confirm_phrase').value = '';
localStorage.notRememberPassphrase = (!document.getElementById('remeber_new_phrase').checked).toString();
document.getElementById('remeber_phrase').checked = document.getElementById('remeber_new_phrase').checked;
localStorage.notRememberPassphrase = (!document.getElementById('remember_new_phrase').checked).toString();
document.getElementById('remember_phrase').checked = document.getElementById('remember_new_phrase').checked;
encryptSecret(phrase, true, function () {
showMessage(chrome.i18n.getMessage('updateSuccess'), function () {
document.getElementById('security').className = 'fadeout';
Expand All @@ -141,8 +141,8 @@ document.getElementById('phrase').onkeydown = function(e) {
if (e.keyCode === 13) {
var phrase = document.getElementById('phrase').value;
document.getElementById('phrase').value = '';
localStorage.notRememberPassphrase = (!document.getElementById('remeber_phrase').checked).toString();
document.getElementById('remeber_new_phrase').checked = document.getElementById('remeber_phrase').checked;
localStorage.notRememberPassphrase = (!document.getElementById('remember_phrase').checked).toString();
document.getElementById('remember_new_phrase').checked = document.getElementById('remember_phrase').checked;
encryptSecret(phrase, false, function () {
document.getElementById('passphrase').className = 'fadeout';
setTimeout(function () {
Expand All @@ -158,8 +158,8 @@ document.getElementById('phrase').onkeydown = function(e) {
document.getElementById('passphrase_ok').onclick = function () {
var phrase = document.getElementById('phrase').value;
document.getElementById('phrase').value = '';
localStorage.notRememberPassphrase = (!document.getElementById('remeber_phrase').checked).toString();
document.getElementById('remeber_new_phrase').checked = document.getElementById('remeber_phrase').checked;
localStorage.notRememberPassphrase = (!document.getElementById('remember_phrase').checked).toString();
document.getElementById('remember_new_phrase').checked = document.getElementById('remember_phrase').checked;
encryptSecret(phrase, false, function () {
document.getElementById('passphrase').className = 'fadeout';
setTimeout(function () {
Expand Down
10 changes: 5 additions & 5 deletions popup.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@
<label for="security_confirm_phrase" id="security_confirm_phrase_label"></label>
<input id="security_confirm_phrase" type="password" />
<div class="checkbox_group">
<input type="checkbox" id="remeber_new_phrase" checked="true" />
<label for="remeber_new_phrase" id="remeber_new_phrase_label"></label>
<input type="checkbox" id="remember_new_phrase" checked="true" />
<label for="remember_new_phrase" id="remember_new_phrase_label"></label>
</div>
<div id="security_save"></div>
</div>
Expand All @@ -83,8 +83,8 @@
<label for="phrase" id="passphrase_phrase_label"></label>
<input id="phrase" type="password" />
<div class="checkbox_group">
<input type="checkbox" id="remeber_phrase" checked="true" />
<label for="remeber_phrase" id="remeber_phrase_label"></label>
<input type="checkbox" id="remember_phrase" checked="true" />
<label for="remember_phrase" id="remember_phrase_label"></label>
</div>
<div id="passphrase_ok"></div>
</div>
Expand Down Expand Up @@ -124,4 +124,4 @@
<script src="javascript/sector.js"></script>
<script src="javascript/popup.js"></script>
</body>
</html>
</html>

0 comments on commit 1503f22

Please sign in to comment.