Skip to content
This repository has been archived by the owner on Sep 5, 2020. It is now read-only.

adds the wallet as the default tab #924

Merged
merged 6 commits into from
Jul 7, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions interface/client/appStart.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ if(location.hash)

// set browser as default tab
if(!LocalStore.get('selectedTab'))
LocalStore.set('selectedTab', 'browser');
LocalStore.set('selectedTab', 'wallet');

/**
The init function of Mist
Expand All @@ -32,7 +32,7 @@ mistInit = function(){
position: 0
});
}

Tabs.upsert({_id: 'wallet'}, {
url: 'https://wallet.ethereum.org',
position: 1,
Expand Down
4 changes: 2 additions & 2 deletions interface/i18n/app.en.i18n.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"ok": "OK",
"cancel": "Cancel",
"save": "Save",
"edit": "edit",
"edit": "Edit",
"send": "Send",
"next": "Next",
"previous": "Previous",
Expand All @@ -31,4 +31,4 @@
"on": "on",
"per": "per"
}
}
}
8 changes: 4 additions & 4 deletions interface/i18n/mist.en.i18n.json
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@
"unlocking": "Confirming...",
"createContract": "Create contract",
"estimatedFee": "Estimated fee consumption",
"estimatedGasError": "Data can't be executed, so it will use all provided gas.",
"estimatedGasError": "Execution failed. Consumed all provided gas.",
"gasPrice": "Gas price",
"perMillionGas": "ether per million gas",
"gasLimit": "Provide maximum fee",
Expand All @@ -189,7 +189,7 @@
}
},
"onboarding": {
"description" : "Ethereum is a decentralized platform for building apps on a blockchain: tamper-proof software that can transfer value and property and lives forever",
"description" : "Ethereum is a public blockchain that features a turing complete programming for building solid, decentralized applications.",
"goToTestnet" : "Use the test network",
"goToTestnetDescription" : "Test the technology freely in a sandboxed testnet, without using real ether.",
"gotoMainnet" : "Use the main network",
Expand Down Expand Up @@ -218,7 +218,7 @@
"syncMessageWithStates": "Block __displayBlock__ of __highestBlockString__ (Chain structure __statesPercent__%)",
"tutorial1Description" : "<p> Now the only thing left to do is wait for the download to finish. Here's some reading suggestions: </p> <h4>Make your own money </h4> <p> Make a cryptocurrency with a fixed market supply, tokens representing real world assets, etc </p>",
"tutorial2Description" : "<h4> Create a crowdsale </h4> <p> Raise funds for a common goal, fully trustable without a third party. Sidestep the hurdle of traditional funding system and go directly to the source by funding an organization via the blockchain.</p>",
"tutorial3Description" : "<h4> Blockchain Organization </h4> <p> Create an autonomous organization with unbreakable rules on how money can be spent and who can make the decisions. Let your backers take an active role on how the money is spent</p>",
"tutorial3Description" : "<h4> Create a blockchain organization </h4> <p> Create an autonomous organization with rules on spending money and making decisions for you and your investors.</p>",
"buttons": {
"showPassword": "Show password",
"importAccount": "Import account",
Expand All @@ -238,4 +238,4 @@
"checksumAlert":"This address looks valid, but it doesn't have some security features that will protect you against typos, so double check you have the right one. If provided, check if the security icon matches.",
"identiconHelper": "This is a security icon, if there's any change on the address the resulting icon should be a completely different one"
}
}
}