initial work for i18n
This commit is contained in:
Iuri Matias
parent
d84d064ede
commit
0b70f32bb9
|
|
@ -9,6 +9,9 @@
|
|||
"sourceType": "module",
|
||||
"ecmaVersion": 2017
|
||||
},
|
||||
"globals": {
|
||||
"__": true
|
||||
},
|
||||
"rules": {
|
||||
"accessor-pairs": "error",
|
||||
"array-bracket-newline": "error",
|
||||
|
|
|
|||
86
lib/cmd.js
86
lib/cmd.js
|
|
@ -2,8 +2,18 @@ const program = require('commander');
|
|||
const promptly = require('promptly');
|
||||
const utils = require('./utils/utils.js');
|
||||
const Embark = require('../lib/index');
|
||||
const i18n = require('i18n');
|
||||
let embark = new Embark;
|
||||
|
||||
i18n.configure({
|
||||
locales: ['en', 'pt'],
|
||||
register: global,
|
||||
//updateFiles: false,
|
||||
directory: utils.joinPath(__dirname, '/../locales')
|
||||
});
|
||||
|
||||
i18n.setLocale('pt');
|
||||
|
||||
class Cmd {
|
||||
constructor() {
|
||||
program.version(embark.version);
|
||||
|
|
@ -37,22 +47,22 @@ class Cmd {
|
|||
try {
|
||||
if (value.match(/^[a-zA-Z\s-]+$/)) return value;
|
||||
} catch (e) {
|
||||
throw new Error('Name must be only letters, spaces, or dashes');
|
||||
throw new Error(__('Name must be only letters, spaces, or dashes'));
|
||||
}
|
||||
};
|
||||
|
||||
program
|
||||
.command('new [name]')
|
||||
.description('new application')
|
||||
.option('--simple', 'create a barebones project meant only for contract development')
|
||||
.description(__('New Application'))
|
||||
.option('--simple', __('create a barebones project meant only for contract development'))
|
||||
.action(function (name, options) {
|
||||
if (name === undefined) {
|
||||
return promptly.prompt("Name your app (default is embarkDApp):", {
|
||||
return promptly.prompt(__("Name your app (default is %s):", 'embarkDapp'), {
|
||||
default: "embarkDApp",
|
||||
validator: validateName
|
||||
}, function (err, inputvalue) {
|
||||
if (err) {
|
||||
console.error('Invalid name:', err.message);
|
||||
console.error(__('Invalid name') + ':', err.message);
|
||||
// Manually call retry
|
||||
// The passed error has a retry method to easily prompt again.
|
||||
err.retry();
|
||||
|
|
@ -78,7 +88,7 @@ class Cmd {
|
|||
demo() {
|
||||
program
|
||||
.command('demo')
|
||||
.description('create a working dapp with a SimpleStorage contract')
|
||||
.description(__('create a working dapp with a SimpleStorage contract'))
|
||||
.action(function () {
|
||||
embark.generateTemplate('demo', './', 'embark_demo');
|
||||
});
|
||||
|
|
@ -87,9 +97,9 @@ class Cmd {
|
|||
build() {
|
||||
program
|
||||
.command('build [environment]')
|
||||
.option('--logfile [logfile]', 'filename to output logs (default: none)')
|
||||
.option('--loglevel [loglevel]', 'level of logging to display ["error", "warn", "info", "debug", "trace"]', /^(error|warn|info|debug|trace)$/i, 'debug')
|
||||
.description('deploy and build dapp at dist/ (default: development)')
|
||||
.option('--logfile [logfile]', __('filename to output logs (default: none)'))
|
||||
.option('--loglevel [loglevel]', __('level of logging to display') + ' ["error", "warn", "info", "debug", "trace"]', /^(error|warn|info|debug|trace)$/i, 'debug')
|
||||
.description(__('deploy and build dapp at ') + 'dist/ (default: development)')
|
||||
.action(function (env, _options) {
|
||||
_options.env = env || 'development';
|
||||
_options.logFile = _options.logfile; // fix casing
|
||||
|
|
@ -101,14 +111,14 @@ class Cmd {
|
|||
run() {
|
||||
program
|
||||
.command('run [environment]')
|
||||
.option('-p, --port [port]', 'port to run the dev webserver (default: 8000)')
|
||||
.option('-b, --host [host]', 'host to run the dev webserver (default: localhost)')
|
||||
.option('--noserver', 'disable the development webserver')
|
||||
.option('--nodashboard', 'simple mode, disables the dashboard')
|
||||
.option('--no-color', 'no colors in case it\'s needed for compatbility purposes')
|
||||
.option('--logfile [logfile]', 'filename to output logs (default: none)')
|
||||
.option('--loglevel [loglevel]', 'level of logging to display ["error", "warn", "info", "debug", "trace"]', /^(error|warn|info|debug|trace)$/i, 'debug')
|
||||
.description('run dapp (default: development)')
|
||||
.option('-p, --port [port]', __('port to run the dev webserver (default: %s)', '8000'))
|
||||
.option('-b, --host [host]', __('host to run the dev webserver (default: %s)', 'localhost'))
|
||||
.option('--noserver', __('disable the development webserver'))
|
||||
.option('--nodashboard', __('simple mode, disables the dashboard'))
|
||||
.option('--no-color', __('no colors in case it\'s needed for compatbility purposes'))
|
||||
.option('--logfile [logfile]', __('filename to output logs (default: %s)', 'none'))
|
||||
.option('--loglevel [loglevel]', __('level of logging to display') + ' ["error", "warn", "info", "debug", "trace"]', /^(error|warn|info|debug|trace)$/i, 'debug')
|
||||
.description(__('run dapp (default: %s)', 'development'))
|
||||
.action(function (env, options) {
|
||||
embark.run({
|
||||
env: env || 'development',
|
||||
|
|
@ -125,8 +135,8 @@ class Cmd {
|
|||
blockchain() {
|
||||
program
|
||||
.command('blockchain [environment]')
|
||||
.option('-c, --client [client]', 'Use a specific ethereum client or simulator (supported: geth, testrpc)')
|
||||
.description('run blockchain server (default: development)')
|
||||
.option('-c, --client [client]', __('Use a specific ethereum client or simulator (supported: %s)', 'geth, testrpc'))
|
||||
.description(__('run blockchain server (default: %s)', 'development'))
|
||||
.action(function (env, options) {
|
||||
embark.initConfig(env || 'development', {
|
||||
embarkConfig: 'embark.json',
|
||||
|
|
@ -139,13 +149,13 @@ class Cmd {
|
|||
simulator() {
|
||||
program
|
||||
.command('simulator [environment]')
|
||||
.description('run a fast ethereum rpc simulator')
|
||||
.option('--testrpc', 'use testrpc as the rpc simulator [default]')
|
||||
.option('-p, --port [port]', 'port to run the rpc simulator (default: 8545)')
|
||||
.option('-h, --host [host]', 'host to run the rpc simulator (default: localhost)')
|
||||
.option('-a, --accounts [numAccounts]', 'number of accounts (default: 10)')
|
||||
.option('-e, --defaultBalanceEther [balance]', 'Amount of ether to assign each test account (default: 100)')
|
||||
.option('-l, --gasLimit [gasLimit]', 'custom gas limit (default: 8000000)')
|
||||
.description(__('run a fast ethereum rpc simulator'))
|
||||
.option('--testrpc', __('use testrpc as the rpc simulator [%s]', 'default'))
|
||||
.option('-p, --port [port]', __('port to run the rpc simulator (default: %s)', '8545'))
|
||||
.option('-h, --host [host]', __('host to run the rpc simulator (default: %s)', 'localhost'))
|
||||
.option('-a, --accounts [numAccounts]', __('number of accounts (default: %s)', '10'))
|
||||
.option('-e, --defaultBalanceEther [balance]', __('Amount of ether to assign each test account (default: %s)', '100'))
|
||||
.option('-l, --gasLimit [gasLimit]', __('custom gas limit (default: %s)', '8000000'))
|
||||
|
||||
.action(function (env, options) {
|
||||
embark.initConfig(env || 'development', {
|
||||
|
|
@ -165,7 +175,7 @@ class Cmd {
|
|||
test() {
|
||||
program
|
||||
.command('test [file]')
|
||||
.description('run tests')
|
||||
.description(__('run tests'))
|
||||
.action(function (file) {
|
||||
embark.initConfig('development', {
|
||||
embarkConfig: 'embark.json', interceptLogs: false
|
||||
|
|
@ -177,9 +187,9 @@ class Cmd {
|
|||
upload() {
|
||||
program
|
||||
.command('upload <platform> [environment]')
|
||||
.option('--logfile [logfile]', 'filename to output logs (default: none)')
|
||||
.option('--loglevel [loglevel]', 'level of logging to display ["error", "warn", "info", "debug", "trace"]', /^(error|warn|info|debug|trace)$/i, 'debug')
|
||||
.description('Upload your dapp to a decentralized storage (e.g embark upload ipfs).')
|
||||
.option('--logfile [logfile]', __('filename to output logs (default: %s)', 'none'))
|
||||
.option('--loglevel [loglevel]', __('level of logging to display') + ' ["error", "warn", "info", "debug", "trace"]', /^(error|warn|info|debug|trace)$/i, 'debug')
|
||||
.description(__('Upload your dapp to a decentralized storage') + ' (e.g embark upload ipfs).')
|
||||
.action(function (platform, env, _options) {
|
||||
_options.env = env || 'development';
|
||||
_options.logFile = _options.logfile; // fix casing
|
||||
|
|
@ -191,10 +201,10 @@ class Cmd {
|
|||
graph() {
|
||||
program
|
||||
.command('graph [environment]')
|
||||
.option('--skip-undeployed', 'Graph will not include undeployed contracts')
|
||||
.option('--skip-functions', 'Graph will not include functions')
|
||||
.option('--skip-events', 'Graph will not include events')
|
||||
.description('generates documentation based on the smart contracts configured')
|
||||
.option('--skip-undeployed', __('Graph will not include undeployed contracts'))
|
||||
.option('--skip-functions', __('Graph will not include functions'))
|
||||
.option('--skip-events', __('Graph will not include events'))
|
||||
.description(__('generates documentation based on the smart contracts configured'))
|
||||
.action(function (env, options) {
|
||||
embark.graph({
|
||||
env: env || 'development',
|
||||
|
|
@ -209,7 +219,7 @@ class Cmd {
|
|||
reset() {
|
||||
program
|
||||
.command('reset')
|
||||
.description('resets embarks state on this dapp including clearing cache')
|
||||
.description(__('resets embarks state on this dapp including clearing cache'))
|
||||
.action(function () {
|
||||
embark.initConfig('development', {
|
||||
embarkConfig: 'embark.json', interceptLogs: false
|
||||
|
|
@ -221,7 +231,7 @@ class Cmd {
|
|||
versionCmd() {
|
||||
program
|
||||
.command('version')
|
||||
.description('output the version number')
|
||||
.description(__('output the version number'))
|
||||
.action(function () {
|
||||
console.log(embark.version);
|
||||
process.exit(0);
|
||||
|
|
@ -231,11 +241,11 @@ class Cmd {
|
|||
otherCommands() {
|
||||
program
|
||||
.action(function (cmd) {
|
||||
console.log('unknown command "%s"'.red, cmd);
|
||||
console.log((__('unknown command') + ' "%s"').red, cmd);
|
||||
let dictionary = ['new', 'demo', 'build', 'run', 'blockchain', 'simulator', 'test', 'upload', 'version'];
|
||||
let suggestion = utils.proposeAlternative(cmd, dictionary);
|
||||
if (suggestion) {
|
||||
console.log('did you mean "%s"?'.green, suggestion);
|
||||
console.log((__('did you mean') + ' "%s"?').green, suggestion);
|
||||
}
|
||||
console.log("type embark --help to see the available commands");
|
||||
process.exit(0);
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ var Blockchain = function(options) {
|
|||
this.client = options.client;
|
||||
|
||||
if ((this.blockchainConfig === {} || JSON.stringify(this.blockchainConfig) === '{"enabled":true}') && this.env !== 'development') {
|
||||
console.log("===> warning: running default config on a non-development environment");
|
||||
console.log("===> " + __("warning: running default config on a non-development environment"));
|
||||
}
|
||||
|
||||
this.config = {
|
||||
|
|
@ -62,12 +62,12 @@ var Blockchain = function(options) {
|
|||
};
|
||||
|
||||
Blockchain.prototype.runCommand = function(cmd, options) {
|
||||
console.log(("running: " + cmd.underline).green);
|
||||
console.log(__("running: %s", cmd.underline).green);
|
||||
return shelljs.exec(cmd, options, (err, stdout, _stderr) => {
|
||||
if (err && this.env === 'development' && stdout.indexOf('Failed to unlock developer account') > 0) {
|
||||
console.warn('\nDevelopment blockchain has changed to use the --dev option.'.yellow);
|
||||
console.warn('You can reset your workspace to fix the problem with'.yellow + ' embark reset'.cyan);
|
||||
console.warn('Otherwise, you can change your data directory in blockchain.json (datadir)'.yellow);
|
||||
console.warn('\n' + __('Development blockchain has changed to use the --dev option.').yellow);
|
||||
console.warn(__('You can reset your workspace to fix the problem with').yellow + ' embark reset'.cyan);
|
||||
console.warn(__('Otherwise, you can change your data directory in blockchain.json (datadir)').yellow);
|
||||
}
|
||||
});
|
||||
};
|
||||
|
|
@ -76,11 +76,11 @@ Blockchain.prototype.run = function() {
|
|||
var self = this;
|
||||
console.log("===============================================================================".magenta);
|
||||
console.log("===============================================================================".magenta);
|
||||
console.log(("Embark Blockchain Using: " + this.client.name.underline).magenta);
|
||||
console.log(__("Embark Blockchain Using: %s", this.client.name.underline).magenta);
|
||||
console.log("===============================================================================".magenta);
|
||||
console.log("===============================================================================".magenta);
|
||||
if (!this.isClientInstalled()) {
|
||||
console.log(("could not find " + this.config.geth_bin + " command; is " + this.client.name + " installed or in the PATH?").green);
|
||||
console.log(__("could not find {{geth_bin}} command; is {{client_name}} installed or in the PATH?", {geth_bin: this.config.geth_bin, client_name: this.client.name}).green);
|
||||
return;
|
||||
}
|
||||
let address = '';
|
||||
|
|
@ -115,16 +115,16 @@ Blockchain.prototype.initChainAndGetAddress = function() {
|
|||
// check if an account already exists, create one if not, return address
|
||||
result = this.runCommand(this.client.listAccountsCommand());
|
||||
if (result.output === undefined || result.output.match(/{(\w+)}/) === null || result.output.indexOf("Fatal") >= 0) {
|
||||
console.log("no accounts found".green);
|
||||
console.log(__("no accounts found").green);
|
||||
if (this.config.genesisBlock) {
|
||||
console.log("initializing genesis block".green);
|
||||
console.log(__("initializing genesis block").green);
|
||||
result = this.runCommand(this.client.initGenesisCommmand());
|
||||
}
|
||||
|
||||
result = this.runCommand(this.client.newAccountCommand());
|
||||
address = result.output.match(/{(\w+)}/)[1];
|
||||
} else {
|
||||
console.log("already initialized".green);
|
||||
console.log(__("already initialized").green);
|
||||
address = result.output.match(/{(\w+)}/)[1];
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -80,14 +80,14 @@ class GethCommands {
|
|||
if (config.rpcCorsDomain) {
|
||||
if (config.rpcCorsDomain === '*') {
|
||||
console.log('==================================');
|
||||
console.log('rpcCorsDomain set to *');
|
||||
console.log('make sure you know what you are doing');
|
||||
console.log(__('rpcCorsDomain set to *'));
|
||||
console.log(__('make sure you know what you are doing'));
|
||||
console.log('==================================');
|
||||
}
|
||||
cmd += "--rpccorsdomain=\"" + config.rpcCorsDomain + "\" ";
|
||||
} else {
|
||||
console.log('==================================');
|
||||
console.log('warning: cors is not set');
|
||||
console.log(__('warning: cors is not set'));
|
||||
console.log('==================================');
|
||||
}
|
||||
|
||||
|
|
@ -104,14 +104,14 @@ class GethCommands {
|
|||
if (config.wsOrigins) {
|
||||
if (config.wsOrigins === '*') {
|
||||
console.log('==================================');
|
||||
console.log('wsOrigins set to *');
|
||||
console.log('make sure you know what you are doing');
|
||||
console.log(__('wsOrigins set to *'));
|
||||
console.log(__('make sure you know what you are doing'));
|
||||
console.log('==================================');
|
||||
}
|
||||
cmd += "--wsorigins \"" + config.wsOrigins + "\" ";
|
||||
} else {
|
||||
console.log('==================================');
|
||||
console.log('warning: wsOrigins is not set');
|
||||
console.log(__('warning: wsOrigins is not set'));
|
||||
console.log('==================================');
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,5 +4,5 @@ module.exports = function() {
|
|||
fs.removeSync('./chains.json');
|
||||
fs.removeSync('.embark/');
|
||||
fs.removeSync('dist/');
|
||||
console.log("reset done!".green);
|
||||
console.log(__("reset done!").green);
|
||||
};
|
||||
|
|
|
|||
|
|
@ -12,8 +12,8 @@ class Simulator {
|
|||
const testrpc = shelljs.which('testrpc');
|
||||
const ganache = shelljs.which('ganache-cli');
|
||||
if (!testrpc && !ganache) {
|
||||
this.logger.warn('Ganache CLI (TestRPC) is not installed on your machine');
|
||||
this.logger.info('You can install it by running: npm -g install ganache-cli');
|
||||
this.logger.warn(__('%s is not installed on your machine', 'Ganache CLI (TestRPC)'));
|
||||
this.logger.info(__('You can install it by running: %s', 'npm -g install ganache-cli'));
|
||||
process.exit();
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ class TemplateGenerator {
|
|||
|
||||
generate(destinationFolder, name) {
|
||||
let templatePath = fs.embarkPath(utils.joinPath('templates', this.templateName));
|
||||
console.log('Initializing Embark Template....'.green);
|
||||
console.log(__('Initializing Embark Template....').green);
|
||||
let fspath = utils.joinPath(destinationFolder, name);
|
||||
|
||||
fs.copySync(templatePath, fspath);
|
||||
|
|
@ -16,21 +16,21 @@ class TemplateGenerator {
|
|||
utils.sed('package.json', '%APP_NAME%', name);
|
||||
|
||||
if (name === 'embark_demo') {
|
||||
console.log('Installing packages...'.green);
|
||||
console.log(__('Installing packages...').green);
|
||||
utils.runCmd('npm install');
|
||||
}
|
||||
|
||||
console.log('Init complete'.green);
|
||||
console.log('\nApp ready at '.green + fspath);
|
||||
console.log(__('Init complete').green);
|
||||
console.log('\n' + __('App ready at ').green + fspath);
|
||||
|
||||
if (name === 'embark_demo') {
|
||||
console.log('-------------------'.yellow);
|
||||
console.log('Next steps:'.green);
|
||||
console.log(__('Next steps:').green);
|
||||
console.log(('-> ' + ('cd ' + fspath).bold.cyan).green);
|
||||
console.log('-> '.green + 'embark blockchain'.bold.cyan + ' or '.green + 'embark simulator'.bold.cyan);
|
||||
console.log('open another console in the same directory and run'.green);
|
||||
console.log(__('open another console in the same directory and run').green);
|
||||
console.log('-> '.green + 'embark run'.bold.cyan);
|
||||
console.log('For more info go to http://embark.status.im'.green);
|
||||
console.log(__('For more info go to http://embark.status.im').green);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ class Compiler {
|
|||
function (err) {
|
||||
contractFiles.forEach(file => {
|
||||
if (!file.compiled) {
|
||||
self.logger.warn(`${file.filename} doesn't have a compatible contract compiler. Maybe a plugin exists for it.`);
|
||||
self.logger.warn(__("%s doesn't have a compatible contract compiler. Maybe a plugin exists for it.", file.filename));
|
||||
}
|
||||
});
|
||||
|
||||
|
|
|
|||
|
|
@ -86,7 +86,7 @@ class ContractsManager {
|
|||
}
|
||||
|
||||
if (contract.code === "") {
|
||||
self.logger.info("assuming " + className + " to be an interface");
|
||||
self.logger.info(__("assuming %s to be an interface", className));
|
||||
contract.deploy = false;
|
||||
}
|
||||
}
|
||||
|
|
@ -108,15 +108,15 @@ class ContractsManager {
|
|||
parentContract = self.contracts[parentContractName];
|
||||
|
||||
if (parentContract === className) {
|
||||
self.logger.error(className + ": instanceOf is set to itself");
|
||||
self.logger.error(__("%s : instanceOf is set to itself", className));
|
||||
continue;
|
||||
}
|
||||
|
||||
if (parentContract === undefined) {
|
||||
self.logger.error(className + ": couldn't find instanceOf contract " + parentContractName);
|
||||
self.logger.error(__("{{className}}: couldn't find instanceOf contract {{parentContractName}}", {className: className, parentContractName: parentContractName}));
|
||||
let suggestion = utils.proposeAlternative(parentContractName, dictionary, [className, parentContractName]);
|
||||
if (suggestion) {
|
||||
self.logger.warn('did you mean "' + suggestion + '"?');
|
||||
self.logger.warn(__('did you mean "%s"?', suggestion));
|
||||
}
|
||||
continue;
|
||||
}
|
||||
|
|
@ -126,7 +126,7 @@ class ContractsManager {
|
|||
}
|
||||
|
||||
if (contract.code !== undefined) {
|
||||
self.logger.error(className + " has code associated to it but it's configured as an instanceOf " + parentContractName);
|
||||
self.logger.error(__("{{className}} has code associated to it but it's configured as an instanceOf {{parentContractName}}", {className: className, parentContractName: parentContractName}));
|
||||
}
|
||||
|
||||
contract.code = parentContract.code;
|
||||
|
|
@ -149,10 +149,10 @@ class ContractsManager {
|
|||
contract = self.contracts[className];
|
||||
|
||||
if (contract.code === undefined) {
|
||||
self.logger.error(className + " has no code associated");
|
||||
self.logger.error(__("%s has no code associated", className));
|
||||
let suggestion = utils.proposeAlternative(className, dictionary, [className]);
|
||||
if (suggestion) {
|
||||
self.logger.warn('did you mean "' + suggestion + '"?');
|
||||
self.logger.warn(__('did you mean "%s"?', suggestion));
|
||||
}
|
||||
delete self.contracts[className];
|
||||
}
|
||||
|
|
@ -216,7 +216,7 @@ class ContractsManager {
|
|||
}
|
||||
], function (err, _result) {
|
||||
if (err) {
|
||||
self.logger.error("Error Compiling/Building contracts: " + err);
|
||||
self.logger.error(__("Error Compiling/Building contracts: ") + err);
|
||||
}
|
||||
self.logger.trace("finished".underline);
|
||||
done(err, self);
|
||||
|
|
@ -242,9 +242,9 @@ class ContractsManager {
|
|||
try {
|
||||
orderedDependencies = toposort(converted_dependencies.filter((x) => x[0] != x[1])).reverse();
|
||||
} catch(e) {
|
||||
this.logger.error(("Error: " + e.message).red);
|
||||
this.logger.error("there are two or more contracts that depend on each other in a cyclic manner".bold.red);
|
||||
this.logger.error("Embark couldn't determine which one to deploy first".red);
|
||||
this.logger.error((__("Error: ") + e.message).red);
|
||||
this.logger.error(__("there are two or more contracts that depend on each other in a cyclic manner").bold.red);
|
||||
this.logger.error(__("Embark couldn't determine which one to deploy first").red);
|
||||
throw new Error("CyclicDependencyError");
|
||||
//process.exit(0);
|
||||
}
|
||||
|
|
@ -279,7 +279,7 @@ class ContractsManager {
|
|||
if (contract.deploy === false) {
|
||||
contractData = [
|
||||
className.green,
|
||||
'Interface or set to not deploy'.green,
|
||||
__('Interface or set to not deploy').green,
|
||||
"\t\tn/a".green
|
||||
];
|
||||
} else if (contract.error) {
|
||||
|
|
@ -292,7 +292,7 @@ class ContractsManager {
|
|||
contractData = [
|
||||
className.green,
|
||||
(contract.deployedAddress || '...').green,
|
||||
((contract.deployedAddress !== undefined) ? "\t\tDeployed".green : "\t\tPending".magenta)
|
||||
((contract.deployedAddress !== undefined) ? ("\t\t" + __("Deployed")).green : ("\t\t" + __("Pending")).magenta)
|
||||
];
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ class Deploy {
|
|||
for (let input of abi.inputs) {
|
||||
let inputValue = suppliedArgs[input.name];
|
||||
if (!inputValue) {
|
||||
this.logger.error(input.name + " has not been defined for " + contract.className + " constructor");
|
||||
this.logger.error(__("{{inputName}} has not been defined for {{className}} constructor", {inputName: input.name, className: contract.className}));
|
||||
}
|
||||
args.push(inputValue || "");
|
||||
}
|
||||
|
|
@ -88,14 +88,14 @@ class Deploy {
|
|||
try {
|
||||
this.web3.utils.toChecksumAddress(contract.address);
|
||||
} catch(e) {
|
||||
self.logger.error("error deploying " + contract.className);
|
||||
self.logger.error(__("error deploying %s", contract.className));
|
||||
self.logger.error(e.message);
|
||||
contract.error = e.message;
|
||||
self.events.emit('contractsState', self.contractsManager.contractsState());
|
||||
return callback(e.message);
|
||||
}
|
||||
contract.deployedAddress = contract.address;
|
||||
self.logger.info(contract.className.bold.cyan + " already deployed at ".green + contract.address.bold.cyan);
|
||||
self.logger.info(contract.className.bold.cyan + __(" already deployed at ").green + contract.address.bold.cyan);
|
||||
if (this.deployTracker) {
|
||||
self.deployTracker.trackContract(contract.className, contract.realRuntimeBytecode, realArgs, contract.address);
|
||||
self.deployTracker.save();
|
||||
|
|
@ -124,7 +124,7 @@ class Deploy {
|
|||
|
||||
contractAlreadyDeployed(contract, trackedContract, callback) {
|
||||
const self = this;
|
||||
self.logger.info(contract.className.bold.cyan + " already deployed at ".green + trackedContract.address.bold.cyan);
|
||||
self.logger.info(contract.className.bold.cyan + __(" already deployed at ").green + trackedContract.address.bold.cyan);
|
||||
contract.deployedAddress = trackedContract.address;
|
||||
self.events.emit('contractsState', self.contractsManager.contractsState());
|
||||
|
||||
|
|
@ -154,7 +154,7 @@ class Deploy {
|
|||
RunCode.doEval(contractCode, self.web3);
|
||||
|
||||
if (contract.onDeploy !== undefined) {
|
||||
self.logger.info('executing onDeploy commands');
|
||||
self.logger.info(__('executing onDeploy commands'));
|
||||
|
||||
let contractCode = codeGenerator.generateContractCode(contract, self.gasLimit);
|
||||
RunCode.doEval(contractCode, self.web3);
|
||||
|
|
@ -166,23 +166,23 @@ class Deploy {
|
|||
let referedContractName = match.slice(1);
|
||||
let referedContract = self.contractsManager.getContract(referedContractName);
|
||||
if (!referedContract) {
|
||||
self.logger.error('error executing onDeploy for ' + contract.className);
|
||||
self.logger.error(referedContractName + ' does not exist');
|
||||
self.logger.error("error running onDeploy: " + cmd);
|
||||
self.logger.error(__('error executing onDeploy for ') + contract.className.cyan);
|
||||
self.logger.error(referedContractName + __(' does not exist'));
|
||||
self.logger.error(__("error running onDeploy: ") + cmd);
|
||||
withErrors = true;
|
||||
return;
|
||||
}
|
||||
if (referedContract && referedContract.deploy === false) {
|
||||
self.logger.error('error executing onDeploy for ' + contract.className);
|
||||
self.logger.error(referedContractName + " exists but has been set to not deploy");
|
||||
self.logger.error("error running onDeploy: " + cmd);
|
||||
self.logger.error(__('error executing onDeploy for ') + contract.className.cyan);
|
||||
self.logger.error(referedContractName + __(" exists but has been set to not deploy"));
|
||||
self.logger.error(__("error running onDeploy: ") + cmd);
|
||||
withErrors = true;
|
||||
return;
|
||||
}
|
||||
if (referedContract && !referedContract.deployedAddress) {
|
||||
self.logger.error('error executing onDeploy for ' + contract.className);
|
||||
self.logger.error("couldn't find a valid address for " + referedContractName + ". has it been deployed?");
|
||||
self.logger.error("error running onDeploy: " + cmd);
|
||||
self.logger.error(__('error executing onDeploy for ') + contract.className.cyan);
|
||||
self.logger.error(__("couldn't find a valid address for %s has it been deployed?", referedContractName));
|
||||
self.logger.error(__("error running onDeploy: ") + cmd);
|
||||
withErrors = true;
|
||||
return;
|
||||
}
|
||||
|
|
@ -198,12 +198,12 @@ class Deploy {
|
|||
|
||||
// TODO: convert to for to avoid repeated callback
|
||||
for(let cmd of onDeployCode) {
|
||||
self.logger.info("executing: " + cmd);
|
||||
self.logger.info(__("executing: ") + cmd);
|
||||
try {
|
||||
RunCode.doEval(cmd, self.web3);
|
||||
} catch(e) {
|
||||
if (e.message.indexOf("invalid opcode") >= 0) {
|
||||
self.logger.error('the transaction was rejected; this usually happens due to a throw or a require, it can also happen due to an invalid operation');
|
||||
self.logger.error(__('the transaction was rejected; this usually happens due to a throw or a require, it can also happen due to an invalid operation'));
|
||||
}
|
||||
return callback(new Error(e));
|
||||
}
|
||||
|
|
@ -234,11 +234,11 @@ class Deploy {
|
|||
if (typeof contract.fromIndex == 'number') {
|
||||
deploymentAccount = accounts[contract.fromIndex];
|
||||
if (deploymentAccount === undefined) {
|
||||
return next("error deploying " + contract.className + ": no account found at index " + contract.fromIndex + " check the config");
|
||||
return next(__("error deploying") + " " + contract.className + ": " + __("no account found at index") + " " + contract.fromIndex + __(" check the config"));
|
||||
}
|
||||
}
|
||||
if (typeof contract.from == 'string' && typeof contract.fromIndex != 'undefined') {
|
||||
self.logger.warn('Both "from" and "fromIndex" are defined for contract "'+contract.className+'". Using "from" as deployer account.');
|
||||
self.logger.warn(__('Both "from" and "fromIndex" are defined for contract') + ' "' + contract.className + '". ' + __('Using "from" as deployer account.'));
|
||||
}
|
||||
if (typeof contract.from == 'string') {
|
||||
deploymentAccount = contract.from;
|
||||
|
|
@ -262,12 +262,12 @@ class Deploy {
|
|||
continue;
|
||||
}
|
||||
if (linkReference.length > 40) {
|
||||
return next(new Error(linkReference + " is too long, try reducing the path of the contract (" + filename + ") and/or its name " + contractObj.className));
|
||||
return next(new Error(__("{{linkReference}} is too long, try reducing the path of the contract ({{filename}}) and/or its name {{contractName}}", {linkReference: linkReference, filename: filename, contractName: contractObj.className})));
|
||||
}
|
||||
let toReplace = linkReference + "_".repeat(40 - linkReference.length);
|
||||
if (deployedAddress === undefined) {
|
||||
let libraryName = contractObj.className;
|
||||
return next(new Error(contract.className + " needs " + libraryName + " but an address was not found, did you deploy it or configured an address?"));
|
||||
return next(new Error(__("{{contractName}} needs {{libraryName}} but an address was not found, did you deploy it or configured an address?", {contractName: contract.className, libraryName: libraryName})));
|
||||
}
|
||||
contractCode = contractCode.replace(new RegExp(toReplace, "g"), deployedAddress);
|
||||
}
|
||||
|
|
@ -280,7 +280,7 @@ class Deploy {
|
|||
|
||||
//self.logger.info("applying beforeDeploy plugins...", beforeDeployPlugins.length);
|
||||
async.eachSeries(beforeDeployPlugins, (plugin, eachPluginCb) => {
|
||||
self.logger.info("running beforeDeploy plugin " + plugin.name + " .");
|
||||
self.logger.info(__("running beforeDeploy plugin %s .", plugin.name));
|
||||
|
||||
// calling each beforeDeploy handler declared by the plugin
|
||||
async.eachSeries(plugin.beforeDeploy, (beforeDeployFn, eachCb) => {
|
||||
|
|
@ -313,7 +313,7 @@ class Deploy {
|
|||
deployObject = contractObject.deploy({arguments: contractParams, data: dataCode});
|
||||
} catch(e) {
|
||||
if (e.message.indexOf('Invalid number of parameters for "undefined"') >= 0) {
|
||||
return next(new Error("attempted to deploy " + contract.className + " without specifying parameters"));
|
||||
return next(new Error(__("attempted to deploy %s without specifying parameters", contract.className)));
|
||||
} else {
|
||||
return next(new Error(e));
|
||||
}
|
||||
|
|
@ -330,7 +330,7 @@ class Deploy {
|
|||
next();
|
||||
},
|
||||
function deployTheContract(next) {
|
||||
self.logger.info("deploying " + contract.className.bold.cyan + " with ".green + contract.gas + " gas".green);
|
||||
self.logger.info(__("deploying") + " " + contract.className.bold.cyan + " " + __("with").green + " " + contract.gas + " " + __("gas").green);
|
||||
|
||||
deployObject.send({
|
||||
from: deploymentAccount,
|
||||
|
|
@ -338,7 +338,7 @@ class Deploy {
|
|||
gasPrice: contract.gasPrice
|
||||
}).on('receipt', function(receipt) {
|
||||
if (receipt.contractAddress !== undefined) {
|
||||
self.logger.info(contract.className.bold.cyan + " deployed at ".green + receipt.contractAddress.bold.cyan);
|
||||
self.logger.info(contract.className.bold.cyan + " " + __("deployed at").green + " " + receipt.contractAddress.bold.cyan);
|
||||
contract.deployedAddress = receipt.contractAddress;
|
||||
contract.transactionHash = receipt.transactionHash;
|
||||
self.events.emit('contractsState', self.contractsManager.contractsState());
|
||||
|
|
@ -347,7 +347,7 @@ class Deploy {
|
|||
self.events.emit('contractsState', self.contractsManager.contractsState());
|
||||
}).on('error', function(error) {
|
||||
self.events.emit('contractsState', self.contractsManager.contractsState());
|
||||
return next(new Error("error deploying =" + contract.className + "= due to error: " + error.message));
|
||||
return next(new Error(__("error deploying") + " =" + contract.className + "= " + __("due to error") + ": " + error.message));
|
||||
});
|
||||
}
|
||||
], callback);
|
||||
|
|
@ -355,7 +355,7 @@ class Deploy {
|
|||
|
||||
deployAll(done) {
|
||||
let self = this;
|
||||
this.logger.info("deploying contracts");
|
||||
this.logger.info(__("deploying contracts"));
|
||||
let contracts = this.contractsManager.listContracts();
|
||||
|
||||
async.eachOfSeries(contracts,
|
||||
|
|
@ -365,15 +365,15 @@ class Deploy {
|
|||
},
|
||||
function (err, _results) {
|
||||
if (err) {
|
||||
self.logger.error("error deploying contracts");
|
||||
self.logger.error(__("error deploying contracts"));
|
||||
self.logger.error(err.message);
|
||||
self.logger.debug(err.stack);
|
||||
}
|
||||
if (contracts.length === 0) {
|
||||
self.logger.info("no contracts found");
|
||||
self.logger.info(__("no contracts found"));
|
||||
return done();
|
||||
}
|
||||
self.logger.info("finished deploying contracts");
|
||||
self.logger.info(__("finished deploying contracts"));
|
||||
self.logger.trace(arguments);
|
||||
done(err);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ class DeployManager {
|
|||
let self = this;
|
||||
|
||||
if (self.blockchainConfig === {} || self.blockchainConfig.enabled === false) {
|
||||
self.logger.info("Blockchain component is disabled in the config".underline);
|
||||
self.logger.info(__("Blockchain component is disabled in the config").underline);
|
||||
this.events.emit('blockchainDisabled', {});
|
||||
return done();
|
||||
}
|
||||
|
|
@ -47,15 +47,15 @@ class DeployManager {
|
|||
}
|
||||
|
||||
if (self.web3.currentProvider === undefined) {
|
||||
self.logger.error(("Couldn't connect to an Ethereum node are you sure it's on?").red);
|
||||
self.logger.info("make sure you have an Ethereum node or simulator running. e.g 'embark blockchain'".magenta);
|
||||
self.logger.error(__("Couldn't connect to an Ethereum node are you sure it's on?").red);
|
||||
self.logger.info(__("make sure you have an Ethereum node or simulator running. e.g '%s'", 'embark blockchain').magenta);
|
||||
return callback(Error("error connecting to blockchain node"));
|
||||
}
|
||||
|
||||
self.web3.eth.getAccounts(function(err, _accounts) {
|
||||
if (err) {
|
||||
self.logger.error(("Couldn't connect to an Ethereum node are you sure it's on?").red);
|
||||
self.logger.info("make sure you have an Ethereum node or simulator running. e.g 'embark blockchain'".magenta);
|
||||
self.logger.error(__("Couldn't connect to an Ethereum node are you sure it's on?").red);
|
||||
self.logger.info(__("make sure you have an Ethereum node or simulator running. e.g '%s'", 'embark blockchain').magenta);
|
||||
return callback(Error("error connecting to blockchain node"));
|
||||
}
|
||||
return callback(null, contractsManager, self.web3);
|
||||
|
|
@ -108,19 +108,19 @@ class DeployManager {
|
|||
let referedContract = contractsManager.getContract(referedContractName);
|
||||
if (!referedContract) {
|
||||
self.logger.error(referedContractName + ' does not exist');
|
||||
self.logger.error("error running afterDeploy: " + cmd);
|
||||
self.logger.error(__("error running afterDeploy: ") + cmd);
|
||||
withErrors = true;
|
||||
return;
|
||||
}
|
||||
if (referedContract && referedContract.deploy === false) {
|
||||
self.logger.error(referedContractName + " exists but has been set to not deploy");
|
||||
self.logger.error("error running afterDeploy: " + cmd);
|
||||
self.logger.error(__("error running afterDeploy: ") + cmd);
|
||||
withErrors = true;
|
||||
return;
|
||||
}
|
||||
if (referedContract && !referedContract.deployedAddress) {
|
||||
self.logger.error("couldn't find a valid address for " + referedContractName + ". has it been deployed?");
|
||||
self.logger.error("error running afterDeploy: " + cmd);
|
||||
self.logger.error(__("error running afterDeploy: ") + cmd);
|
||||
withErrors = true;
|
||||
return;
|
||||
}
|
||||
|
|
@ -135,12 +135,12 @@ class DeployManager {
|
|||
|
||||
// TODO: convert to for to avoid repeated callback
|
||||
for(let cmd of onDeployCode) {
|
||||
self.logger.info("executing: " + cmd);
|
||||
self.logger.info(__("executing") + ": " + cmd);
|
||||
try {
|
||||
RunCode.doEval(cmd, web3);
|
||||
} catch(e) {
|
||||
if (e.message.indexOf("invalid opcode") >= 0) {
|
||||
self.logger.error('the transaction was rejected; this usually happens due to a throw or a require, it can also happen due to an invalid operation');
|
||||
self.logger.error(__('the transaction was rejected; this usually happens due to a throw or a require, it can also happen due to an invalid operation'));
|
||||
}
|
||||
return callback(new Error(e));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ Config.prototype.loadConfigFiles = function(options) {
|
|||
}
|
||||
|
||||
if (!fs.existsSync(options.embarkConfig)){
|
||||
this.logger.error('Cannot find file ' + options.embarkConfig + '. Please ensure you are running this command inside the Dapp folder');
|
||||
this.logger.error(__('Cannot find file %s Please ensure you are running this command inside the Dapp folder', options.embarkConfig));
|
||||
process.exit(1);
|
||||
}
|
||||
|
||||
|
|
@ -78,7 +78,7 @@ Config.prototype._mergeConfig = function(configFilePath, defaultConfig, env, ena
|
|||
if (!fs.existsSync(configFilePath)) {
|
||||
// TODO: remove this if
|
||||
if (this.logger) {
|
||||
this.logger.warn("no config file found at " + configFilePath + ". using default config");
|
||||
this.logger.warn(__("no config file found at %s using default config", configFilePath));
|
||||
}
|
||||
return defaultConfig['default'] || {};
|
||||
}
|
||||
|
|
@ -162,7 +162,7 @@ Config.prototype.loadExternalContractsFiles = function() {
|
|||
if (contract.file.startsWith('http') || contract.file.startsWith('git')) {
|
||||
const fileObj = utils.getExternalContractUrl(contract.file);
|
||||
if (!fileObj) {
|
||||
return this.logger.error("HTTP contract file not found: " + contract.file);
|
||||
return this.logger.error(__("HTTP contract file not found") + ": " + contract.file);
|
||||
}
|
||||
const localFile = fileObj.filePath;
|
||||
this.contractsFiles.push(new File({filename: localFile, type: File.types.http, basedir: '', path: fileObj.url}));
|
||||
|
|
@ -171,7 +171,7 @@ Config.prototype.loadExternalContractsFiles = function() {
|
|||
} else if (fs.existsSync(path.join('./node_modules/', contract.file))) {
|
||||
this.contractsFiles.push(new File({filename: path.join('./node_modules/', contract.file), type: File.types.dapp_file, basedir: '', path: path.join('./node_modules/', contract.file)}));
|
||||
} else {
|
||||
this.logger.error("contract file not found: " + contract.file);
|
||||
this.logger.error(__("contract file not found") + ": " + contract.file);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
|
@ -253,7 +253,7 @@ Config.prototype.loadPipelineConfigFile = function() {
|
|||
|
||||
Config.prototype.loadChainTrackerFile = function() {
|
||||
if (!fs.existsSync(this.chainsFile)) {
|
||||
this.logger.info(this.chainsFile + ' file not found, creating it...');
|
||||
this.logger.info(this.chainsFile + ' ' + __('file not found, creating it...'));
|
||||
fs.writeJSONSync(this.chainsFile, {});
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -280,18 +280,18 @@ class Engine {
|
|||
|
||||
self.servicesMonitor.addCheck('Ethereum', function (cb) {
|
||||
if (self.web3.currentProvider === undefined) {
|
||||
return cb({name: "No Blockchain node found", status: 'off'});
|
||||
return cb({name: __("No Blockchain node found"), status: 'off'});
|
||||
}
|
||||
|
||||
self.web3.eth.getAccounts(function(err, _accounts) {
|
||||
if (err) {
|
||||
return cb({name: "No Blockchain node found", status: 'off'});
|
||||
return cb({name: __("No Blockchain node found"), status: 'off'});
|
||||
}
|
||||
|
||||
// TODO: web3_clientVersion method is currently not implemented in web3.js 1.0
|
||||
self.web3._requestManager.send({method: 'web3_clientVersion', params: []}, (err, version) => {
|
||||
if (err) {
|
||||
return cb({name: "Ethereum node (version unknown)", status: 'on'});
|
||||
return cb({name: __("Ethereum node (version unknown)"), status: 'on'});
|
||||
}
|
||||
if (version.indexOf("/") < 0) {
|
||||
return cb({name: version, status: 'on'});
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ var EventEmitter = require('events');
|
|||
function warnIfLegacy(eventName) {
|
||||
const legacyEvents = ['abi-vanila', 'abi', 'abi-contracts-vanila', 'abi-vanila-deployment'];
|
||||
if (legacyEvents.indexOf(eventName) >= 0) {
|
||||
console.info("this event is deprecated and will be removed in future versions: " + eventName);
|
||||
console.info(__("this event is deprecated and will be removed in future versions %s", eventName));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -93,7 +93,7 @@ class File {
|
|||
}
|
||||
], (err, content) => {
|
||||
if (err) {
|
||||
console.error('Error while downloading the file', err);
|
||||
console.error(__('Error while downloading the file'), err);
|
||||
return callback('');
|
||||
}
|
||||
callback(content.toString());
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@ Plugin.prototype.hasContext = function(context) {
|
|||
Plugin.prototype.loadPlugin = function() {
|
||||
if (!this.isContextValid()) {
|
||||
console.log(this.acceptedContext);
|
||||
this.logger.warn(`Plugin ${this.name} can only be loaded in the context of "${this.acceptedContext.join(', ')}"`);
|
||||
this.logger.warn(__('Plugin {{name}} can only be loaded in the context of "{{contextes}}"', {name: this.name, contextes: this.acceptedContext.join(', ')}));
|
||||
return false;
|
||||
}
|
||||
this.loaded = true;
|
||||
|
|
|
|||
|
|
@ -70,7 +70,7 @@ ServicesMonitor.prototype.startMonitor = function () {
|
|||
callback();
|
||||
}, function (err) {
|
||||
if (err) {
|
||||
self.logger.error("error running service check");
|
||||
self.logger.error(__("error running service check"));
|
||||
self.logger.error(err.message);
|
||||
}
|
||||
});
|
||||
|
|
|
|||
|
|
@ -14,21 +14,21 @@ class Console {
|
|||
}
|
||||
|
||||
processEmbarkCmd (cmd) {
|
||||
if (cmd === 'help') {
|
||||
if (cmd === 'help' || cmd === __('help')) {
|
||||
let helpText = [
|
||||
'Welcome to Embark ' + this.version,
|
||||
__('Welcome to Embark') + ' ' + this.version,
|
||||
'',
|
||||
'possible commands are:',
|
||||
'versions - display versions in use for libraries and tools like web3 and solc',
|
||||
__('possible commands are:'),
|
||||
'versions - ' + __('display versions in use for libraries and tools like web3 and solc'),
|
||||
// TODO: only if the blockchain is actually active!
|
||||
// will need to pass te current embark state here
|
||||
'web3 - instantiated web3.js object configured to the current environment',
|
||||
'quit - to immediatly exit (alias: exit)',
|
||||
'web3 - ' + __('instantiated web3.js object configured to the current environment'),
|
||||
'quit - ' + __('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')
|
||||
];
|
||||
return helpText.join('\n');
|
||||
} else if (['quit', 'exit', 'sair', 'sortir'].indexOf(cmd) >= 0) {
|
||||
} else if (['quit', 'exit', 'sair', 'sortir', __('quit')].indexOf(cmd) >= 0) {
|
||||
utils.exit();
|
||||
}
|
||||
return false;
|
||||
|
|
@ -52,7 +52,7 @@ class Console {
|
|||
}
|
||||
catch (e) {
|
||||
if (e.message.indexOf('not defined') > 0) {
|
||||
return callback(("error: " + e.message).red + ("\nType " + "help".bold + " to see the list of available commands").cyan);
|
||||
return callback(("error: " + e.message).red + ("\n" + __("Type") + " " + "help".bold + " " + __("to see the list of available commands")).cyan);
|
||||
} else {
|
||||
return callback(e.message);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ class Dashboard {
|
|||
self.events.setCommandHandler("console:command", monitor.executeCmd.bind(monitor));
|
||||
|
||||
self.logger.info('========================'.bold.green);
|
||||
self.logger.info(('Welcome to Embark ' + self.version).yellow.bold);
|
||||
self.logger.info((__('Welcome to Embark') + ' ' + self.version).yellow.bold);
|
||||
self.logger.info('========================'.bold.green);
|
||||
|
||||
// TODO: do this after monitor is rendered
|
||||
|
|
|
|||
|
|
@ -67,7 +67,7 @@ class Dashboard {
|
|||
setContracts(contracts) {
|
||||
let data = [];
|
||||
|
||||
data.push(["Contract Name", "Address", "Status"]);
|
||||
data.push([__("Contract Name"), __("Address"), __("Status")]);
|
||||
|
||||
contracts.forEach(function (row) {
|
||||
data.push(row);
|
||||
|
|
@ -84,7 +84,7 @@ class Dashboard {
|
|||
|
||||
layoutLog() {
|
||||
this.log = blessed.box({
|
||||
label: "Logs",
|
||||
label: __("Logs"),
|
||||
padding: 1,
|
||||
width: "100%",
|
||||
height: "55%",
|
||||
|
|
@ -123,7 +123,7 @@ class Dashboard {
|
|||
|
||||
layoutModules() {
|
||||
this.modules = blessed.box({
|
||||
label: "Contracts",
|
||||
label: __("Contracts"),
|
||||
tags: true,
|
||||
padding: 1,
|
||||
width: "75%",
|
||||
|
|
@ -166,7 +166,7 @@ class Dashboard {
|
|||
|
||||
layoutAssets() {
|
||||
this.assets = blessed.box({
|
||||
label: "Asset Pipeline",
|
||||
label: __("Asset Pipeline"),
|
||||
tags: true,
|
||||
padding: 1,
|
||||
width: "50%",
|
||||
|
|
@ -217,7 +217,7 @@ class Dashboard {
|
|||
|
||||
this.status = blessed.box({
|
||||
parent: this.wrapper,
|
||||
label: "Environment",
|
||||
label: __("Environment"),
|
||||
tags: true,
|
||||
padding: {
|
||||
left: 1
|
||||
|
|
@ -238,7 +238,7 @@ class Dashboard {
|
|||
|
||||
this.operations = blessed.box({
|
||||
parent: this.wrapper,
|
||||
label: "Status",
|
||||
label: __("Status"),
|
||||
tags: true,
|
||||
padding: {
|
||||
left: 1
|
||||
|
|
@ -259,7 +259,7 @@ class Dashboard {
|
|||
|
||||
this.progress = blessed.box({
|
||||
parent: this.wrapper,
|
||||
label: "Available Services",
|
||||
label: __("Available Services"),
|
||||
tags: true,
|
||||
padding: this.minimal ? {
|
||||
left: 1
|
||||
|
|
@ -283,7 +283,7 @@ class Dashboard {
|
|||
|
||||
layoutCmd() {
|
||||
this.consoleBox = blessed.box({
|
||||
label: 'Console',
|
||||
label: __('Console'),
|
||||
tags: true,
|
||||
padding: 0,
|
||||
width: '100%',
|
||||
|
|
|
|||
49
lib/index.js
49
lib/index.js
|
|
@ -87,7 +87,7 @@ class Embark {
|
|||
|
||||
if (!options.useDashboard) {
|
||||
engine.logger.info('========================'.bold.green);
|
||||
engine.logger.info(('Welcome to Embark ' + this.version).yellow.bold);
|
||||
engine.logger.info((__('Welcome to Embark') + ' ' + this.version).yellow.bold);
|
||||
engine.logger.info('========================'.bold.green);
|
||||
}
|
||||
|
||||
|
|
@ -106,14 +106,14 @@ class Embark {
|
|||
contractsConfig: engine.config.contractsConfig
|
||||
});
|
||||
dashboard.start(function () {
|
||||
engine.logger.info('dashboard start');
|
||||
engine.logger.info(__('dashboard start'));
|
||||
callback();
|
||||
});
|
||||
},
|
||||
function (callback) {
|
||||
let pluginList = engine.plugins.listPlugins();
|
||||
if (pluginList.length > 0) {
|
||||
engine.logger.info("loaded plugins: " + pluginList.join(", "));
|
||||
engine.logger.info(__("loaded plugins") + ": " + pluginList.join(", "));
|
||||
}
|
||||
|
||||
engine.startMonitor();
|
||||
|
|
@ -125,17 +125,17 @@ class Embark {
|
|||
engine.startService(engine.config.storageConfig.provider, {bzz: engine.web3.bzz});
|
||||
|
||||
engine.events.on('check:backOnline:Ethereum', function () {
|
||||
engine.logger.info('Ethereum node detected..');
|
||||
engine.logger.info(__('Ethereum node detected') + '..');
|
||||
engine.config.reloadConfig();
|
||||
engine.deployManager.deployContracts(function () {
|
||||
engine.logger.info('Deployment Done');
|
||||
engine.logger.info(__('Deployment Done'));
|
||||
});
|
||||
});
|
||||
|
||||
engine.events.on('outputDone', function () {
|
||||
engine.logger.info("Looking for documentation? You can find it at ".cyan + "http://embark.readthedocs.io/".green.underline + ".".cyan);
|
||||
engine.logger.info("Ready".underline);
|
||||
engine.events.emit("status", "Ready".green);
|
||||
engine.logger.info((__("Looking for documentation? You can find it at") + " ").cyan + "http://embark.status.im/docs/".green.underline + ".".cyan);
|
||||
engine.logger.info(__("Ready").underline);
|
||||
engine.events.emit("status", __("Ready").green);
|
||||
});
|
||||
|
||||
engine.deployManager.deployContracts(function (err) {
|
||||
|
|
@ -158,7 +158,7 @@ class Embark {
|
|||
|
||||
let size = windowSize.get();
|
||||
if (size.height < 40 || size.width < 118) {
|
||||
engine.logger.warn("tip: you can resize the terminal or disable the dashboard with " + "embark run --nodashboard".bold.underline);
|
||||
engine.logger.warn(__("tip: you can resize the terminal or disable the dashboard with") + " embark run --nodashboard".bold.underline);
|
||||
}
|
||||
}
|
||||
});
|
||||
|
|
@ -186,7 +186,7 @@ class Embark {
|
|||
function startServices(callback) {
|
||||
let pluginList = engine.plugins.listPlugins();
|
||||
if (pluginList.length > 0) {
|
||||
engine.logger.info("loaded plugins: " + pluginList.join(", "));
|
||||
engine.logger.info(__("loaded plugins") + ": " + pluginList.join(", "));
|
||||
}
|
||||
|
||||
engine.startService("libraryManager");
|
||||
|
|
@ -208,7 +208,7 @@ class Embark {
|
|||
engine.logger.error(err.message);
|
||||
engine.logger.debug(err.stack);
|
||||
} else {
|
||||
engine.logger.info("finished building".underline);
|
||||
engine.logger.info(__("finished building").underline);
|
||||
}
|
||||
// needed due to child processes
|
||||
process.exit();
|
||||
|
|
@ -235,13 +235,12 @@ class Embark {
|
|||
});
|
||||
engine.init();
|
||||
|
||||
|
||||
async.parallel([
|
||||
|
||||
|
||||
function (callback) {
|
||||
let pluginList = engine.plugins.listPlugins();
|
||||
if (pluginList.length > 0) {
|
||||
engine.logger.info("loaded plugins: " + pluginList.join(", "));
|
||||
engine.logger.info(__("loaded plugins") + ": " + pluginList.join(", "));
|
||||
}
|
||||
|
||||
engine.startMonitor();
|
||||
|
|
@ -264,7 +263,7 @@ class Embark {
|
|||
let graphGen = new GraphGenerator(engine);
|
||||
graphGen.generate(options);
|
||||
|
||||
engine.logger.info("Done. ./diagram.svg generated".underline);
|
||||
engine.logger.info(__("Done. %s generated", "./diagram.svg").underline);
|
||||
process.exit();
|
||||
}
|
||||
});
|
||||
|
|
@ -278,7 +277,7 @@ class Embark {
|
|||
}
|
||||
|
||||
upload(platform, options) {
|
||||
|
||||
|
||||
this.context = options.context || [constants.contexts.upload, constants.contexts.build];
|
||||
|
||||
let engine = new Engine({
|
||||
|
|
@ -297,9 +296,9 @@ class Embark {
|
|||
|
||||
let cmdPlugin;
|
||||
async.waterfall([
|
||||
|
||||
|
||||
function startServices(callback) {
|
||||
|
||||
|
||||
engine.startService("libraryManager");
|
||||
engine.startService("web3");
|
||||
engine.startService("pipeline");
|
||||
|
|
@ -322,7 +321,7 @@ class Embark {
|
|||
}
|
||||
checkFn.fn(function (serviceCheckResult) {
|
||||
if (!serviceCheckResult.status || serviceCheckResult.status === 'off') {
|
||||
return callback({message: `Cannot upload: ${platform} node is not running on http://${engine.config.storageConfig.host}:${engine.config.storageConfig.port}.`});
|
||||
return callback({message: __('Cannot upload: {{platform}} node is not running on {{url}}.', {platform: platform, url: `http://${engine.config.storageConfig.host}:${engine.config.storageConfig.port}`})});
|
||||
}
|
||||
callback();
|
||||
});
|
||||
|
|
@ -330,12 +329,12 @@ class Embark {
|
|||
function setupStoragePlugin(callback){
|
||||
let pluginList = engine.plugins.listPlugins();
|
||||
if (pluginList.length > 0) {
|
||||
engine.logger.info("loaded plugins: " + pluginList.join(", "));
|
||||
engine.logger.info(__("loaded plugins") + ": " + pluginList.join(", "));
|
||||
}
|
||||
|
||||
|
||||
// check use has input existing storage plugin
|
||||
let cmdPlugins = engine.plugins.getPluginsFor('uploadCmds');
|
||||
|
||||
|
||||
if (cmdPlugins.length > 0) {
|
||||
cmdPlugin = cmdPlugins.find((pluginCmd) => {
|
||||
return pluginCmd.uploadCmds.some(uploadCmd => {
|
||||
|
|
@ -344,7 +343,7 @@ class Embark {
|
|||
});
|
||||
}
|
||||
if (!cmdPlugin) {
|
||||
engine.logger.info('try "embark upload ipfs" or "embark upload swarm"'.green);
|
||||
engine.logger.info(__('try "{{ipfs}}" or "{{swarm}}"', {ipfs: 'embark upload ipfs', swarm: 'embark upload swarm'}).green);
|
||||
return callback({message: 'unknown platform: ' + platform});
|
||||
}
|
||||
callback();
|
||||
|
|
@ -360,7 +359,7 @@ class Embark {
|
|||
});
|
||||
// 1. build the contracts and dapp webpack
|
||||
engine.deployManager.deployContracts(function (err) {
|
||||
engine.logger.info("finished deploying".underline);
|
||||
engine.logger.info(__("finished deploying").underline);
|
||||
if(err){
|
||||
callback(err);
|
||||
}
|
||||
|
|
@ -371,7 +370,7 @@ class Embark {
|
|||
engine.logger.error(err.message);
|
||||
engine.logger.debug(err.stack);
|
||||
} else {
|
||||
engine.logger.info(`finished building DApp and deploying to ${platform}`.underline);
|
||||
engine.logger.info((__("finished building DApp and deploying to") + " " + platform).underline);
|
||||
}
|
||||
|
||||
// needed due to child processes
|
||||
|
|
|
|||
|
|
@ -43,11 +43,11 @@ class IPFS {
|
|||
}
|
||||
|
||||
self.events.on('check:backOnline:IPFS', function () {
|
||||
self.logger.info('IPFS node detected..');
|
||||
self.logger.info(__('IPFS node detected') + '..');
|
||||
});
|
||||
|
||||
self.events.on('check:wentOffline:IPFS', function () {
|
||||
self.logger.info('IPFS node is offline..');
|
||||
self.logger.info(__('IPFS node is offline') + '..');
|
||||
});
|
||||
|
||||
if (!self.addCheck) {
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ class IPFS {
|
|||
let ipfs_bin = shelljs.which(self.configIpfsBin);
|
||||
|
||||
if (ipfs_bin === 'ipfs not found' || !ipfs_bin) {
|
||||
console.log(('=== WARNING: ' + self.configIpfsBin + ' not found or not in the path. Guessing ~/go/bin/ipfs for path').yellow);
|
||||
console.log(('=== WARNING: ' + self.configIpfsBin + ' ' + __('not found or not in the path. Guessing %s for path', '~/go/bin/ipfs')).yellow);
|
||||
ipfs_bin = "~/go/bin/ipfs";
|
||||
}
|
||||
|
||||
|
|
@ -28,7 +28,7 @@ class IPFS {
|
|||
},
|
||||
function runCommand(ipfs_bin, callback) {
|
||||
let cmd = `"${ipfs_bin}" add -r ${self.buildDir}`;
|
||||
console.log(("=== adding " + self.buildDir + " to ipfs").green);
|
||||
console.log(("=== " + __("adding %s to ipfs", self.buildDir)).green);
|
||||
console.debug(cmd);
|
||||
shelljs.exec(cmd, {silent:true}, function(code, stdout, stderr){ // {silent:true}: don't echo cmd output so it can be controlled via logLevel
|
||||
console.log(stdout.green);
|
||||
|
|
@ -43,18 +43,18 @@ class IPFS {
|
|||
callback(null, dir_hash);
|
||||
},
|
||||
function printUrls(dir_hash, callback) {
|
||||
console.log(("=== DApp available at http://localhost:8080/ipfs/" + dir_hash + "/").green);
|
||||
console.log(("=== DApp available at http://gateway.ipfs.io/ipfs/" + dir_hash + "/").green);
|
||||
console.log(("=== " + __("DApp available at") + " http://localhost:8080/ipfs/" + dir_hash + "/").green);
|
||||
console.log(("=== " + __("DApp available at") + " http://gateway.ipfs.io/ipfs/" + dir_hash + "/").green);
|
||||
|
||||
callback();
|
||||
}
|
||||
], function (err, _result) {
|
||||
if (err) {
|
||||
console.log("error uploading to ipfs".red);
|
||||
console.log(__("error uploading to ipfs").red);
|
||||
console.log(err);
|
||||
reject(err);
|
||||
}
|
||||
else resolve('successfully uploaded to ipfs');
|
||||
else resolve(__('successfully uploaded to ipfs'));
|
||||
});
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ class Solidity {
|
|||
|
||||
file.content(function(fileContent) {
|
||||
if (!fileContent) {
|
||||
self.logger.error('Error while loading the content of ' + filename);
|
||||
self.logger.error(__('Error while loading the content of ') + filename);
|
||||
return fileCb();
|
||||
}
|
||||
input[filename] = {content: fileContent.replace(/\r\n/g, '\n')};
|
||||
|
|
@ -47,13 +47,13 @@ class Solidity {
|
|||
return callback();
|
||||
}
|
||||
|
||||
self.logger.info("loading solc compiler..");
|
||||
self.logger.info(__("loading solc compiler") + "..");
|
||||
solcW.load_compiler(function (err) {
|
||||
callback(err);
|
||||
});
|
||||
},
|
||||
function compileContracts(callback) {
|
||||
self.logger.info("compiling solidity contracts...");
|
||||
self.logger.info(__("compiling solidity contracts") + "...");
|
||||
let jsonObj = {
|
||||
language: 'Solidity',
|
||||
sources: input,
|
||||
|
|
@ -88,11 +88,11 @@ class Solidity {
|
|||
let json = output.contracts;
|
||||
|
||||
if (!output || !output.contracts) {
|
||||
return callback(new Error("error compiling for unknown reasons"));
|
||||
return callback(new Error(__("error compiling for unknown reasons")));
|
||||
}
|
||||
|
||||
if (Object.keys(output.contracts).length === 0 && output.sourceList.length > 0) {
|
||||
return callback(new Error("error compiling. There are sources available but no code could be compiled, likely due to fatal errors in the solidity code").message);
|
||||
return callback(new Error(__("error compiling. There are sources available but no code could be compiled, likely due to fatal errors in the solidity code")).message);
|
||||
}
|
||||
|
||||
let compiled_object = {};
|
||||
|
|
|
|||
|
|
@ -52,11 +52,11 @@ class Swarm {
|
|||
}
|
||||
|
||||
this.events.on('check:backOnline:Swarm', function () {
|
||||
self.logger.info('Swarm node detected...');
|
||||
self.logger.info(__('Swarm node detected...'));
|
||||
});
|
||||
|
||||
this.events.on('check:wentOffline:Swarm', function () {
|
||||
self.logger.info('Swarm node is offline...');
|
||||
self.logger.info(__('Swarm node is offline...'));
|
||||
});
|
||||
|
||||
if (!this.addCheck) {
|
||||
|
|
|
|||
|
|
@ -11,12 +11,12 @@ class Swarm {
|
|||
|
||||
deploy() {
|
||||
return new Promise((resolve, reject) => {
|
||||
console.log("deploying to swarm!");
|
||||
console.log(__("deploying to swarm!"));
|
||||
let self = this;
|
||||
let bzz = this.bzz;
|
||||
async.waterfall([
|
||||
function runCommand(callback) {
|
||||
console.log(("=== adding " + self.buildDir + " to swarm").green);
|
||||
console.log(("=== " + __("adding %s to swarm", self.buildDir)).green);
|
||||
bzz.upload({
|
||||
path: self.buildDir, // path to data / file / directory
|
||||
kind: "directory", // could also be "file" or "data"
|
||||
|
|
@ -31,17 +31,17 @@ class Swarm {
|
|||
if (!dir_hash) {
|
||||
return callback('No directory hash was returned');
|
||||
}
|
||||
console.log((`=== DApp available at ${self.storageConfig.getUrl}${dir_hash}/`).green);
|
||||
console.log(("=== " + __("DApp available at") + `${self.storageConfig.getUrl}${dir_hash}/`).green);
|
||||
|
||||
callback();
|
||||
}
|
||||
], function (err, _result) {
|
||||
if (err) {
|
||||
console.log("error uploading to swarm".red);
|
||||
console.log(__("error uploading to swarm").red);
|
||||
console.log(err);
|
||||
return reject(err);
|
||||
}
|
||||
resolve('successfully uploaded to swarm');
|
||||
resolve(__('successfully uploaded to swarm'));
|
||||
});
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -19,10 +19,10 @@ class Vyper {
|
|||
return callback(stderr);
|
||||
}
|
||||
if (code !== 0) {
|
||||
return callback(`Vyper exited with error code ${code}`);
|
||||
return callback(__('Vyper exited with error code ') + code);
|
||||
}
|
||||
if (!stdout) {
|
||||
return callback('Execution returned no result');
|
||||
return callback(__('Execution returned no result'));
|
||||
}
|
||||
callback(null, stdout.replace(/\n/g, ''));
|
||||
});
|
||||
|
|
@ -33,7 +33,7 @@ class Vyper {
|
|||
if (!contractFiles || !contractFiles.length) {
|
||||
return cb();
|
||||
}
|
||||
self.logger.info("compiling Vyper contracts...");
|
||||
self.logger.info(__("compiling Vyper contracts") + "...");
|
||||
const compiled_object = {};
|
||||
async.each(contractFiles,
|
||||
function (file, fileCb) {
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ class WebServer {
|
|||
this.host = options.host || this.webServerConfig.host;
|
||||
this.port = options.port || this.webServerConfig.port;
|
||||
|
||||
this.events.emit("status", "Starting Server");
|
||||
this.events.emit("status", __("Starting Server"));
|
||||
this.server = new Server({logger: this.logger, host: this.host, port: this.port});
|
||||
|
||||
this.setServiceCheck();
|
||||
|
|
@ -32,14 +32,14 @@ class WebServer {
|
|||
//embark.registerServiceCheck('WebserverService', function (cb) {
|
||||
this.addCheck('Webserver', function (cb) {
|
||||
utils.checkIsAvailable(url, function (available) {
|
||||
let devServer = 'Webserver (' + url + ')';
|
||||
let devServer = __('Webserver') + ' (' + url + ')';
|
||||
let serverStatus = (available ? 'on' : 'off');
|
||||
return cb({name: devServer, status: serverStatus});
|
||||
});
|
||||
});
|
||||
|
||||
this.events.on('check:wentOffline:Webserver', () => {
|
||||
this.logger.info("Webserver is offline");
|
||||
this.logger.info(__("Webserver is offline"));
|
||||
});
|
||||
}
|
||||
|
||||
|
|
@ -57,7 +57,7 @@ class WebServer {
|
|||
}
|
||||
if (cmd === 'webserver stop') {
|
||||
self.events.request("stop-webserver");
|
||||
return "stopping webserver...";
|
||||
return __("stopping webserver") + "...";
|
||||
}
|
||||
return false;
|
||||
});
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ class Server {
|
|||
|
||||
start(callback) {
|
||||
if (this.server && this.server.listening) {
|
||||
this.logger.warn("a webserver is already running at " + ("http://" + this.hostname + ":" + this.port).bold.underline.green);
|
||||
this.logger.warn(__("a webserver is already running at") + " " + ("http://" + this.hostname + ":" + this.port).bold.underline.green);
|
||||
if (callback) {
|
||||
callback();
|
||||
}
|
||||
|
|
@ -25,7 +25,7 @@ class Server {
|
|||
serve(req, res, finalhandler(req, res));
|
||||
}).withShutdown();
|
||||
|
||||
this.logger.info("webserver available at " + ("http://" + this.hostname + ":" + this.port).bold.underline.green);
|
||||
this.logger.info(__("webserver available at") + " " + ("http://" + this.hostname + ":" + this.port).bold.underline.green);
|
||||
this.server.listen(this.port, this.hostname);
|
||||
if (callback) {
|
||||
callback();
|
||||
|
|
@ -34,7 +34,7 @@ class Server {
|
|||
|
||||
stop(callback) {
|
||||
if (!this.server || !this.server.listening) {
|
||||
this.logger.warn("no webserver is currently running");
|
||||
this.logger.warn(__("no webserver is currently running"));
|
||||
if (callback) {
|
||||
callback();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -112,7 +112,7 @@ class Pipeline {
|
|||
},
|
||||
function (err, contentFiles) {
|
||||
if (err) {
|
||||
self.logger.error('errors found while generating ' + targetFile);
|
||||
self.logger.error(__('errors found while generating') + ' ' + targetFile);
|
||||
}
|
||||
let dir = targetFile.split('/').slice(0, -1).join('/');
|
||||
self.logger.trace("creating dir " + self.buildDir + dir);
|
||||
|
|
@ -142,7 +142,7 @@ class Pipeline {
|
|||
return file.content;
|
||||
}).join("\n");
|
||||
|
||||
self.logger.info("writing file " + (self.buildDir + targetFile).bold.dim);
|
||||
self.logger.info(__("writing file") + " " + (self.buildDir + targetFile).bold.dim);
|
||||
fs.writeFile(self.buildDir + targetFile, content, cb);
|
||||
}
|
||||
);
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ class Watch {
|
|||
self.logger.trace('ready to watch config changes');
|
||||
});
|
||||
|
||||
this.logger.info("ready to watch file changes");
|
||||
this.logger.info(__("ready to watch file changes"));
|
||||
}
|
||||
|
||||
restart() {
|
||||
|
|
|
|||
|
|
@ -11,15 +11,15 @@ var getSimulator = function() {
|
|||
return sim;
|
||||
} catch (e) {
|
||||
if (e.code === 'MODULE_NOT_FOUND') {
|
||||
console.log('Simulator not found; Please install it with "npm install ethereumjs-testrpc --save"');
|
||||
console.log('IMPORTANT: if you using a NodeJS version older than 6.9.1 then you need to install an older version of testrpc "npm install ethereumjs-testrpc@2.0 --save"');
|
||||
console.log(__('Simulator not found; Please install it with "%s"', 'npm install ethereumjs-testrpc --save'));
|
||||
console.log(__('IMPORTANT: if you using a NodeJS version older than 6.9.1 then you need to install an older version of testrpc "%s"', 'npm install ethereumjs-testrpc@2.0 --save'));
|
||||
console.log('For more information see https://github.com/ethereumjs/testrpc');
|
||||
// TODO: should throw exception instead
|
||||
return process.exit();
|
||||
}
|
||||
console.log("==============");
|
||||
console.log("Tried to load testrpc but an error occurred. This is a problem with testrpc");
|
||||
console.log('IMPORTANT: if you using a NodeJS version older than 6.9.1 then you need to install an older version of testrpc "npm install ethereumjs-testrpc@2.0 --save". Alternatively install node 6.9.1 and the testrpc 3.0');
|
||||
console.log(__("Tried to load testrpc but an error occurred. This is a problem with testrpc"));
|
||||
console.log(__('IMPORTANT: if you using a NodeJS version older than 6.9.1 then you need to install an older version of testrpc "%s". Alternatively install node 6.9.1 and the testrpc 3.0', 'npm install ethereumjs-testrpc@2.0 --save'));
|
||||
console.log("==============");
|
||||
throw e;
|
||||
}
|
||||
|
|
@ -88,7 +88,7 @@ Test.prototype.deployAll = function(contractsConfig, cb) {
|
|||
}
|
||||
], function(err, result) {
|
||||
if (err) {
|
||||
console.log('terminating due to error');
|
||||
console.log(__('terminating due to error'));
|
||||
process.exit(1);
|
||||
}
|
||||
// this should be part of the waterfall and not just something done at the
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ class LibraryManager {
|
|||
Object.keys(this.versions).forEach(versionKey => {
|
||||
const newVersion = this.versions[versionKey].trim();
|
||||
if (newVersion !== this.versions[versionKey]) {
|
||||
this.embark.logger.warn(`There a a space in the version of ${versionKey}. We corrected it for you ("${this.versions[versionKey]}" => "${newVersion}").`);
|
||||
this.embark.logger.warn(__('There a a space in the version of {{versionKey}}. We corrected it for you ({{correction}}).', {versionKey: versionKey, correction: `"${this.versions[versionKey]}" => "${newVersion}"`}));
|
||||
this.versions[versionKey] = newVersion;
|
||||
}
|
||||
});
|
||||
|
|
@ -40,8 +40,8 @@ class LibraryManager {
|
|||
registerCommands() {
|
||||
const self = this;
|
||||
this.embark.registerConsoleCommand((cmd, _options) => {
|
||||
if (cmd === "versions") {
|
||||
let text = ['versions in use:'];
|
||||
if (cmd === "versions" || cmd === __('versions')) {
|
||||
let text = [__('versions in use') + ':'];
|
||||
for (let lib in self.versions) {
|
||||
text.push(lib + ": " + self.versions[lib]);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -18,6 +18,7 @@ class Npm {
|
|||
}
|
||||
|
||||
this.logger.info("downloading " + packageName + " " + version + "....");
|
||||
this.logger.info(__("downloading {{packageName}} {{version}}....", {packageName: packageName, version: version}));
|
||||
manager.install(packageName, version).then((result) => {
|
||||
callback(null , result.location);
|
||||
}).catch(callback);
|
||||
|
|
|
|||
|
|
@ -0,0 +1,4 @@
|
|||
{
|
||||
"new_application": "new_application",
|
||||
"Contract Name": "Contract Name"
|
||||
}
|
||||
|
|
@ -0,0 +1,73 @@
|
|||
{
|
||||
"New Application": "Nova Aplicacao",
|
||||
"Contract Name": "Contracto",
|
||||
"Address": "Endereço",
|
||||
"Status": "Estado",
|
||||
"Embark Blockchain Using: %s": "Embark Blockchain esta usando o commando: %s",
|
||||
"running: %s": "executando: %s",
|
||||
"already initialized": "ja esta inicializado",
|
||||
"create a barebones project meant only for contract development": "criar um projeto vazio destinado apenas ao desenvolvimento de contratos",
|
||||
"loading solc compiler": "carregando o compilador solc",
|
||||
"Welcome to Embark": "Bem-vindo ao Embark",
|
||||
"possible commands are:": "comandos possíveis são:",
|
||||
"display versions in use for libraries and tools like web3 and solc": "lista versões em uso para bibliotecas e ferramentas como web3 e solc",
|
||||
"instantiated web3.js object configured to the current environment": "objeto web3.js instanciado configurado para o ambiente atual",
|
||||
"to immediatly exit (alias: exit)": "para sair imediatamente (alias: exit)",
|
||||
"The web3 object and the interfaces for the deployed contracts and their methods are also available": "O objeto web3 e as interfaces para os contratos implantados e seus métodos também estão disponíveis",
|
||||
"create a working dapp with a SimpleStorage contract": "Cria uma dapp funcional com o contrato SimpleStorage",
|
||||
"filename to output logs (default: none)": "ficheiro/arquivo para saída dos logs (predefinido: none)",
|
||||
"level of logging to display": "nivel do log",
|
||||
"deploy and build dapp at ": "Publica os contractos e constroi a applicacao em ",
|
||||
"port to run the dev webserver (default: %s)": "porta para correr o servidor web para desenvolvimento (default: %s)",
|
||||
"host to run the dev webserver (default: %s)": "host para correr o servidor web para desenvolvimento (default: %s)",
|
||||
"disable the development webserver": "disativa o servidor web para desenvolvimento",
|
||||
"simple mode, disables the dashboard": "modo simples, disativa o dashboard",
|
||||
"no colors in case it's needed for compatbility purposes": "sem cores, em caso seja necessario para compabitilidade com a terminal",
|
||||
"filename to output logs (default: %s)": "ficheiro/arquivo para os logs (predefinido: %s)",
|
||||
"run dapp (default: %s)": "executa a dapp (applicacao decentralizada) (predefinido: %s)",
|
||||
"Use a specific ethereum client or simulator (supported: %s)": "Usa um cliente ou simulador de ethereum específico (supportado: %s)",
|
||||
"run blockchain server (default: %s)": "executa un node de blockchain (predefinido: %s)",
|
||||
"run a fast ethereum rpc simulator": "executa um simulador RPC de ethereum",
|
||||
"use testrpc as the rpc simulator [%s]": "usa testrpc como simulator de rpc [%s]",
|
||||
"port to run the rpc simulator (default: %s)": "porta para executar simulador de rpc (predefinido: %s)",
|
||||
"host to run the rpc simulator (default: %s)": "host para executar servidor de rpc (predefinido: %s)",
|
||||
"number of accounts (default: %s)": "numero de contas (predefinido: %s)",
|
||||
"Amount of ether to assign each test account (default: %s)": "Quantidade de éter para atribuir cada conta de teste (predefinido: %s)",
|
||||
"custom gas limit (default: %s)": "limite de gás (predefinido: %s)",
|
||||
"run tests": "executar os testes",
|
||||
"resets embarks state on this dapp including clearing cache": "recomenca o estado do Embark nesta appliacao, incluindo a cache",
|
||||
"generates documentation based on the smart contracts configured": "gera documentação baseada nos contratos configurados",
|
||||
"Upload your dapp to a decentralized storage": "Carrega a appliacao para armazenamento descentralizado",
|
||||
"output the version number": "produz a versão actual",
|
||||
"Logs": "Logs",
|
||||
"Environment": "Ambiente",
|
||||
"Available Services": "Serviços Disponíveis",
|
||||
"Contracts": "Contratos",
|
||||
"Console": "Consola",
|
||||
"dashboard start": "inicia o painel de controle",
|
||||
"loaded plugins": "plugins carregados",
|
||||
"compiling solidity contracts": "Compilando contratos Solidity",
|
||||
"%s doesn't have a compatible contract compiler. Maybe a plugin exists for it.": "%s não tem um compilador de contrato compatível. Talvez exista um plugin para isso.",
|
||||
"assuming %s to be an interface": "assumindo que %s é uma interface",
|
||||
"{{className}}: couldn't find instanceOf contract {{parentContractName}}": "{{className}}: não foi possível encontrar instancia de (instanceOf) do contrato {{parentContractName}}",
|
||||
"did you mean \"%s\"?": "você quis dizer \"%s\"?",
|
||||
"%s has no code associated": "%s não tem código associado",
|
||||
"deploying contracts": "publicando contratos",
|
||||
"running beforeDeploy plugin %s .": "executando plugin beforeDeploy %s .",
|
||||
"deploying": "publicando",
|
||||
"with": "com",
|
||||
"gas": "gas",
|
||||
"Pending": "Pendente",
|
||||
"Interface or set to not deploy": "Interface ou configurado para não ser publicado",
|
||||
"error deploying": "erro de publicação",
|
||||
"due to error": "devido a erro",
|
||||
"error deploying contracts": "erro publicando contratos",
|
||||
"finished deploying contracts": "publicação de contratos concluida",
|
||||
"error running afterDeploy: ": "erro executado afterDeploy: ",
|
||||
"ready to watch file changes": "pronto para monitorar alterações em ficheiros/arquivos",
|
||||
"Starting Server": "iniciando o servidor",
|
||||
"webserver available at": "servidor web disponivel em",
|
||||
"Webserver": "Servidor Web",
|
||||
" already deployed at ": " already deployed at ",
|
||||
"Deployed": "Deployed"
|
||||
}
|
||||
|
|
@ -65,8 +65,7 @@
|
|||
"abbrev": {
|
||||
"version": "1.1.1",
|
||||
"resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
|
||||
"integrity": "sha1-+PLIh60Qv2f2NPAFtph/7TF5qsg=",
|
||||
"dev": true
|
||||
"integrity": "sha1-+PLIh60Qv2f2NPAFtph/7TF5qsg="
|
||||
},
|
||||
"accepts": {
|
||||
"version": "1.3.5",
|
||||
|
|
@ -2212,6 +2211,11 @@
|
|||
"randomfill": "1.0.4"
|
||||
}
|
||||
},
|
||||
"csextends": {
|
||||
"version": "1.2.0",
|
||||
"resolved": "https://registry.npmjs.org/csextends/-/csextends-1.2.0.tgz",
|
||||
"integrity": "sha512-S/8k1bDTJIwuGgQYmsRoE+8P+ohV32WhQ0l4zqrc0XDdxOhjQQD7/wTZwCzoZX53jSX3V/qwjT+OkPTxWQcmjg=="
|
||||
},
|
||||
"css-color-names": {
|
||||
"version": "0.0.4",
|
||||
"resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz",
|
||||
|
|
@ -2626,6 +2630,14 @@
|
|||
"resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz",
|
||||
"integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI="
|
||||
},
|
||||
"eachr": {
|
||||
"version": "2.0.4",
|
||||
"resolved": "https://registry.npmjs.org/eachr/-/eachr-2.0.4.tgz",
|
||||
"integrity": "sha1-Rm98qhBwj2EFCeMsgHqv5X/BIr8=",
|
||||
"requires": {
|
||||
"typechecker": "2.1.0"
|
||||
}
|
||||
},
|
||||
"ecc-jsbn": {
|
||||
"version": "0.1.1",
|
||||
"resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz",
|
||||
|
|
@ -2635,6 +2647,11 @@
|
|||
"jsbn": "0.1.1"
|
||||
}
|
||||
},
|
||||
"editions": {
|
||||
"version": "1.3.4",
|
||||
"resolved": "https://registry.npmjs.org/editions/-/editions-1.3.4.tgz",
|
||||
"integrity": "sha512-gzao+mxnYDzIysXKMQi/+M1mjy/rjestjg6OPoYTtI+3Izp23oiGZitsl9lPDPiTGXbcSIk1iJWhliSaglxnUg=="
|
||||
},
|
||||
"ee-first": {
|
||||
"version": "1.1.1",
|
||||
"resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
|
||||
|
|
@ -3240,6 +3257,21 @@
|
|||
}
|
||||
}
|
||||
},
|
||||
"extendr": {
|
||||
"version": "2.1.0",
|
||||
"resolved": "https://registry.npmjs.org/extendr/-/extendr-2.1.0.tgz",
|
||||
"integrity": "sha1-MBqgu+pWX00tyPVw8qImEahSe1Y=",
|
||||
"requires": {
|
||||
"typechecker": "2.0.8"
|
||||
},
|
||||
"dependencies": {
|
||||
"typechecker": {
|
||||
"version": "2.0.8",
|
||||
"resolved": "https://registry.npmjs.org/typechecker/-/typechecker-2.0.8.tgz",
|
||||
"integrity": "sha1-6D2oS7ZMWEzLNFg4V2xAsDN9uC4="
|
||||
}
|
||||
}
|
||||
},
|
||||
"external-editor": {
|
||||
"version": "2.1.0",
|
||||
"resolved": "https://registry.npmjs.org/external-editor/-/external-editor-2.1.0.tgz",
|
||||
|
|
@ -3260,6 +3292,21 @@
|
|||
"is-extglob": "1.0.0"
|
||||
}
|
||||
},
|
||||
"extract-opts": {
|
||||
"version": "2.2.0",
|
||||
"resolved": "https://registry.npmjs.org/extract-opts/-/extract-opts-2.2.0.tgz",
|
||||
"integrity": "sha1-H6KOunNSxttID4hc63GkaBC+bX0=",
|
||||
"requires": {
|
||||
"typechecker": "2.0.8"
|
||||
},
|
||||
"dependencies": {
|
||||
"typechecker": {
|
||||
"version": "2.0.8",
|
||||
"resolved": "https://registry.npmjs.org/typechecker/-/typechecker-2.0.8.tgz",
|
||||
"integrity": "sha1-6D2oS7ZMWEzLNFg4V2xAsDN9uC4="
|
||||
}
|
||||
}
|
||||
},
|
||||
"extsprintf": {
|
||||
"version": "1.3.0",
|
||||
"resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
|
||||
|
|
@ -4752,6 +4799,19 @@
|
|||
"resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz",
|
||||
"integrity": "sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM="
|
||||
},
|
||||
"i18n": {
|
||||
"version": "0.8.3",
|
||||
"resolved": "https://registry.npmjs.org/i18n/-/i18n-0.8.3.tgz",
|
||||
"integrity": "sha1-LYzxwkciYCwgQdAbpq5eqlE4jw4=",
|
||||
"requires": {
|
||||
"debug": "2.6.9",
|
||||
"make-plural": "3.0.6",
|
||||
"math-interval-parser": "1.1.0",
|
||||
"messageformat": "0.3.1",
|
||||
"mustache": "2.3.0",
|
||||
"sprintf-js": "1.0.3"
|
||||
}
|
||||
},
|
||||
"iconv-lite": {
|
||||
"version": "0.4.19",
|
||||
"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz",
|
||||
|
|
@ -4842,6 +4902,20 @@
|
|||
"integrity": "sha512-YGG3ejvBNHRqu0559EOxxNFihD0AjpvHlC/pdGKd3X3ofe+CoJkYazwNJYTNebqpPKN+VVQbh4ZFn1DivMNuHA==",
|
||||
"dev": true
|
||||
},
|
||||
"ignorefs": {
|
||||
"version": "1.2.0",
|
||||
"resolved": "https://registry.npmjs.org/ignorefs/-/ignorefs-1.2.0.tgz",
|
||||
"integrity": "sha1-2ln7hYl25KXkNwLM0fKC/byeV1Y=",
|
||||
"requires": {
|
||||
"editions": "1.3.4",
|
||||
"ignorepatterns": "1.1.0"
|
||||
}
|
||||
},
|
||||
"ignorepatterns": {
|
||||
"version": "1.1.0",
|
||||
"resolved": "https://registry.npmjs.org/ignorepatterns/-/ignorepatterns-1.1.0.tgz",
|
||||
"integrity": "sha1-rI9DbyI5td+2bV8NOpBKh6xnzF4="
|
||||
},
|
||||
"imurmurhash": {
|
||||
"version": "0.1.4",
|
||||
"resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
|
||||
|
|
@ -5985,6 +6059,22 @@
|
|||
"pify": "3.0.0"
|
||||
}
|
||||
},
|
||||
"make-plural": {
|
||||
"version": "3.0.6",
|
||||
"resolved": "https://registry.npmjs.org/make-plural/-/make-plural-3.0.6.tgz",
|
||||
"integrity": "sha1-IDOgO6wpC487uRJY9lud9+iwHKc=",
|
||||
"requires": {
|
||||
"minimist": "1.2.0"
|
||||
},
|
||||
"dependencies": {
|
||||
"minimist": {
|
||||
"version": "1.2.0",
|
||||
"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
|
||||
"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
|
||||
"optional": true
|
||||
}
|
||||
}
|
||||
},
|
||||
"map-cache": {
|
||||
"version": "0.2.2",
|
||||
"resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
|
||||
|
|
@ -6029,6 +6119,14 @@
|
|||
"resolved": "https://registry.npmjs.org/math-expression-evaluator/-/math-expression-evaluator-1.2.17.tgz",
|
||||
"integrity": "sha1-3oGf282E3M2PrlnGrreWFbnSZqw="
|
||||
},
|
||||
"math-interval-parser": {
|
||||
"version": "1.1.0",
|
||||
"resolved": "https://registry.npmjs.org/math-interval-parser/-/math-interval-parser-1.1.0.tgz",
|
||||
"integrity": "sha1-2+2lsGsySZc8bfYXD94jhvCv2JM=",
|
||||
"requires": {
|
||||
"xregexp": "2.0.0"
|
||||
}
|
||||
},
|
||||
"md5.js": {
|
||||
"version": "1.3.4",
|
||||
"resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.4.tgz",
|
||||
|
|
@ -6208,6 +6306,37 @@
|
|||
"source-map": "0.5.7"
|
||||
}
|
||||
},
|
||||
"messageformat": {
|
||||
"version": "0.3.1",
|
||||
"resolved": "https://registry.npmjs.org/messageformat/-/messageformat-0.3.1.tgz",
|
||||
"integrity": "sha1-5Y//gkXps5cXmeW0PbWLPpQX9aI=",
|
||||
"requires": {
|
||||
"async": "1.5.2",
|
||||
"glob": "6.0.4",
|
||||
"make-plural": "3.0.6",
|
||||
"nopt": "3.0.6",
|
||||
"watchr": "2.4.13"
|
||||
},
|
||||
"dependencies": {
|
||||
"async": {
|
||||
"version": "1.5.2",
|
||||
"resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
|
||||
"integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo="
|
||||
},
|
||||
"glob": {
|
||||
"version": "6.0.4",
|
||||
"resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz",
|
||||
"integrity": "sha1-DwiGD2oVUSey+t1PnOJLGqtuTSI=",
|
||||
"requires": {
|
||||
"inflight": "1.0.6",
|
||||
"inherits": "2.0.3",
|
||||
"minimatch": "3.0.4",
|
||||
"once": "1.4.0",
|
||||
"path-is-absolute": "1.0.1"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"methods": {
|
||||
"version": "1.1.2",
|
||||
"resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
|
||||
|
|
@ -6500,6 +6629,11 @@
|
|||
"resolved": "https://registry.npmjs.org/murmurhash3js/-/murmurhash3js-3.0.1.tgz",
|
||||
"integrity": "sha1-Ppg+W0fCoG9DpxMXTn5DXKBEuZg="
|
||||
},
|
||||
"mustache": {
|
||||
"version": "2.3.0",
|
||||
"resolved": "https://registry.npmjs.org/mustache/-/mustache-2.3.0.tgz",
|
||||
"integrity": "sha1-QCj3d4sXcIpImTCm5SrDvKDaQdA="
|
||||
},
|
||||
"mute-stream": {
|
||||
"version": "0.0.7",
|
||||
"resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz",
|
||||
|
|
@ -6699,7 +6833,6 @@
|
|||
"version": "3.0.6",
|
||||
"resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
|
||||
"integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"abbrev": "1.1.1"
|
||||
}
|
||||
|
|
@ -8573,6 +8706,14 @@
|
|||
"ret": "0.1.15"
|
||||
}
|
||||
},
|
||||
"safefs": {
|
||||
"version": "3.2.2",
|
||||
"resolved": "https://registry.npmjs.org/safefs/-/safefs-3.2.2.tgz",
|
||||
"integrity": "sha1-gXDBRE1wOOCMrqBaN0+uL6NJ4Vw=",
|
||||
"requires": {
|
||||
"graceful-fs": "4.1.11"
|
||||
}
|
||||
},
|
||||
"samsam": {
|
||||
"version": "1.3.0",
|
||||
"resolved": "https://registry.npmjs.org/samsam/-/samsam-1.3.0.tgz",
|
||||
|
|
@ -8584,6 +8725,16 @@
|
|||
"resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
|
||||
"integrity": "sha1-KBYjTiN4vdxOU1T6tcqold9xANk="
|
||||
},
|
||||
"scandirectory": {
|
||||
"version": "2.5.0",
|
||||
"resolved": "https://registry.npmjs.org/scandirectory/-/scandirectory-2.5.0.tgz",
|
||||
"integrity": "sha1-bOA/VKCQtmjjy+2/IO354xBZPnI=",
|
||||
"requires": {
|
||||
"ignorefs": "1.2.0",
|
||||
"safefs": "3.2.2",
|
||||
"taskgroup": "4.3.1"
|
||||
}
|
||||
},
|
||||
"schema-utils": {
|
||||
"version": "0.4.5",
|
||||
"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.4.5.tgz",
|
||||
|
|
@ -9773,6 +9924,15 @@
|
|||
}
|
||||
}
|
||||
},
|
||||
"taskgroup": {
|
||||
"version": "4.3.1",
|
||||
"resolved": "https://registry.npmjs.org/taskgroup/-/taskgroup-4.3.1.tgz",
|
||||
"integrity": "sha1-feGT/r12gnPEV3MElwJNUSwnkVo=",
|
||||
"requires": {
|
||||
"ambi": "2.5.0",
|
||||
"csextends": "1.2.0"
|
||||
}
|
||||
},
|
||||
"text-encoding": {
|
||||
"version": "0.6.4",
|
||||
"resolved": "https://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz",
|
||||
|
|
@ -9968,6 +10128,11 @@
|
|||
"mime-types": "2.1.18"
|
||||
}
|
||||
},
|
||||
"typechecker": {
|
||||
"version": "2.1.0",
|
||||
"resolved": "https://registry.npmjs.org/typechecker/-/typechecker-2.1.0.tgz",
|
||||
"integrity": "sha1-0cIJOlT/ihn1jP+HfuqlTyJC04M="
|
||||
},
|
||||
"typedarray": {
|
||||
"version": "0.0.6",
|
||||
"resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
|
||||
|
|
@ -10369,6 +10534,21 @@
|
|||
"neo-async": "2.5.1"
|
||||
}
|
||||
},
|
||||
"watchr": {
|
||||
"version": "2.4.13",
|
||||
"resolved": "https://registry.npmjs.org/watchr/-/watchr-2.4.13.tgz",
|
||||
"integrity": "sha1-10hHu01vkPYf4sdPn2hmKqDgdgE=",
|
||||
"requires": {
|
||||
"eachr": "2.0.4",
|
||||
"extendr": "2.1.0",
|
||||
"extract-opts": "2.2.0",
|
||||
"ignorefs": "1.2.0",
|
||||
"safefs": "3.2.2",
|
||||
"scandirectory": "2.5.0",
|
||||
"taskgroup": "4.3.1",
|
||||
"typechecker": "2.1.0"
|
||||
}
|
||||
},
|
||||
"web3": {
|
||||
"version": "1.0.0-beta.34",
|
||||
"resolved": "https://registry.npmjs.org/web3/-/web3-1.0.0-beta.34.tgz",
|
||||
|
|
@ -11021,6 +11201,11 @@
|
|||
"resolved": "https://registry.npmjs.org/xhr2/-/xhr2-0.1.4.tgz",
|
||||
"integrity": "sha1-f4dliEdxbbUCYyOBL4GMras4el8="
|
||||
},
|
||||
"xregexp": {
|
||||
"version": "2.0.0",
|
||||
"resolved": "https://registry.npmjs.org/xregexp/-/xregexp-2.0.0.tgz",
|
||||
"integrity": "sha1-UqY+VsoLhKfzpfPWGHLxJq16WUM="
|
||||
},
|
||||
"xtend": {
|
||||
"version": "4.0.1",
|
||||
"resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
|
||||
|
|
|
|||
|
|
@ -46,6 +46,7 @@
|
|||
"globule": "^1.1.0",
|
||||
"hard-source-webpack-plugin": "^0.6.6",
|
||||
"http-shutdown": "^1.2.0",
|
||||
"i18n": "^0.8.3",
|
||||
"ipfs-api": "17.2.4",
|
||||
"live-plugin-manager": "https://github.com/iurimatias/live-plugin-manager.git",
|
||||
"merge": "^1.2.0",
|
||||
|
|
|
|||
|
|
@ -152,6 +152,11 @@
|
|||
"ua-parser-js": "0.7.17"
|
||||
}
|
||||
},
|
||||
"haml": {
|
||||
"version": "0.4.3",
|
||||
"resolved": "https://registry.npmjs.org/haml/-/haml-0.4.3.tgz",
|
||||
"integrity": "sha1-90BTGPPC7dGXpIsbjysvE+C7U3g="
|
||||
},
|
||||
"has-ansi": {
|
||||
"version": "2.0.0",
|
||||
"resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@
|
|||
"dependencies": {
|
||||
"bootstrap": "^3.3.6",
|
||||
"embark-service": "file:extensions/embark-service",
|
||||
"haml": "^0.4.3",
|
||||
"jquery": "^1.11.3",
|
||||
"react": "^16.0.0",
|
||||
"react-bootstrap": "^0.32.0",
|
||||
|
|
|
|||
Loading…
Reference in New Issue