Skip to content

Commit

Permalink
622 Harmonized login (bitshares#629)
Browse files Browse the repository at this point in the history
* Update README.md

* Issue 315 - Add Chart Clamp To Settings Dropdown (bitshares#373)

* Add Chart Clamp To Settings Dropdown

* Removed Unused Variable

Merging as is and then we'll see about handling the redraw bug in the next sprint.

* resolve conflict

* Update README.md

* Local Wallet Login
  • Loading branch information
happyconcepts authored and svk31 committed Oct 23, 2017
1 parent 81225cc commit e0b43d8
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions app/assets/locales/locale-en.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"create_asset": "Create Asset",
"update_asset": "Update Asset",
"lock": "Log out (lock the local wallet)",
"unlock": "Log in (unlock the local wallet)",
"unlock": "Local Wallet Login",
"unlock_password": "Cloud Wallet Login",
"unlock_short": "Login",
"help": "Help",
Expand Down Expand Up @@ -1041,7 +1041,7 @@
"done": "Done",
"verify": "I've written it down",
"invalid_format": "Invalid Format",
"enter_password": "Enter Password",
"enter_password": "Password",
"confirm_password": "Confirm Password",
"pass_incorrect": "Incorrect password",
"confirm_error": "The confirmation does not match the password",
Expand Down
2 changes: 1 addition & 1 deletion app/components/Wallet/WalletUnlockModal.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ class WalletUnlockModal extends React.Component {

<div>
<div className="button-group">
<button className="button" data-place="bottom" data-html data-tip={counterpart.translate("tooltip.login")} onClick={this.onPasswordEnter}><Translate content="header.unlock" /></button>
<button className="button" data-place="bottom" data-html data-tip={counterpart.translate("tooltip.login")} onClick={this.onPasswordEnter}><Translate content="header.unlock_short" /></button>
<Trigger close={this.props.modalId}>
<div className=" button"><Translate content="account.perm.cancel" /></div>
</Trigger>
Expand Down

0 comments on commit e0b43d8

Please sign in to comment.