status-im
/
embark-area-51
mirror of https://github.com/status-im/embark-area-51.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

conflict in en.json

This commit is contained in:
Jonathan Rainville 2018-05-18 13:39:29 -04:00
parent 94f0d98e28
commit 50103a8c02
2 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/i18n/locales/en.json
View File

@ -3,7 +3,6 @@
"Contract Name": "Contract Name",
"New Application": "New Application",
"create a barebones project meant only for contract development": "create a barebones project meant only for contract development",
"language to use (default: en)": "language to use (default: en)",
"create a working dapp with a SimpleStorage contract": "create a working dapp with a SimpleStorage contract",
"filename to output logs (default: none)": "filename to output logs (default: none)",
"level of logging to display": "level of logging to display",
@ -26,9 +25,6 @@
"custom gas limit (default: %s)": "custom gas limit (default: %s)",
"run tests": "run tests",
"resets embarks state on this dapp including clearing cache": "resets embarks state on this dapp including clearing cache",
"Graph will not include undeployed contracts": "Graph will not include undeployed contracts",
"Graph will not include functions": "Graph will not include functions",
"Graph will not include events": "Graph will not include events",
"generates documentation based on the smart contracts configured": "generates documentation based on the smart contracts configured",
"Upload your dapp to a decentralized storage": "Upload your dapp to a decentralized storage",
"output the version number": "output the version number",
@ -42,12 +38,7 @@
"dashboard start": "dashboard start",
"loaded plugins": "loaded plugins",
"loading solc compiler": "loading solc compiler",
"Cannot upload: {{platform}} node is not running on {{url}}.": "Cannot upload: {{platform}} node is not running on {{url}}.",
"http:// Cannot upload: {{platform}} node is not running on {{url}}.": "http:// Cannot upload: {{platform}} node is not running on {{url}}.",
"Cannot upload:": "Cannot upload:",
"node is not running on": "node is not running on",
"compiling solidity contracts": "compiling solidity contracts",
"Cannot upload: {{platform}} node is not running on {{protocol}}://{{host}}:{{port}}.": "Cannot upload: {{platform}} node is not running on {{protocol}}://{{host}}:{{port}}.",
"%s doesn't have a compatible contract compiler. Maybe a plugin exists for it.": "%s doesn't have a compatible contract compiler. Maybe a plugin exists for it.",
"assuming %s to be an interface": "assuming %s to be an interface",
"{{className}}: couldn't find instanceOf contract {{parentContractName}}": "{{className}}: couldn't find instanceOf contract {{parentContractName}}",
@ -79,15 +70,15 @@
"to immediatly exit (alias: exit)": "to immediatly exit (alias: exit)",
"The web3 object and the interfaces for the deployed contracts and their methods are also available": "The web3 object and the interfaces for the deployed contracts and their methods are also available",
"versions in use": "versions in use",
"language to use (default: en)": "language to use (default: en)",
"executing": "executing",
"finished deploying": "finished deploying",
"writing file": "writing file",
"errors found while generating": "errors found while generating",
"deploying to swarm!": "deploying to swarm!",
"adding %s to swarm": "adding %s to swarm",
"error uploading to swarm": "error uploading to swarm",
"Looking for documentation? You can find it at": "Looking for documentation? You can find it at",
"Ready": "Ready",
"Graph will not include undeployed contracts": "Graph will not include undeployed contracts",
"Graph will not include functions": "Graph will not include functions",
"Graph will not include events": "Graph will not include events",
"Embark Blockchain Using: %s": "Embark Blockchain Using: %s",
"running: %s": "running: %s",
"Initializing Embark Template....": "Initializing Embark Template....",
@ -110,5 +101,5 @@
"downloading {{packageName}} {{version}}....": "downloading {{packageName}} {{version}}....",
"Swarm node is offline...": "Swarm node is offline...",
"Swarm node detected...": "Swarm node detected...",
"file not found, creating it...": "file not found, creating it..."
}
"Ethereum node (version unknown)": "Ethereum node (version unknown)"
}

6
test/blockchain.js
View File

@ -15,6 +15,7 @@ describe('embark.Blockchain', function () {
let config = {
networkType: 'custom',
genesisBlock: false,
accountsConfig: {},
geth_bin: 'geth',
datadir: false,
mineWhenNeeded: false,
@ -40,7 +41,7 @@ describe('embark.Blockchain', function () {
fast: false,
light: false
};
let blockchain = new Blockchain(config, 'geth');
let blockchain = new Blockchain(config, {}, 'geth');
assert.deepEqual(blockchain.config, config);
done();
@ -54,6 +55,7 @@ describe('embark.Blockchain', function () {
genesisBlock: 'foo/bar/genesis.json',
geth_bin: 'geth',
datadir: '/foo/datadir/',
accountsConfig: {},
mineWhenNeeded: true,
rpcHost: 'someserver',
rpcPort: 12345,
@ -77,7 +79,7 @@ describe('embark.Blockchain', function () {
fast: false,
light: false
};
let blockchain = new Blockchain(config, 'geth');
let blockchain = new Blockchain(config, {}, 'geth');
assert.deepEqual(blockchain.config, config);
done();