From 0e5a91273b6aeda48b86ab87c790bf23133cd4d3 Mon Sep 17 00:00:00 2001 From: Tetsuo Seto Date: Tue, 12 Jan 2016 16:00:43 -0800 Subject: [PATCH 1/6] Globalize --- .gitignore | 1 + index.js | 39 ++++++++++++++++++++------------------ intl/de/messages.json | 17 +++++++++++++++++ intl/de/sl-build.txt | 1 + intl/en/messages.json | 17 +++++++++++++++++ intl/en/sl-build.txt | 27 ++++++++++++++++++++++++++ intl/es/messages.json | 17 +++++++++++++++++ intl/es/sl-build.txt | 0 intl/fr/messages.json | 17 +++++++++++++++++ intl/fr/sl-build.txt | 0 intl/it/messages.json | 17 +++++++++++++++++ intl/it/sl-build.txt | 1 + intl/ja/messages.json | 17 +++++++++++++++++ intl/ja/sl-build.txt | 1 + intl/ko/messages.json | 17 +++++++++++++++++ intl/ko/sl-build.txt | 1 + intl/pt/messages.json | 17 +++++++++++++++++ intl/pt/sl-build.txt | 0 intl/zh-Hans/messages.json | 17 +++++++++++++++++ intl/zh-Hans/sl-build.txt | 1 + intl/zh-Hant/messages.json | 17 +++++++++++++++++ intl/zh-Hant/sl-build.txt | 1 + lib/git.js | 5 +++-- package.json | 1 + sl-build.txt | 27 -------------------------- 25 files changed, 229 insertions(+), 47 deletions(-) create mode 100644 intl/de/messages.json create mode 100644 intl/de/sl-build.txt create mode 100644 intl/en/messages.json create mode 100644 intl/en/sl-build.txt create mode 100644 intl/es/messages.json create mode 100644 intl/es/sl-build.txt create mode 100644 intl/fr/messages.json create mode 100644 intl/fr/sl-build.txt create mode 100644 intl/it/messages.json create mode 100644 intl/it/sl-build.txt create mode 100644 intl/ja/messages.json create mode 100644 intl/ja/sl-build.txt create mode 100644 intl/ko/messages.json create mode 100644 intl/ko/sl-build.txt create mode 100644 intl/pt/messages.json create mode 100644 intl/pt/sl-build.txt create mode 100644 intl/zh-Hans/messages.json create mode 100644 intl/zh-Hans/sl-build.txt create mode 100644 intl/zh-Hant/messages.json create mode 100644 intl/zh-Hant/sl-build.txt delete mode 100644 sl-build.txt diff --git a/.gitignore b/.gitignore index 38087f2..6fa456e 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ sls-sample-app-2.0.3.tgz loopback-example-app*.tgz _suite _onto +intl/MSG.json diff --git a/index.js b/index.js index 589e633..b57e2bf 100644 --- a/index.js +++ b/index.js @@ -6,12 +6,13 @@ var git = require('./lib/git'); var path = require('path'); var pump = require('pump'); var shell = require('shelljs'); +var g = require('strong-globalize'); var strongPack = require('strong-pack'); var vasync = require('vasync'); var zlib = require('zlib'); function printHelp($0, prn) { - var USAGE = fs.readFileSync(require.resolve('./sl-build.txt'), 'utf-8') + var USAGE = g.t('sl-build.txt') .replace(/%MAIN%/g, $0) .trim(); @@ -30,10 +31,10 @@ function runCommand(cmd, callback) { } function runWait(cmd, callback) { - console.log('Running `%s`', cmd); + g.log('Running `%s`', cmd); runCommand(cmd, function(er, output) { if (er) { - console.error('Error on `%s`:', cmd); + g.error('Error on `%s`:', cmd); reportRunError(er, output); return callback(er); } @@ -52,7 +53,7 @@ function runStep(cmd) { function reportRunError(er, output) { if (!er) return; - console.error('Failed to run `%s`:', er.message); + g.error('Failed to run `%s`:', er.message); if (output && output !== '') { process.stderr.write(output); } @@ -83,6 +84,8 @@ exports.build = function build(argv, callback) { var pack; var commit; + g.setRootDir(path.resolve(__dirname)); + while ((option = parser.getopt()) !== undefined) { switch (option.option) { case 'v': @@ -108,7 +111,7 @@ exports.build = function build(argv, callback) { install = true; break; case 'b': - console.error('Warning: the --bundle option now does nothing and ' + + g.error('Warning: the --bundle option now does nothing and ' + 'should not be used'); break; case 'p': @@ -124,15 +127,15 @@ exports.build = function build(argv, callback) { commit = false; break; default: - console.error('Invalid usage (near option \'%s\'), try `%s --help`.', + g.error('Invalid usage (near option \'%s\'), try `%s --help`.', option.optopt, $0); - return callback(Error('usage')); + return callback(g.Error('usage')); } } if (parser.optind() !== argv.length) { - console.error('Invalid usage (extra arguments), try `%s --help`.', $0); - return callback(Error('usage')); + g.error('Invalid usage (extra arguments), try `%s --help`.', $0); + return callback(g.Error('usage')); } // With no actions selected, do everything we can (onto requires an argument, @@ -149,8 +152,8 @@ exports.build = function build(argv, callback) { } if (commit && !git.isGit()) { - console.error('Cannot perform commit on non-git working directory'); - return callback(Error('usage')); + g.error('Cannot perform commit on non-git working directory'); + return callback(g.Error('usage')); } var steps = []; @@ -178,7 +181,7 @@ exports.build = function build(argv, callback) { try { git.ensureBranch(onto); } catch (er) { - console.error('%s', er.message); + g.error('%s', er.message); return callback(er); } return callback(); @@ -188,13 +191,13 @@ exports.build = function build(argv, callback) { try { var info = git.syncBranch(onto); if (info.srcBranch && info.dstBranch) { - console.log('Merged source tree of `%s` onto `%s`', + g.log('Merged source tree of `%s` onto `%s`', info.srcBranch, info.dstBranch); } else { - console.log('Not merging HEAD into `%s`, already up to date.', onto); + g.log('Not merging HEAD into `%s`, already up to date.', onto); } } catch (er) { - console.error('%s', er.message); + g.error('%s', er.message); return callback(er); } return callback(); @@ -223,7 +226,7 @@ exports.build = function build(argv, callback) { var tarStream = strongPack(process.cwd()); var dstFile = fs.createWriteStream(dst, 'binary'); var gz = zlib.createGzip(); - console.log('Packing application in to %s', dst); + g.log('Packing application in to %s', dst); pump(tarStream, gz, dstFile, callback); } @@ -231,9 +234,9 @@ exports.build = function build(argv, callback) { try { var info = git.commitAll(onto); if (info.branch) { - console.log('Committed build products onto `%s`', info.branch); + g.log('Committed build products onto `%s`', info.branch); } else { - console.log('Build products already up to date on `%s`', onto); + g.log('Build products already up to date on `%s`', onto); } } catch (er) { console.error('%s', er.message); diff --git a/intl/de/messages.json b/intl/de/messages.json new file mode 100644 index 0000000..4b13652 --- /dev/null +++ b/intl/de/messages.json @@ -0,0 +1,17 @@ +{ + "030d811d2ab5819e6243c729824da0b6": "`{0} laufen lassen", + "1c481aa99d081c32182011a758f73d33": "{0}", + "5c54f212be40a039151f4dcb56396070": "Warnung: Der -- Bündeloption jetzt tut nichts und sollte nicht verwendet werden", + "64ba4d2a8837254d4f1a2ae704e17101": "Ungültiger Gebrauch (nahe Option '{0}'), Versuchs `{1} -- Hilfe.", + "69d65816d21750f56bef9b77e5870b02": "Kann nicht arbeiten begehen Sie auf non-git aktives Verzeichnis", + "77d8095a8be6712bb04f5259ecfe0fa1": "Keinen Kopf in `{0}, `schon aktuell, einfließen lassen.", + "7d4844ab8096cfe8d67eee3e85df60fb": "Ungültiger Gebrauch (zusätzliche Argumente), Versuchs `{0} -- Hilfe.", + "90d507cae0601242deeeea9b942544cb": "Vereinter Quellbaum `von {0} `auf `{1}", + "9366282e11c151558bdfaab4a264aa1b": "Gebrauch", + "99587c601164537b7250fe9cf50fac93": "Fehler auf `{0}: {1}", + "a8c20f23a35195c295680377789d40b4": "Bauen Sie Produkte auf `{0} schon aktuell", + "af6d9e7420995e5c0abb08a42724d606": "Fehler auf `{0}:", + "b25fa34ebd543c4e0c0669f94de5ddb8": "`{0} Nicht laufen gelassen:", + "ca6d677489e241e5af729aa7162389d1": "Bewerbung in bei {0} packen", + "d3ff137cf1ef8d22f3952261f2275780": "Entschlossene Körperbauprodukte auf `{0}" +} diff --git a/intl/de/sl-build.txt b/intl/de/sl-build.txt new file mode 100644 index 0000000..0ebf90a --- /dev/null +++ b/intl/de/sl-build.txt @@ -0,0 +1 @@ +Gebrauch: {{%MAIN%}} [Optionen] baut ein Knotenbewerbungspaket.Mit keinen Optionen hängt die Standardeinstellung darauf ab, ob ein git Lager entdeckt wird, oder nicht.Wenn ein {{git}} Lager entdeckt wird,} ist die Standardeinstellung `{{--git}:} Installieren Sie und setzen Sie die Körperbauergebnisse für den \"{{deploy}}\" Zweig ein}, der geschaffen wird, wenn es nicht schon existiert.Wenn kein {{git}} Lager entdeckt wird,} ist die Standardeinstellung `{{--npm}:} Installieren Sie und packen Sie die Körperbauergebnisse in eine `{{-.tgz}} `Akte.Optionen: {{-h,--help}} druckt diese Nachricht und verlässt. {{-v,--version}} Druckversion und -ausgang. {{-n,--npm}} gleich als `{{--install --pack}.} {{-g,--git}} gleich als `{{--install --commit}.} {{-i,--install}} installiert Abhängigkeiten (ohne Schriften, standardmäßig.) {{-s,--scripts}}, wenn installieren,} Durchlaufschriften (Zusätze zu bauen.) {{-p,--pack}} Packung in ein herausgebbares Archiv.Git bestimmte Optionen: {{-c,--commit}} begeht Körperbauausgabe (Zweig, der von {{--onto} angegeben wurde.}) {{--onto BRANCH}} Zweig, Körperbauergebnisse für einzusetzen, der geschaffen wurde, falls notwendig, (\"{{deploy}}\" standardmäßig.) diff --git a/intl/en/messages.json b/intl/en/messages.json new file mode 100644 index 0000000..6f99acf --- /dev/null +++ b/intl/en/messages.json @@ -0,0 +1,17 @@ +{ + "030d811d2ab5819e6243c729824da0b6": "Running `{0}`", + "af6d9e7420995e5c0abb08a42724d606": "Error on `{0}`:", + "b25fa34ebd543c4e0c0669f94de5ddb8": "Failed to run `{0}`:", + "5c54f212be40a039151f4dcb56396070": "Warning: the --bundle option now does nothing and should not be used", + "64ba4d2a8837254d4f1a2ae704e17101": "Invalid usage (near option '{0}'), try `{1} --help`.", + "9366282e11c151558bdfaab4a264aa1b": "usage", + "7d4844ab8096cfe8d67eee3e85df60fb": "Invalid usage (extra arguments), try `{0} --help`.", + "69d65816d21750f56bef9b77e5870b02": "Cannot perform commit on non-git working directory", + "1c481aa99d081c32182011a758f73d33": "{0}", + "90d507cae0601242deeeea9b942544cb": "Merged source tree of `{0}` onto `{1}`", + "77d8095a8be6712bb04f5259ecfe0fa1": "Not merging HEAD into `{0}`, already up to date.", + "ca6d677489e241e5af729aa7162389d1": "Packing application in to {0}", + "d3ff137cf1ef8d22f3952261f2275780": "Committed build products onto `{0}`", + "a8c20f23a35195c295680377789d40b4": "Build products already up to date on `{0}`", + "99587c601164537b7250fe9cf50fac93": "Error on `{0}`:\n {1}" +} diff --git a/intl/en/sl-build.txt b/intl/en/sl-build.txt new file mode 100644 index 0000000..a9caf36 --- /dev/null +++ b/intl/en/sl-build.txt @@ -0,0 +1,27 @@ +usage: {{%MAIN%}} [options] + +Build a node application package. + +With no options, the default depends on whether a git repository is +detected or not. + +If a {{git}} repository is detected the default is `{{--git}}`: install and commit the +build results to the "{{deploy}}" branch, which will be created if it does not +already exist. + +If no {{git}} repository is detected the default is `{{--npm}}`: install and +pack the build results into a `{{-.tgz}}` file. + +Options: + {{-h,--help}} Print this message and exit. + {{-v,--version}} Print version and exit. + {{-n,--npm}} Same as `{{--install --pack}}`. + {{-g,--git}} Same as `{{--install --commit}}`. + {{-i,--install}} Install dependencies (without scripts, by default). + {{-s,--scripts}} If installing, run scripts (to build addons). + {{-p,--pack}} Pack into a publishable archive. + +Git specific options: + {{-c,--commit}} Commit build output (branch specified by {{--onto}}). + {{--onto BRANCH}} Branch to commit build results to, created if + necessary ("{{deploy}}", by default). diff --git a/intl/es/messages.json b/intl/es/messages.json new file mode 100644 index 0000000..e72084b --- /dev/null +++ b/intl/es/messages.json @@ -0,0 +1,17 @@ +{ + "030d811d2ab5819e6243c729824da0b6": "Ejecución de ` {0} `", + "1c481aa99d081c32182011a758f73d33": "{0}", + "5c54f212be40a039151f4dcb56396070": "Aviso: -- opción de paquete no ahora y no debería utilizarse", + "64ba4d2a8837254d4f1a2ae704e17101": "Uso no válido (cerca de la opción '{0}'), intente ` {1} -- ayuda \".", + "69d65816d21750f56bef9b77e5870b02": "No realizar confirmación en directorio de trabajo no git", + "77d8095a8be6712bb04f5259ecfe0fa1": "No fusionar HEAD en ` {0} `, ya hasta la fecha.", + "7d4844ab8096cfe8d67eee3e85df60fb": "Uso no válido de argumentos extra), intente ` {0} -- ayuda \".", + "90d507cae0601242deeeea9b942544cb": "árbol de origen fusionado de ` {0} ` a ` {1} `", + "9366282e11c151558bdfaab4a264aa1b": "Uso", + "99587c601164537b7250fe9cf50fac93": "Error en ` {0} `:\n {1}", + "a8c20f23a35195c295680377789d40b4": "Construir productos ya hasta la fecha sobre ` {0} `", + "af6d9e7420995e5c0abb08a42724d606": "Error en ` {0} `:", + "b25fa34ebd543c4e0c0669f94de5ddb8": "No se ha podido ejecutar ` {0} `:", + "ca6d677489e241e5af729aa7162389d1": "Con la aplicación en {0}", + "d3ff137cf1ef8d22f3952261f2275780": "Los productos de construcción cometidas en ` {0} `" +} diff --git a/intl/es/sl-build.txt b/intl/es/sl-build.txt new file mode 100644 index 0000000..e69de29 diff --git a/intl/fr/messages.json b/intl/fr/messages.json new file mode 100644 index 0000000..b1e94e6 --- /dev/null +++ b/intl/fr/messages.json @@ -0,0 +1,17 @@ +{ + "030d811d2ab5819e6243c729824da0b6": "Exécution ` {0} `", + "1c481aa99d081c32182011a758f73d33": "{0}", + "5c54f212be40a039151f4dcb56396070": "Avertissement: l'option -- regroupement maintenant ne fait rien et ne doit pas être utilisé", + "64ba4d2a8837254d4f1a2ae704e17101": "Utilisation non valide (de l'option '{0}'), essayez ` {1} -- help \".", + "69d65816d21750f56bef9b77e5870b02": "Impossible d'effectuer la validation sur le répertoire de travail non git", + "77d8095a8be6712bb04f5259ecfe0fa1": "Pas de fusion HEAD en ` {0} `, déjà à jour.", + "7d4844ab8096cfe8d67eee3e85df60fb": "Utilisation non valide (d'arguments supplémentaires), essayez ` {0} -- help \".", + "90d507cae0601242deeeea9b942544cb": "Arbre source fusionné de ` {0} ` sur ` {1} `", + "9366282e11c151558bdfaab4a264aa1b": "Utilisation", + "99587c601164537b7250fe9cf50fac93": "Erreur sur ` {0} `:\n {1}", + "a8c20f23a35195c295680377789d40b4": "Les produits de construction déjà à jour sur ` {0} `", + "af6d9e7420995e5c0abb08a42724d606": "Erreur sur ` {0} `:", + "b25fa34ebd543c4e0c0669f94de5ddb8": "Echec de l'exécution ` {0} `:", + "ca6d677489e241e5af729aa7162389d1": "Application d'emballage à {0}", + "d3ff137cf1ef8d22f3952261f2275780": "Les produits de construction commis sur ` {0} `" +} diff --git a/intl/fr/sl-build.txt b/intl/fr/sl-build.txt new file mode 100644 index 0000000..e69de29 diff --git a/intl/it/messages.json b/intl/it/messages.json new file mode 100644 index 0000000..ef94f72 --- /dev/null +++ b/intl/it/messages.json @@ -0,0 +1,17 @@ +{ + "030d811d2ab5819e6243c729824da0b6": "`Il corrente `{0}", + "1c481aa99d081c32182011a758f73d33": "{0}", + "5c54f212be40a039151f4dcb56396070": "Avvertimento: Lo -- l'opzione di fascio ora non fa niente e non dovrebbe essere utilizzata", + "64ba4d2a8837254d4f1a2ae704e17101": "Utilizzo non valido (opzione vicina '{0}'), `{1} di prova `-- aiuto.", + "69d65816d21750f56bef9b77e5870b02": "Non può funzionare commettete su indice di lavoro non-git", + "77d8095a8be6712bb04f5259ecfe0fa1": "Non unione di TESTA in `{0}, `già aggiornato.", + "7d4844ab8096cfe8d67eee3e85df60fb": "Utilizzo non valido (argomenti supplementari), `{0} di prova `-- aiuto.", + "90d507cae0601242deeeea9b942544cb": "Albero di sorgente unito di `{0} `su `{1}", + "9366282e11c151558bdfaab4a264aa1b": "Utilizzo", + "99587c601164537b7250fe9cf50fac93": "Errore su `{0}: {1}", + "a8c20f23a35195c295680377789d40b4": "Basate prodotti già finora su `{0}", + "af6d9e7420995e5c0abb08a42724d606": "Errore su `{0}:", + "b25fa34ebd543c4e0c0669f94de5ddb8": "Non riuscito a eseguire `{0}:", + "ca6d677489e241e5af729aa7162389d1": "Imballando applicazione in a {0}", + "d3ff137cf1ef8d22f3952261f2275780": "Prodotti di costruzione impegnati su `{0}" +} diff --git a/intl/it/sl-build.txt b/intl/it/sl-build.txt new file mode 100644 index 0000000..4034097 --- /dev/null +++ b/intl/it/sl-build.txt @@ -0,0 +1 @@ +Utilizzo: {{%MAIN%}} [le opzioni] Costruisce un pacchetto applicativo di nodo.Con nessuna opzione, il default dipende su se un deposito git è rilevato o no.Se un} deposito {{git}} è rilevato il default è `{{--git}:} Installate e affidate i risultati di costruzione al} ramo \"{{deploy}}\", che sarà creato se non già esiste.Se nessun} deposito {{git}} è rilevato il default è `{{--npm}:} Installate e imballate i risultati di costruzione in un} ``archivio {{-.tgz}.}Opzioni: {{-h,--help}} Stampa questo messaggio e esce. Versione di Stampa e uscita {{-v,--version}.} {{-n,--npm}} Stesso come `{{--install --pack}.} {{-g,--git}} Stesso come `{{--install --commit}.} {{-i,--install}} Installa dipendenze (senza testi, per default.) {{-s,--scripts}} Se installare,} testi di corsa per (costruire addons.) Pacco {{-p,--pack}} in un archivio publishable.Opzioni specifiche Git: {{-c,--commit}} Commette prodotto di costruzione (ramo specificato da {{--onto}.}) Ramo {{--onto BRANCH}} Per affidare risultati di costruzione a, creato se necessario (\"{{deploy},}\" per default.) diff --git a/intl/ja/messages.json b/intl/ja/messages.json new file mode 100644 index 0000000..a3d31e0 --- /dev/null +++ b/intl/ja/messages.json @@ -0,0 +1,17 @@ +{ + "030d811d2ab5819e6243c729824da0b6": "走ること`{0}`", + "1c481aa99d081c32182011a758f73d33": "{0}", + "5c54f212be40a039151f4dcb56396070": "警告:その--束選択は、今何もしなくて、そして使われるべきではありません", + "64ba4d2a8837254d4f1a2ae704e17101": "無効な使い方(近くの選択{0}’)、試み`{1}--助け`。", + "69d65816d21750f56bef9b77e5870b02": "実行することができません非能なし作業ディレクトリで託して下さい", + "77d8095a8be6712bb04f5259ecfe0fa1": "頭を合併しないためへ`{0}`すでに現在まで上へ、", + "7d4844ab8096cfe8d67eee3e85df60fb": "無効な使い方(余分の議論)、試み`{0}--助け`。", + "90d507cae0601242deeeea9b942544cb": "ソース・ツリーを合併しました、`{0}`の上へ`{1}`", + "9366282e11c151558bdfaab4a264aa1b": "使い方", + "99587c601164537b7250fe9cf50fac93": "間違いで`{0}`: {1}", + "a8c20f23a35195c295680377789d40b4": "現在まで上へ製品をすでに建てますで`{0}`", + "af6d9e7420995e5c0abb08a42724d606": "間違いで`{0}`:", + "b25fa34ebd543c4e0c0669f94de5ddb8": "走り損ねます`{0}`:", + "ca6d677489e241e5af729aa7162389d1": "適用を詰め込みますでへの{0}", + "d3ff137cf1ef8d22f3952261f2275780": "体格製品を託しましたの上へ`{0}`" +} diff --git a/intl/ja/sl-build.txt b/intl/ja/sl-build.txt new file mode 100644 index 0000000..be54658 --- /dev/null +++ b/intl/ja/sl-build.txt @@ -0,0 +1 @@ +使い方:{{%MAIN%}}[選択]節適用包みを建てて下さい。選択なしで、デフォルトは、能なし倉庫が見つけられるかどうかによります。ときにはひとつの{{git}}倉庫が見つけられますデフォルトはあります`{{--git}}`:取り付けてそして体格がそこに起因することを託しますその\"{{deploy}}「もしそれがまだ存在しなければ作られるだろう枝。もしノーならば{{git}}倉庫が見つけられますデフォルトはあります`{{--npm}}`:体格結果を取り付けて詰め込みますへひとつの`{{-.tgz}}`ファイル。選択:{{-h,--help}} この伝言と出口を出版して下さい。{{-v,--version}} バージョンと出口を印刷して下さい。{{-n,--npm}} 同じので`{{--install --pack}}`。{{-g,--git}} 同じので`{{--install --commit}}`。{{-i,--install}} 属国(台本なしで、デフォルトまでに)を取り付けて下さい。{{-s,--scripts}} 取り付けていれば、台本(addonsを建てるために)を走らせて下さい。{{-p,--pack}} 公表価値があるアーカイブにぎっしりと詰まって下さい。能なし詳細選択:{{-c,--commit}} 体格産出を託して下さい(枝が指定しましたによって{{--onto}})。{{--onto BRANCH}} 必要なら、体格を託す枝は、そこに起因して、創造的なことをしました(」{{deploy}}\"、デフォルトまでに)。 diff --git a/intl/ko/messages.json b/intl/ko/messages.json new file mode 100644 index 0000000..b83c12f --- /dev/null +++ b/intl/ko/messages.json @@ -0,0 +1,17 @@ +{ + "030d811d2ab5819e6243c729824da0b6": "{0}을 달리기", + "1c481aa99d081c32182011a758f73d33": "{0}", + "5c54f212be40a039151f4dcb56396070": "경고: 지금 다발 옵션이 아무것도 하지 않았고 사용되지 말아야 한다.", + "64ba4d2a8837254d4f1a2ae704e17101": "효력이 없는 사용(가까운 옵션 '{0}' ),시도 {1}-도움.", + "69d65816d21750f56bef9b77e5870b02": "non git(위)에 작용하는 디렉토리를 범하여라 실행할 수 없다.", + "77d8095a8be6712bb04f5259ecfe0fa1": "머리를 이미 최신식인 {0}에 흡수되지 않기.", + "7d4844ab8096cfe8d67eee3e85df60fb": "효력이 없는 사용(가외의 논쟁),시도 {0}-도움.", + "90d507cae0601242deeeea9b942544cb": "{0}의 {1} 위에 합병된 소스 나무", + "9366282e11c151558bdfaab4a264aa1b": "사용", + "99587c601164537b7250fe9cf50fac93": "{0}(위)에 오류: {1}", + "a8c20f23a35195c295680377789d40b4": "이미 최신식인 제품을 {0}을 바탕으로 세워라", + "af6d9e7420995e5c0abb08a42724d606": "{0}(위)에 오류:", + "b25fa34ebd543c4e0c0669f94de5ddb8": "{0}을 달리지 못하였다:", + "ca6d677489e241e5af729aa7162389d1": "안에 {0}에 대한 응용을 싸기", + "d3ff137cf1ef8d22f3952261f2275780": "{0} 위에 헌신적인 체격 제품" +} diff --git a/intl/ko/sl-build.txt b/intl/ko/sl-build.txt new file mode 100644 index 0000000..0fe5e4e --- /dev/null +++ b/intl/ko/sl-build.txt @@ -0,0 +1 @@ +사용: {{%MAIN%}[옵션] 노드 응용 패키지를 세워라. 옵션 없이 git 저장고를 탐지하는지에 대해,채무 불이행은 의존하지 않는다. {{git} 저장고를 탐지한다면 채무 불이행은 {{--git}이다: 그것이 이미 존재하지 않는다면 만들어 지는 \"{{deploy}\" 브랜치를 설치하고 체격 결과를 맡기어라. 어떤 {{git} 저장고도 탐지하지 않는다면 채무 불이행은 {{--npm}이다: {{-.tgz} 파일로 체격 결과를 설치하고 싸라. 옵션: {{-h,--help}이 이 메시지를 인쇄하고 퇴장한다. {{-v,--version} 프린트 버전과 출구. {{--install --pack}으로서 {{-n,--npm} 같은. {{--install --commit}으로서 {{-g,--git} 같은. 채무 불이행 옆의 스크립트 없는 {{-i,--install} 설치 의존 상태. 설치한다면 {{-s,--scripts},addons을 세울 런 스크립트. 출판된 공문서로 {{-p,--pack} 팩. 특정한 Git 옵션: {{-c,--commit}은 체격 아웃풋({{--onto}에 의하여 명시해 진 브랜치)을 범한다. {{--onto BRANCH} 체격 결과 를 맡길 필요하다면 만들어 진 브랜치 \"(\" 채무 불이행 옆의\" \"{{deploy})\" . diff --git a/intl/pt/messages.json b/intl/pt/messages.json new file mode 100644 index 0000000..eb73395 --- /dev/null +++ b/intl/pt/messages.json @@ -0,0 +1,17 @@ +{ + "030d811d2ab5819e6243c729824da0b6": "Executando ` {0} `", + "1c481aa99d081c32182011a758f73d33": "{0}", + "5c54f212be40a039151f4dcb56396070": "Aviso: o -- opção agora não configurável nada e não devem ser usados", + "64ba4d2a8837254d4f1a2ae704e17101": "Uso inválido (de opção '{0}'), tente ` {1} -- help \".", + "69d65816d21750f56bef9b77e5870b02": "Impossível executar confirmação no diretório de trabalho não vá", + "77d8095a8be6712bb04f5259ecfe0fa1": "Não mesclar HEAD para ` {0} `, já até a data.", + "7d4844ab8096cfe8d67eee3e85df60fb": "Uso inválido (de argumentos extras), tente ` {0} -- help \".", + "90d507cae0601242deeeea9b942544cb": "árvore de origem mesclada de ` {0} ` para ` {1} `", + "9366282e11c151558bdfaab4a264aa1b": "Uso", + "99587c601164537b7250fe9cf50fac93": "Erro no ` {0} `:\n {1}", + "a8c20f23a35195c295680377789d40b4": "Os produtos de construção já atualizado sobre ` {0} `", + "af6d9e7420995e5c0abb08a42724d606": "Erro no ` {0} `:", + "b25fa34ebd543c4e0c0669f94de5ddb8": "Falha ao executar ` {0} `:", + "ca6d677489e241e5af729aa7162389d1": "Empacotando aplicativo em {0}", + "d3ff137cf1ef8d22f3952261f2275780": "Os produtos de construção Confirmada para ` {0} `" +} diff --git a/intl/pt/sl-build.txt b/intl/pt/sl-build.txt new file mode 100644 index 0000000..e69de29 diff --git a/intl/zh-Hans/messages.json b/intl/zh-Hans/messages.json new file mode 100644 index 0000000..aa6083b --- /dev/null +++ b/intl/zh-Hans/messages.json @@ -0,0 +1,17 @@ +{ + "030d811d2ab5819e6243c729824da0b6": "运作`{0}`", + "1c481aa99d081c32182011a758f73d33": "{0}", + "5c54f212be40a039151f4dcb56396070": "警告:现在捆选择余地做无足轻重和是将不被使用", + "64ba4d2a8837254d4f1a2ae704e17101": "无效使用(离近选择余地‘{0})’,尝试`{1}--对有帮助`。", + "69d65816d21750f56bef9b77e5870b02": "不能表演在反对票无用的人上犯使工作目录", + "77d8095a8be6712bb04f5259ecfe0fa1": "不要合并 HEAD 成为已经现代化`{0}`。", + "7d4844ab8096cfe8d67eee3e85df60fb": "无效使用(额外和争辩),尝试`{0}--对有帮助`。", + "90d507cae0601242deeeea9b942544cb": "`{0}`的到`{1}`上面的合并成为来源树", + "9366282e11c151558bdfaab4a264aa1b": "使用", + "99587c601164537b7250fe9cf50fac93": "在`{0}`上的在中的错误:{1}", + "a8c20f23a35195c295680377789d40b4": "在`{0}`的基础上建立已经现代化产品", + "af6d9e7420995e5c0abb08a42724d606": "在`{0}`上的在中的错误:", + "b25fa34ebd543c4e0c0669f94de5ddb8": "未能运作`{0}`:", + "ca6d677489e241e5af729aa7162389d1": "包装在中适用于{0}", + "d3ff137cf1ef8d22f3952261f2275780": "到`{0}`上面的受托付的外型产品" +} diff --git a/intl/zh-Hans/sl-build.txt b/intl/zh-Hans/sl-build.txt new file mode 100644 index 0000000..9dedb72 --- /dev/null +++ b/intl/zh-Hans/sl-build.txt @@ -0,0 +1 @@ +使用:{{%MAIN%}[选择余地〕在的基础上建立一个节应用包裹。没有选择余地,未履行在是否一无用的人仓库被察觉上视情况而定。如果一{{git}仓库被察觉,未履行是`{{--git}`:安装和把外型结果交付给将被建立,如果它不确实已经存在的“{{deploy}”分枝。如果没有{{git}仓库被察觉,未履行是`{{--npm}`:安装和把塞进一`{{-.tgz}`关于的文件外型结果。选择余地: {{-h,--help}以加印这信息和从出去。{{-v,--version}印刷版本 和出口。{{-n,--npm}和`{{--install --pack}`同样的。{{-g,--git}和 `{{--install --commit}`同样的。没有按缺省的字体的{{-i,--install}安装 附属国。如果安装的{{-s,--scripts},在的基础上建立附带 加上去的东西的跑步字体。变为一可出版的档案文 件的{{-p,--pack}包。Git 所特有选择余地: {{-c,--commit}犯外型从输出到(经过{{--onto})指定分枝作为的。{{--onto BRANCH}向前犯外型结果的建立,如果 必然的分枝(按缺省的{{deploy}。 diff --git a/intl/zh-Hant/messages.json b/intl/zh-Hant/messages.json new file mode 100644 index 0000000..7e74347 --- /dev/null +++ b/intl/zh-Hant/messages.json @@ -0,0 +1,17 @@ +{ + "030d811d2ab5819e6243c729824da0b6": "運作`{0}`", + "1c481aa99d081c32182011a758f73d33": "{0}", + "5c54f212be40a039151f4dcb56396070": "警告:現在捆選擇餘地做無足輕重和是將不被使用", + "64ba4d2a8837254d4f1a2ae704e17101": "無效使用(離近選擇餘地‘{0})」,嘗試`{1}--對有幫助`。", + "69d65816d21750f56bef9b77e5870b02": "不能表演在反對票無用的人上犯使工作目錄", + "77d8095a8be6712bb04f5259ecfe0fa1": "不要合併 HEAD 成為已經現代化`{0}`。", + "7d4844ab8096cfe8d67eee3e85df60fb": "無效使用(額外和爭辯),嘗試`{0}--對有幫助`。", + "90d507cae0601242deeeea9b942544cb": "`{0}`的到`{1}`上面的合併成為來源樹", + "9366282e11c151558bdfaab4a264aa1b": "使用", + "99587c601164537b7250fe9cf50fac93": "在`{0}`上的在中的錯誤:{1}", + "a8c20f23a35195c295680377789d40b4": "在`{0}`的基礎上建立已經現代化產品", + "af6d9e7420995e5c0abb08a42724d606": "在`{0}`上的在中的錯誤:", + "b25fa34ebd543c4e0c0669f94de5ddb8": "未能運作`{0}`:", + "ca6d677489e241e5af729aa7162389d1": "包裝在中適用於{0}", + "d3ff137cf1ef8d22f3952261f2275780": "到`{0}`上面的受託付的外型產品" +} diff --git a/intl/zh-Hant/sl-build.txt b/intl/zh-Hant/sl-build.txt new file mode 100644 index 0000000..c49b341 --- /dev/null +++ b/intl/zh-Hant/sl-build.txt @@ -0,0 +1 @@ +使用:{{%MAIN%}[選擇餘地〕在的基礎上建立一個節應用包裹。沒有選擇餘地,未履行在是否一無用的人倉庫是察覺上視情況而定。如果一{{git}倉庫被察覺,未履行是`{{--git}`:安裝和把外型結果交付給將被建立,如果它不確實已經存在的“{{deploy}』分枝。如果沒有{{git}倉庫被察覺,未履行是`{{--npm}`:安裝和把塞進一`{{-.tgz}`關於的檔案外型結果。選擇餘地: {{-h,--help}以加印這訊息和從出去。{{-v,--version}印刷版本 和出口。{{-n,--npm}和`{{--install --pack}`同樣的。{{-g,--git}和 `{{--install --commit}`同樣的。沒有按預設的字體的{{-i,--install}安裝 附屬國。如果安裝的{{-s,--scripts},在的基礎上建立附帶 加上去的東西的跑步字體。變為一可出版的檔案的 {{-p,--pack}包。Git 所特有選擇餘地: {{-c,--commit}犯外型從輸出到(在{{--onto})旁邊指定分枝作為的。{{--onto BRANCH}向前犯外型結果的建立,如 果必然的分枝(按預設的{{deploy}。 diff --git a/lib/git.js b/lib/git.js index ea25662..6f95b07 100644 --- a/lib/git.js +++ b/lib/git.js @@ -2,6 +2,7 @@ var debug = require('debug')('strong-build'); var lodash = require('lodash'); var path = require('path'); var shell = require('shelljs'); +var g = require('strong-globalize'); var util = require('util'); function fmt() { @@ -22,11 +23,11 @@ function execSync(cmd, error, noOutput) { if (exec.code !== 0) { var output = exec.output.replace('fatal: ', ''); - console.log('Error on `%s`:\n %s', cmd, output); + g.log('Error on `%s`:\n %s', cmd, output); throw Error(error); } - console.log('Running `%s`', cmd); + g.log('Running `%s`', cmd); // git on success may still write messages to stderr, and shelljs combines // stdout and stderr (sucky). This effect commit-tree, for example, when dest diff --git a/package.json b/package.json index 87b3734..b8cb61e 100644 --- a/package.json +++ b/package.json @@ -34,6 +34,7 @@ "posix-getopt": "^1.0.0", "pump": "^1.0.1", "shelljs": "^0.4.0", + "strong-globalize": "^1.0.0", "strong-pack": "^1.0.0", "vasync": "^1.4.3" }, diff --git a/sl-build.txt b/sl-build.txt deleted file mode 100644 index fddc1f3..0000000 --- a/sl-build.txt +++ /dev/null @@ -1,27 +0,0 @@ -usage: %MAIN% [options] - -Build a node application package. - -With no options, the default depends on whether a git repository is -detected or not. - -If a git repository is detected the default is `--git`: install and commit the -build results to the "deploy" branch, which will be created if it does not -already exist. - -If no git repository is detected the default is `--npm`: install and -pack the build results into a `-.tgz` file. - -Options: - -h,--help Print this message and exit. - -v,--version Print version and exit. - -n,--npm Same as `--install --pack`. - -g,--git Same as `--install --commit`. - -i,--install Install dependencies (without scripts, by default). - -s,--scripts If installing, run scripts (to build addons). - -p,--pack Pack into a publishable archive. - -Git specific options: - -c,--commit Commit build output (branch specified by --onto). - --onto BRANCH Branch to commit build results to, created if - necessary ("deploy", by default). From ea20e0bf4c481d50dd865ed42fdf609b4e9f1122 Mon Sep 17 00:00:00 2001 From: Setogit Date: Tue, 19 Jan 2016 11:34:10 -0800 Subject: [PATCH 2/6] Protect the terms with {{ }} from translation --- index.js | 12 ++++++------ intl/de/messages.json | 8 ++++---- intl/en/messages.json | 8 ++++---- intl/es/messages.json | 8 ++++---- intl/fr/messages.json | 8 ++++---- intl/it/messages.json | 8 ++++---- intl/ja/messages.json | 8 ++++---- intl/ko/messages.json | 8 ++++---- intl/pt/messages.json | 8 ++++---- intl/zh-Hans/messages.json | 8 ++++---- intl/zh-Hant/messages.json | 8 ++++---- 11 files changed, 46 insertions(+), 46 deletions(-) diff --git a/index.js b/index.js index b57e2bf..445e4e4 100644 --- a/index.js +++ b/index.js @@ -2,11 +2,11 @@ var Parser = require('posix-getopt').BasicParser; var debug = require('debug')('strong-build'); var fmt = require('util').format; var fs = require('fs'); +var g = require('strong-globalize'); var git = require('./lib/git'); var path = require('path'); var pump = require('pump'); var shell = require('shelljs'); -var g = require('strong-globalize'); var strongPack = require('strong-pack'); var vasync = require('vasync'); var zlib = require('zlib'); @@ -84,7 +84,7 @@ exports.build = function build(argv, callback) { var pack; var commit; - g.setRootDir(path.resolve(__dirname)); + g.setRootDir(__dirname); while ((option = parser.getopt()) !== undefined) { switch (option.option) { @@ -127,14 +127,14 @@ exports.build = function build(argv, callback) { commit = false; break; default: - g.error('Invalid usage (near option \'%s\'), try `%s --help`.', + g.error('Invalid usage (near option \'%s\'), try `{{%s --help}}`.', option.optopt, $0); return callback(g.Error('usage')); } } if (parser.optind() !== argv.length) { - g.error('Invalid usage (extra arguments), try `%s --help`.', $0); + g.error('Invalid usage (extra arguments), try `{{%s --help}}`.', $0); return callback(g.Error('usage')); } @@ -152,7 +152,7 @@ exports.build = function build(argv, callback) { } if (commit && !git.isGit()) { - g.error('Cannot perform commit on non-git working directory'); + g.error('Cannot perform commit on {{non-git}} working directory'); return callback(g.Error('usage')); } @@ -194,7 +194,7 @@ exports.build = function build(argv, callback) { g.log('Merged source tree of `%s` onto `%s`', info.srcBranch, info.dstBranch); } else { - g.log('Not merging HEAD into `%s`, already up to date.', onto); + g.log('Not merging {{HEAD}} into `%s`, already up to date.', onto); } } catch (er) { g.error('%s', er.message); diff --git a/intl/de/messages.json b/intl/de/messages.json index 4b13652..663df87 100644 --- a/intl/de/messages.json +++ b/intl/de/messages.json @@ -1,16 +1,16 @@ { "030d811d2ab5819e6243c729824da0b6": "`{0} laufen lassen", + "1135cb7ad2114989954c26dc4e9bebad": "Ungültiger Gebrauch (nahe Option '{0}'), Versuchs `{{{1} -- Hilfe.}}", "1c481aa99d081c32182011a758f73d33": "{0}", "5c54f212be40a039151f4dcb56396070": "Warnung: Der -- Bündeloption jetzt tut nichts und sollte nicht verwendet werden", - "64ba4d2a8837254d4f1a2ae704e17101": "Ungültiger Gebrauch (nahe Option '{0}'), Versuchs `{1} -- Hilfe.", - "69d65816d21750f56bef9b77e5870b02": "Kann nicht arbeiten begehen Sie auf non-git aktives Verzeichnis", - "77d8095a8be6712bb04f5259ecfe0fa1": "Keinen Kopf in `{0}, `schon aktuell, einfließen lassen.", - "7d4844ab8096cfe8d67eee3e85df60fb": "Ungültiger Gebrauch (zusätzliche Argumente), Versuchs `{0} -- Hilfe.", + "6b394b7761ff45400e21c8cd2b9e232a": "{{HEAD} nicht} in `{0}, `schon aktuell, einfließen lassen.}", "90d507cae0601242deeeea9b942544cb": "Vereinter Quellbaum `von {0} `auf `{1}", "9366282e11c151558bdfaab4a264aa1b": "Gebrauch", "99587c601164537b7250fe9cf50fac93": "Fehler auf `{0}: {1}", + "a2bc72e22e890be19e1660493472495e": "Ungültiger Gebrauch (zusätzliche Argumente), Versuchs `{{{0} -- Hilfe.}}", "a8c20f23a35195c295680377789d40b4": "Bauen Sie Produkte auf `{0} schon aktuell", "af6d9e7420995e5c0abb08a42724d606": "Fehler auf `{0}:", + "b244d9c9891555b90e18d551c5d082ea": "Kann nicht arbeiten begehen Sie auf {{non-git}} aktives Verzeichnis", "b25fa34ebd543c4e0c0669f94de5ddb8": "`{0} Nicht laufen gelassen:", "ca6d677489e241e5af729aa7162389d1": "Bewerbung in bei {0} packen", "d3ff137cf1ef8d22f3952261f2275780": "Entschlossene Körperbauprodukte auf `{0}" diff --git a/intl/en/messages.json b/intl/en/messages.json index 6f99acf..c76abbb 100644 --- a/intl/en/messages.json +++ b/intl/en/messages.json @@ -3,13 +3,13 @@ "af6d9e7420995e5c0abb08a42724d606": "Error on `{0}`:", "b25fa34ebd543c4e0c0669f94de5ddb8": "Failed to run `{0}`:", "5c54f212be40a039151f4dcb56396070": "Warning: the --bundle option now does nothing and should not be used", - "64ba4d2a8837254d4f1a2ae704e17101": "Invalid usage (near option '{0}'), try `{1} --help`.", + "1135cb7ad2114989954c26dc4e9bebad": "Invalid usage (near option '{0}'), try `{{{1} --help}}`.", "9366282e11c151558bdfaab4a264aa1b": "usage", - "7d4844ab8096cfe8d67eee3e85df60fb": "Invalid usage (extra arguments), try `{0} --help`.", - "69d65816d21750f56bef9b77e5870b02": "Cannot perform commit on non-git working directory", + "a2bc72e22e890be19e1660493472495e": "Invalid usage (extra arguments), try `{{{0} --help}}`.", + "b244d9c9891555b90e18d551c5d082ea": "Cannot perform commit on {{non-git}} working directory", "1c481aa99d081c32182011a758f73d33": "{0}", "90d507cae0601242deeeea9b942544cb": "Merged source tree of `{0}` onto `{1}`", - "77d8095a8be6712bb04f5259ecfe0fa1": "Not merging HEAD into `{0}`, already up to date.", + "6b394b7761ff45400e21c8cd2b9e232a": "Not merging {{HEAD}} into `{0}`, already up to date.", "ca6d677489e241e5af729aa7162389d1": "Packing application in to {0}", "d3ff137cf1ef8d22f3952261f2275780": "Committed build products onto `{0}`", "a8c20f23a35195c295680377789d40b4": "Build products already up to date on `{0}`", diff --git a/intl/es/messages.json b/intl/es/messages.json index e72084b..f5ed1cc 100644 --- a/intl/es/messages.json +++ b/intl/es/messages.json @@ -1,16 +1,16 @@ { "030d811d2ab5819e6243c729824da0b6": "Ejecución de ` {0} `", + "1135cb7ad2114989954c26dc4e9bebad": "", "1c481aa99d081c32182011a758f73d33": "{0}", "5c54f212be40a039151f4dcb56396070": "Aviso: -- opción de paquete no ahora y no debería utilizarse", - "64ba4d2a8837254d4f1a2ae704e17101": "Uso no válido (cerca de la opción '{0}'), intente ` {1} -- ayuda \".", - "69d65816d21750f56bef9b77e5870b02": "No realizar confirmación en directorio de trabajo no git", - "77d8095a8be6712bb04f5259ecfe0fa1": "No fusionar HEAD en ` {0} `, ya hasta la fecha.", - "7d4844ab8096cfe8d67eee3e85df60fb": "Uso no válido de argumentos extra), intente ` {0} -- ayuda \".", + "6b394b7761ff45400e21c8cd2b9e232a": "", "90d507cae0601242deeeea9b942544cb": "árbol de origen fusionado de ` {0} ` a ` {1} `", "9366282e11c151558bdfaab4a264aa1b": "Uso", "99587c601164537b7250fe9cf50fac93": "Error en ` {0} `:\n {1}", + "a2bc72e22e890be19e1660493472495e": "", "a8c20f23a35195c295680377789d40b4": "Construir productos ya hasta la fecha sobre ` {0} `", "af6d9e7420995e5c0abb08a42724d606": "Error en ` {0} `:", + "b244d9c9891555b90e18d551c5d082ea": "", "b25fa34ebd543c4e0c0669f94de5ddb8": "No se ha podido ejecutar ` {0} `:", "ca6d677489e241e5af729aa7162389d1": "Con la aplicación en {0}", "d3ff137cf1ef8d22f3952261f2275780": "Los productos de construcción cometidas en ` {0} `" diff --git a/intl/fr/messages.json b/intl/fr/messages.json index b1e94e6..4e31e82 100644 --- a/intl/fr/messages.json +++ b/intl/fr/messages.json @@ -1,16 +1,16 @@ { "030d811d2ab5819e6243c729824da0b6": "Exécution ` {0} `", + "1135cb7ad2114989954c26dc4e9bebad": "", "1c481aa99d081c32182011a758f73d33": "{0}", "5c54f212be40a039151f4dcb56396070": "Avertissement: l'option -- regroupement maintenant ne fait rien et ne doit pas être utilisé", - "64ba4d2a8837254d4f1a2ae704e17101": "Utilisation non valide (de l'option '{0}'), essayez ` {1} -- help \".", - "69d65816d21750f56bef9b77e5870b02": "Impossible d'effectuer la validation sur le répertoire de travail non git", - "77d8095a8be6712bb04f5259ecfe0fa1": "Pas de fusion HEAD en ` {0} `, déjà à jour.", - "7d4844ab8096cfe8d67eee3e85df60fb": "Utilisation non valide (d'arguments supplémentaires), essayez ` {0} -- help \".", + "6b394b7761ff45400e21c8cd2b9e232a": "", "90d507cae0601242deeeea9b942544cb": "Arbre source fusionné de ` {0} ` sur ` {1} `", "9366282e11c151558bdfaab4a264aa1b": "Utilisation", "99587c601164537b7250fe9cf50fac93": "Erreur sur ` {0} `:\n {1}", + "a2bc72e22e890be19e1660493472495e": "", "a8c20f23a35195c295680377789d40b4": "Les produits de construction déjà à jour sur ` {0} `", "af6d9e7420995e5c0abb08a42724d606": "Erreur sur ` {0} `:", + "b244d9c9891555b90e18d551c5d082ea": "", "b25fa34ebd543c4e0c0669f94de5ddb8": "Echec de l'exécution ` {0} `:", "ca6d677489e241e5af729aa7162389d1": "Application d'emballage à {0}", "d3ff137cf1ef8d22f3952261f2275780": "Les produits de construction commis sur ` {0} `" diff --git a/intl/it/messages.json b/intl/it/messages.json index ef94f72..e41155f 100644 --- a/intl/it/messages.json +++ b/intl/it/messages.json @@ -1,16 +1,16 @@ { "030d811d2ab5819e6243c729824da0b6": "`Il corrente `{0}", + "1135cb7ad2114989954c26dc4e9bebad": "Utilizzo non valido (opzione vicina '{0}'), `{{{1} di prova `-- aiuto.}}", "1c481aa99d081c32182011a758f73d33": "{0}", "5c54f212be40a039151f4dcb56396070": "Avvertimento: Lo -- l'opzione di fascio ora non fa niente e non dovrebbe essere utilizzata", - "64ba4d2a8837254d4f1a2ae704e17101": "Utilizzo non valido (opzione vicina '{0}'), `{1} di prova `-- aiuto.", - "69d65816d21750f56bef9b77e5870b02": "Non può funzionare commettete su indice di lavoro non-git", - "77d8095a8be6712bb04f5259ecfe0fa1": "Non unione di TESTA in `{0}, `già aggiornato.", - "7d4844ab8096cfe8d67eee3e85df60fb": "Utilizzo non valido (argomenti supplementari), `{0} di prova `-- aiuto.", + "6b394b7761ff45400e21c8cd2b9e232a": "Non unione di {{HEAD}} in `{0}, `già aggiornato.", "90d507cae0601242deeeea9b942544cb": "Albero di sorgente unito di `{0} `su `{1}", "9366282e11c151558bdfaab4a264aa1b": "Utilizzo", "99587c601164537b7250fe9cf50fac93": "Errore su `{0}: {1}", + "a2bc72e22e890be19e1660493472495e": "Utilizzo non valido (argomenti supplementari), `{{{0} di prova `-- aiuto.}}", "a8c20f23a35195c295680377789d40b4": "Basate prodotti già finora su `{0}", "af6d9e7420995e5c0abb08a42724d606": "Errore su `{0}:", + "b244d9c9891555b90e18d551c5d082ea": "Non può funzionare commettete su {{non-git}} indice di lavoro", "b25fa34ebd543c4e0c0669f94de5ddb8": "Non riuscito a eseguire `{0}:", "ca6d677489e241e5af729aa7162389d1": "Imballando applicazione in a {0}", "d3ff137cf1ef8d22f3952261f2275780": "Prodotti di costruzione impegnati su `{0}" diff --git a/intl/ja/messages.json b/intl/ja/messages.json index a3d31e0..d018bd0 100644 --- a/intl/ja/messages.json +++ b/intl/ja/messages.json @@ -1,16 +1,16 @@ { "030d811d2ab5819e6243c729824da0b6": "走ること`{0}`", + "1135cb7ad2114989954c26dc4e9bebad": "無効な使い方(近くの選択{0}’)、試み`{{{1}--助け}}`。", "1c481aa99d081c32182011a758f73d33": "{0}", "5c54f212be40a039151f4dcb56396070": "警告:その--束選択は、今何もしなくて、そして使われるべきではありません", - "64ba4d2a8837254d4f1a2ae704e17101": "無効な使い方(近くの選択{0}’)、試み`{1}--助け`。", - "69d65816d21750f56bef9b77e5870b02": "実行することができません非能なし作業ディレクトリで託して下さい", - "77d8095a8be6712bb04f5259ecfe0fa1": "頭を合併しないためへ`{0}`すでに現在まで上へ、", - "7d4844ab8096cfe8d67eee3e85df60fb": "無効な使い方(余分の議論)、試み`{0}--助け`。", + "6b394b7761ff45400e21c8cd2b9e232a": "合併しないこと{{HEAD}}へ`{0}`すでに現在まで上へ、", "90d507cae0601242deeeea9b942544cb": "ソース・ツリーを合併しました、`{0}`の上へ`{1}`", "9366282e11c151558bdfaab4a264aa1b": "使い方", "99587c601164537b7250fe9cf50fac93": "間違いで`{0}`: {1}", + "a2bc72e22e890be19e1660493472495e": "無効な使い方(余分の議論)、試み`{{{0}--助け}}`。", "a8c20f23a35195c295680377789d40b4": "現在まで上へ製品をすでに建てますで`{0}`", "af6d9e7420995e5c0abb08a42724d606": "間違いで`{0}`:", + "b244d9c9891555b90e18d551c5d082ea": "実行することができません託しますで{{non-git}}作業ディレクトリ", "b25fa34ebd543c4e0c0669f94de5ddb8": "走り損ねます`{0}`:", "ca6d677489e241e5af729aa7162389d1": "適用を詰め込みますでへの{0}", "d3ff137cf1ef8d22f3952261f2275780": "体格製品を託しましたの上へ`{0}`" diff --git a/intl/ko/messages.json b/intl/ko/messages.json index b83c12f..d1a7a7f 100644 --- a/intl/ko/messages.json +++ b/intl/ko/messages.json @@ -1,16 +1,16 @@ { "030d811d2ab5819e6243c729824da0b6": "{0}을 달리기", + "1135cb7ad2114989954c26dc4e9bebad": "효력이 없는 사용(가까운 옵션 '{0}' ),시도 {{{1}-도움.", "1c481aa99d081c32182011a758f73d33": "{0}", "5c54f212be40a039151f4dcb56396070": "경고: 지금 다발 옵션이 아무것도 하지 않았고 사용되지 말아야 한다.", - "64ba4d2a8837254d4f1a2ae704e17101": "효력이 없는 사용(가까운 옵션 '{0}' ),시도 {1}-도움.", - "69d65816d21750f56bef9b77e5870b02": "non git(위)에 작용하는 디렉토리를 범하여라 실행할 수 없다.", - "77d8095a8be6712bb04f5259ecfe0fa1": "머리를 이미 최신식인 {0}에 흡수되지 않기.", - "7d4844ab8096cfe8d67eee3e85df60fb": "효력이 없는 사용(가외의 논쟁),시도 {0}-도움.", + "6b394b7761ff45400e21c8cd2b9e232a": "{{HEAD}을 이미 최신식인 {0}에 흡수되지 않기.", "90d507cae0601242deeeea9b942544cb": "{0}의 {1} 위에 합병된 소스 나무", "9366282e11c151558bdfaab4a264aa1b": "사용", "99587c601164537b7250fe9cf50fac93": "{0}(위)에 오류: {1}", + "a2bc72e22e890be19e1660493472495e": "효력이 없는 사용(가외의 논쟁),시도 {{{0}-도움.", "a8c20f23a35195c295680377789d40b4": "이미 최신식인 제품을 {0}을 바탕으로 세워라", "af6d9e7420995e5c0abb08a42724d606": "{0}(위)에 오류:", + "b244d9c9891555b90e18d551c5d082ea": "{{non-git}(위)에 작용하는 디렉토리를 범하여라 실행할 수 없다.", "b25fa34ebd543c4e0c0669f94de5ddb8": "{0}을 달리지 못하였다:", "ca6d677489e241e5af729aa7162389d1": "안에 {0}에 대한 응용을 싸기", "d3ff137cf1ef8d22f3952261f2275780": "{0} 위에 헌신적인 체격 제품" diff --git a/intl/pt/messages.json b/intl/pt/messages.json index eb73395..e3bc671 100644 --- a/intl/pt/messages.json +++ b/intl/pt/messages.json @@ -1,16 +1,16 @@ { "030d811d2ab5819e6243c729824da0b6": "Executando ` {0} `", + "1135cb7ad2114989954c26dc4e9bebad": "", "1c481aa99d081c32182011a758f73d33": "{0}", "5c54f212be40a039151f4dcb56396070": "Aviso: o -- opção agora não configurável nada e não devem ser usados", - "64ba4d2a8837254d4f1a2ae704e17101": "Uso inválido (de opção '{0}'), tente ` {1} -- help \".", - "69d65816d21750f56bef9b77e5870b02": "Impossível executar confirmação no diretório de trabalho não vá", - "77d8095a8be6712bb04f5259ecfe0fa1": "Não mesclar HEAD para ` {0} `, já até a data.", - "7d4844ab8096cfe8d67eee3e85df60fb": "Uso inválido (de argumentos extras), tente ` {0} -- help \".", + "6b394b7761ff45400e21c8cd2b9e232a": "", "90d507cae0601242deeeea9b942544cb": "árvore de origem mesclada de ` {0} ` para ` {1} `", "9366282e11c151558bdfaab4a264aa1b": "Uso", "99587c601164537b7250fe9cf50fac93": "Erro no ` {0} `:\n {1}", + "a2bc72e22e890be19e1660493472495e": "", "a8c20f23a35195c295680377789d40b4": "Os produtos de construção já atualizado sobre ` {0} `", "af6d9e7420995e5c0abb08a42724d606": "Erro no ` {0} `:", + "b244d9c9891555b90e18d551c5d082ea": "", "b25fa34ebd543c4e0c0669f94de5ddb8": "Falha ao executar ` {0} `:", "ca6d677489e241e5af729aa7162389d1": "Empacotando aplicativo em {0}", "d3ff137cf1ef8d22f3952261f2275780": "Os produtos de construção Confirmada para ` {0} `" diff --git a/intl/zh-Hans/messages.json b/intl/zh-Hans/messages.json index aa6083b..ef50f3d 100644 --- a/intl/zh-Hans/messages.json +++ b/intl/zh-Hans/messages.json @@ -1,16 +1,16 @@ { "030d811d2ab5819e6243c729824da0b6": "运作`{0}`", + "1135cb7ad2114989954c26dc4e9bebad": "无效使用(离近选择余地‘{0})’,尝试`{{{1}--对有帮助`。", "1c481aa99d081c32182011a758f73d33": "{0}", "5c54f212be40a039151f4dcb56396070": "警告:现在捆选择余地做无足轻重和是将不被使用", - "64ba4d2a8837254d4f1a2ae704e17101": "无效使用(离近选择余地‘{0})’,尝试`{1}--对有帮助`。", - "69d65816d21750f56bef9b77e5870b02": "不能表演在反对票无用的人上犯使工作目录", - "77d8095a8be6712bb04f5259ecfe0fa1": "不要合并 HEAD 成为已经现代化`{0}`。", - "7d4844ab8096cfe8d67eee3e85df60fb": "无效使用(额外和争辩),尝试`{0}--对有帮助`。", + "6b394b7761ff45400e21c8cd2b9e232a": "不要合并{{HEAD}成为已经现代化`{0}`。", "90d507cae0601242deeeea9b942544cb": "`{0}`的到`{1}`上面的合并成为来源树", "9366282e11c151558bdfaab4a264aa1b": "使用", "99587c601164537b7250fe9cf50fac93": "在`{0}`上的在中的错误:{1}", + "a2bc72e22e890be19e1660493472495e": "无效使用(额外和争辩),尝试`{{{0}--对有帮助`。", "a8c20f23a35195c295680377789d40b4": "在`{0}`的基础上建立已经现代化产品", "af6d9e7420995e5c0abb08a42724d606": "在`{0}`上的在中的错误:", + "b244d9c9891555b90e18d551c5d082ea": "不能表演在{{non-git}上犯使工作目录", "b25fa34ebd543c4e0c0669f94de5ddb8": "未能运作`{0}`:", "ca6d677489e241e5af729aa7162389d1": "包装在中适用于{0}", "d3ff137cf1ef8d22f3952261f2275780": "到`{0}`上面的受托付的外型产品" diff --git a/intl/zh-Hant/messages.json b/intl/zh-Hant/messages.json index 7e74347..6bb7783 100644 --- a/intl/zh-Hant/messages.json +++ b/intl/zh-Hant/messages.json @@ -1,16 +1,16 @@ { "030d811d2ab5819e6243c729824da0b6": "運作`{0}`", + "1135cb7ad2114989954c26dc4e9bebad": "無效使用(離近選擇餘地‘{0})」,嘗試`{{{1}--對有幫助`。", "1c481aa99d081c32182011a758f73d33": "{0}", "5c54f212be40a039151f4dcb56396070": "警告:現在捆選擇餘地做無足輕重和是將不被使用", - "64ba4d2a8837254d4f1a2ae704e17101": "無效使用(離近選擇餘地‘{0})」,嘗試`{1}--對有幫助`。", - "69d65816d21750f56bef9b77e5870b02": "不能表演在反對票無用的人上犯使工作目錄", - "77d8095a8be6712bb04f5259ecfe0fa1": "不要合併 HEAD 成為已經現代化`{0}`。", - "7d4844ab8096cfe8d67eee3e85df60fb": "無效使用(額外和爭辯),嘗試`{0}--對有幫助`。", + "6b394b7761ff45400e21c8cd2b9e232a": "不要合併{{HEAD}成為已經現代化`{0}`。", "90d507cae0601242deeeea9b942544cb": "`{0}`的到`{1}`上面的合併成為來源樹", "9366282e11c151558bdfaab4a264aa1b": "使用", "99587c601164537b7250fe9cf50fac93": "在`{0}`上的在中的錯誤:{1}", + "a2bc72e22e890be19e1660493472495e": "無效使用(額外和爭辯),嘗試`{{{0}--對有幫助`。", "a8c20f23a35195c295680377789d40b4": "在`{0}`的基礎上建立已經現代化產品", "af6d9e7420995e5c0abb08a42724d606": "在`{0}`上的在中的錯誤:", + "b244d9c9891555b90e18d551c5d082ea": "不能表演在{{non-git}上犯使工作目錄", "b25fa34ebd543c4e0c0669f94de5ddb8": "未能運作`{0}`:", "ca6d677489e241e5af729aa7162389d1": "包裝在中適用於{0}", "d3ff137cf1ef8d22f3952261f2275780": "到`{0}`上面的受託付的外型產品" From da2c2b1847379521704d74dfd5d67d2f46167999 Mon Sep 17 00:00:00 2001 From: Tetsuo Seto Date: Fri, 22 Jan 2016 12:57:45 -0800 Subject: [PATCH 3/6] Remove non-En directories under intl --- .gitignore | 10 ++++++++++ intl/de/messages.json | 17 ----------------- intl/de/sl-build.txt | 1 - intl/es/messages.json | 17 ----------------- intl/es/sl-build.txt | 0 intl/fr/messages.json | 17 ----------------- intl/fr/sl-build.txt | 0 intl/it/messages.json | 17 ----------------- intl/it/sl-build.txt | 1 - intl/ja/messages.json | 17 ----------------- intl/ja/sl-build.txt | 1 - intl/ko/messages.json | 17 ----------------- intl/ko/sl-build.txt | 1 - intl/pt/messages.json | 17 ----------------- intl/pt/sl-build.txt | 0 intl/zh-Hans/messages.json | 17 ----------------- intl/zh-Hans/sl-build.txt | 1 - intl/zh-Hant/messages.json | 17 ----------------- intl/zh-Hant/sl-build.txt | 1 - 19 files changed, 10 insertions(+), 159 deletions(-) delete mode 100644 intl/de/messages.json delete mode 100644 intl/de/sl-build.txt delete mode 100644 intl/es/messages.json delete mode 100644 intl/es/sl-build.txt delete mode 100644 intl/fr/messages.json delete mode 100644 intl/fr/sl-build.txt delete mode 100644 intl/it/messages.json delete mode 100644 intl/it/sl-build.txt delete mode 100644 intl/ja/messages.json delete mode 100644 intl/ja/sl-build.txt delete mode 100644 intl/ko/messages.json delete mode 100644 intl/ko/sl-build.txt delete mode 100644 intl/pt/messages.json delete mode 100644 intl/pt/sl-build.txt delete mode 100644 intl/zh-Hans/messages.json delete mode 100644 intl/zh-Hans/sl-build.txt delete mode 100644 intl/zh-Hant/messages.json delete mode 100644 intl/zh-Hant/sl-build.txt diff --git a/.gitignore b/.gitignore index 6fa456e..6ff42ff 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,13 @@ loopback-example-app*.tgz _suite _onto intl/MSG.json +intl/de +intl/es +intl/fr +intl/it +intl/ja +intl/ko +intl/pt +intl/ru +intl/zh-Hans +intl/zh-Hant diff --git a/intl/de/messages.json b/intl/de/messages.json deleted file mode 100644 index 663df87..0000000 --- a/intl/de/messages.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "030d811d2ab5819e6243c729824da0b6": "`{0} laufen lassen", - "1135cb7ad2114989954c26dc4e9bebad": "Ungültiger Gebrauch (nahe Option '{0}'), Versuchs `{{{1} -- Hilfe.}}", - "1c481aa99d081c32182011a758f73d33": "{0}", - "5c54f212be40a039151f4dcb56396070": "Warnung: Der -- Bündeloption jetzt tut nichts und sollte nicht verwendet werden", - "6b394b7761ff45400e21c8cd2b9e232a": "{{HEAD} nicht} in `{0}, `schon aktuell, einfließen lassen.}", - "90d507cae0601242deeeea9b942544cb": "Vereinter Quellbaum `von {0} `auf `{1}", - "9366282e11c151558bdfaab4a264aa1b": "Gebrauch", - "99587c601164537b7250fe9cf50fac93": "Fehler auf `{0}: {1}", - "a2bc72e22e890be19e1660493472495e": "Ungültiger Gebrauch (zusätzliche Argumente), Versuchs `{{{0} -- Hilfe.}}", - "a8c20f23a35195c295680377789d40b4": "Bauen Sie Produkte auf `{0} schon aktuell", - "af6d9e7420995e5c0abb08a42724d606": "Fehler auf `{0}:", - "b244d9c9891555b90e18d551c5d082ea": "Kann nicht arbeiten begehen Sie auf {{non-git}} aktives Verzeichnis", - "b25fa34ebd543c4e0c0669f94de5ddb8": "`{0} Nicht laufen gelassen:", - "ca6d677489e241e5af729aa7162389d1": "Bewerbung in bei {0} packen", - "d3ff137cf1ef8d22f3952261f2275780": "Entschlossene Körperbauprodukte auf `{0}" -} diff --git a/intl/de/sl-build.txt b/intl/de/sl-build.txt deleted file mode 100644 index 0ebf90a..0000000 --- a/intl/de/sl-build.txt +++ /dev/null @@ -1 +0,0 @@ -Gebrauch: {{%MAIN%}} [Optionen] baut ein Knotenbewerbungspaket.Mit keinen Optionen hängt die Standardeinstellung darauf ab, ob ein git Lager entdeckt wird, oder nicht.Wenn ein {{git}} Lager entdeckt wird,} ist die Standardeinstellung `{{--git}:} Installieren Sie und setzen Sie die Körperbauergebnisse für den \"{{deploy}}\" Zweig ein}, der geschaffen wird, wenn es nicht schon existiert.Wenn kein {{git}} Lager entdeckt wird,} ist die Standardeinstellung `{{--npm}:} Installieren Sie und packen Sie die Körperbauergebnisse in eine `{{-.tgz}} `Akte.Optionen: {{-h,--help}} druckt diese Nachricht und verlässt. {{-v,--version}} Druckversion und -ausgang. {{-n,--npm}} gleich als `{{--install --pack}.} {{-g,--git}} gleich als `{{--install --commit}.} {{-i,--install}} installiert Abhängigkeiten (ohne Schriften, standardmäßig.) {{-s,--scripts}}, wenn installieren,} Durchlaufschriften (Zusätze zu bauen.) {{-p,--pack}} Packung in ein herausgebbares Archiv.Git bestimmte Optionen: {{-c,--commit}} begeht Körperbauausgabe (Zweig, der von {{--onto} angegeben wurde.}) {{--onto BRANCH}} Zweig, Körperbauergebnisse für einzusetzen, der geschaffen wurde, falls notwendig, (\"{{deploy}}\" standardmäßig.) diff --git a/intl/es/messages.json b/intl/es/messages.json deleted file mode 100644 index f5ed1cc..0000000 --- a/intl/es/messages.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "030d811d2ab5819e6243c729824da0b6": "Ejecución de ` {0} `", - "1135cb7ad2114989954c26dc4e9bebad": "", - "1c481aa99d081c32182011a758f73d33": "{0}", - "5c54f212be40a039151f4dcb56396070": "Aviso: -- opción de paquete no ahora y no debería utilizarse", - "6b394b7761ff45400e21c8cd2b9e232a": "", - "90d507cae0601242deeeea9b942544cb": "árbol de origen fusionado de ` {0} ` a ` {1} `", - "9366282e11c151558bdfaab4a264aa1b": "Uso", - "99587c601164537b7250fe9cf50fac93": "Error en ` {0} `:\n {1}", - "a2bc72e22e890be19e1660493472495e": "", - "a8c20f23a35195c295680377789d40b4": "Construir productos ya hasta la fecha sobre ` {0} `", - "af6d9e7420995e5c0abb08a42724d606": "Error en ` {0} `:", - "b244d9c9891555b90e18d551c5d082ea": "", - "b25fa34ebd543c4e0c0669f94de5ddb8": "No se ha podido ejecutar ` {0} `:", - "ca6d677489e241e5af729aa7162389d1": "Con la aplicación en {0}", - "d3ff137cf1ef8d22f3952261f2275780": "Los productos de construcción cometidas en ` {0} `" -} diff --git a/intl/es/sl-build.txt b/intl/es/sl-build.txt deleted file mode 100644 index e69de29..0000000 diff --git a/intl/fr/messages.json b/intl/fr/messages.json deleted file mode 100644 index 4e31e82..0000000 --- a/intl/fr/messages.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "030d811d2ab5819e6243c729824da0b6": "Exécution ` {0} `", - "1135cb7ad2114989954c26dc4e9bebad": "", - "1c481aa99d081c32182011a758f73d33": "{0}", - "5c54f212be40a039151f4dcb56396070": "Avertissement: l'option -- regroupement maintenant ne fait rien et ne doit pas être utilisé", - "6b394b7761ff45400e21c8cd2b9e232a": "", - "90d507cae0601242deeeea9b942544cb": "Arbre source fusionné de ` {0} ` sur ` {1} `", - "9366282e11c151558bdfaab4a264aa1b": "Utilisation", - "99587c601164537b7250fe9cf50fac93": "Erreur sur ` {0} `:\n {1}", - "a2bc72e22e890be19e1660493472495e": "", - "a8c20f23a35195c295680377789d40b4": "Les produits de construction déjà à jour sur ` {0} `", - "af6d9e7420995e5c0abb08a42724d606": "Erreur sur ` {0} `:", - "b244d9c9891555b90e18d551c5d082ea": "", - "b25fa34ebd543c4e0c0669f94de5ddb8": "Echec de l'exécution ` {0} `:", - "ca6d677489e241e5af729aa7162389d1": "Application d'emballage à {0}", - "d3ff137cf1ef8d22f3952261f2275780": "Les produits de construction commis sur ` {0} `" -} diff --git a/intl/fr/sl-build.txt b/intl/fr/sl-build.txt deleted file mode 100644 index e69de29..0000000 diff --git a/intl/it/messages.json b/intl/it/messages.json deleted file mode 100644 index e41155f..0000000 --- a/intl/it/messages.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "030d811d2ab5819e6243c729824da0b6": "`Il corrente `{0}", - "1135cb7ad2114989954c26dc4e9bebad": "Utilizzo non valido (opzione vicina '{0}'), `{{{1} di prova `-- aiuto.}}", - "1c481aa99d081c32182011a758f73d33": "{0}", - "5c54f212be40a039151f4dcb56396070": "Avvertimento: Lo -- l'opzione di fascio ora non fa niente e non dovrebbe essere utilizzata", - "6b394b7761ff45400e21c8cd2b9e232a": "Non unione di {{HEAD}} in `{0}, `già aggiornato.", - "90d507cae0601242deeeea9b942544cb": "Albero di sorgente unito di `{0} `su `{1}", - "9366282e11c151558bdfaab4a264aa1b": "Utilizzo", - "99587c601164537b7250fe9cf50fac93": "Errore su `{0}: {1}", - "a2bc72e22e890be19e1660493472495e": "Utilizzo non valido (argomenti supplementari), `{{{0} di prova `-- aiuto.}}", - "a8c20f23a35195c295680377789d40b4": "Basate prodotti già finora su `{0}", - "af6d9e7420995e5c0abb08a42724d606": "Errore su `{0}:", - "b244d9c9891555b90e18d551c5d082ea": "Non può funzionare commettete su {{non-git}} indice di lavoro", - "b25fa34ebd543c4e0c0669f94de5ddb8": "Non riuscito a eseguire `{0}:", - "ca6d677489e241e5af729aa7162389d1": "Imballando applicazione in a {0}", - "d3ff137cf1ef8d22f3952261f2275780": "Prodotti di costruzione impegnati su `{0}" -} diff --git a/intl/it/sl-build.txt b/intl/it/sl-build.txt deleted file mode 100644 index 4034097..0000000 --- a/intl/it/sl-build.txt +++ /dev/null @@ -1 +0,0 @@ -Utilizzo: {{%MAIN%}} [le opzioni] Costruisce un pacchetto applicativo di nodo.Con nessuna opzione, il default dipende su se un deposito git è rilevato o no.Se un} deposito {{git}} è rilevato il default è `{{--git}:} Installate e affidate i risultati di costruzione al} ramo \"{{deploy}}\", che sarà creato se non già esiste.Se nessun} deposito {{git}} è rilevato il default è `{{--npm}:} Installate e imballate i risultati di costruzione in un} ``archivio {{-.tgz}.}Opzioni: {{-h,--help}} Stampa questo messaggio e esce. Versione di Stampa e uscita {{-v,--version}.} {{-n,--npm}} Stesso come `{{--install --pack}.} {{-g,--git}} Stesso come `{{--install --commit}.} {{-i,--install}} Installa dipendenze (senza testi, per default.) {{-s,--scripts}} Se installare,} testi di corsa per (costruire addons.) Pacco {{-p,--pack}} in un archivio publishable.Opzioni specifiche Git: {{-c,--commit}} Commette prodotto di costruzione (ramo specificato da {{--onto}.}) Ramo {{--onto BRANCH}} Per affidare risultati di costruzione a, creato se necessario (\"{{deploy},}\" per default.) diff --git a/intl/ja/messages.json b/intl/ja/messages.json deleted file mode 100644 index d018bd0..0000000 --- a/intl/ja/messages.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "030d811d2ab5819e6243c729824da0b6": "走ること`{0}`", - "1135cb7ad2114989954c26dc4e9bebad": "無効な使い方(近くの選択{0}’)、試み`{{{1}--助け}}`。", - "1c481aa99d081c32182011a758f73d33": "{0}", - "5c54f212be40a039151f4dcb56396070": "警告:その--束選択は、今何もしなくて、そして使われるべきではありません", - "6b394b7761ff45400e21c8cd2b9e232a": "合併しないこと{{HEAD}}へ`{0}`すでに現在まで上へ、", - "90d507cae0601242deeeea9b942544cb": "ソース・ツリーを合併しました、`{0}`の上へ`{1}`", - "9366282e11c151558bdfaab4a264aa1b": "使い方", - "99587c601164537b7250fe9cf50fac93": "間違いで`{0}`: {1}", - "a2bc72e22e890be19e1660493472495e": "無効な使い方(余分の議論)、試み`{{{0}--助け}}`。", - "a8c20f23a35195c295680377789d40b4": "現在まで上へ製品をすでに建てますで`{0}`", - "af6d9e7420995e5c0abb08a42724d606": "間違いで`{0}`:", - "b244d9c9891555b90e18d551c5d082ea": "実行することができません託しますで{{non-git}}作業ディレクトリ", - "b25fa34ebd543c4e0c0669f94de5ddb8": "走り損ねます`{0}`:", - "ca6d677489e241e5af729aa7162389d1": "適用を詰め込みますでへの{0}", - "d3ff137cf1ef8d22f3952261f2275780": "体格製品を託しましたの上へ`{0}`" -} diff --git a/intl/ja/sl-build.txt b/intl/ja/sl-build.txt deleted file mode 100644 index be54658..0000000 --- a/intl/ja/sl-build.txt +++ /dev/null @@ -1 +0,0 @@ -使い方:{{%MAIN%}}[選択]節適用包みを建てて下さい。選択なしで、デフォルトは、能なし倉庫が見つけられるかどうかによります。ときにはひとつの{{git}}倉庫が見つけられますデフォルトはあります`{{--git}}`:取り付けてそして体格がそこに起因することを託しますその\"{{deploy}}「もしそれがまだ存在しなければ作られるだろう枝。もしノーならば{{git}}倉庫が見つけられますデフォルトはあります`{{--npm}}`:体格結果を取り付けて詰め込みますへひとつの`{{-.tgz}}`ファイル。選択:{{-h,--help}} この伝言と出口を出版して下さい。{{-v,--version}} バージョンと出口を印刷して下さい。{{-n,--npm}} 同じので`{{--install --pack}}`。{{-g,--git}} 同じので`{{--install --commit}}`。{{-i,--install}} 属国(台本なしで、デフォルトまでに)を取り付けて下さい。{{-s,--scripts}} 取り付けていれば、台本(addonsを建てるために)を走らせて下さい。{{-p,--pack}} 公表価値があるアーカイブにぎっしりと詰まって下さい。能なし詳細選択:{{-c,--commit}} 体格産出を託して下さい(枝が指定しましたによって{{--onto}})。{{--onto BRANCH}} 必要なら、体格を託す枝は、そこに起因して、創造的なことをしました(」{{deploy}}\"、デフォルトまでに)。 diff --git a/intl/ko/messages.json b/intl/ko/messages.json deleted file mode 100644 index d1a7a7f..0000000 --- a/intl/ko/messages.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "030d811d2ab5819e6243c729824da0b6": "{0}을 달리기", - "1135cb7ad2114989954c26dc4e9bebad": "효력이 없는 사용(가까운 옵션 '{0}' ),시도 {{{1}-도움.", - "1c481aa99d081c32182011a758f73d33": "{0}", - "5c54f212be40a039151f4dcb56396070": "경고: 지금 다발 옵션이 아무것도 하지 않았고 사용되지 말아야 한다.", - "6b394b7761ff45400e21c8cd2b9e232a": "{{HEAD}을 이미 최신식인 {0}에 흡수되지 않기.", - "90d507cae0601242deeeea9b942544cb": "{0}의 {1} 위에 합병된 소스 나무", - "9366282e11c151558bdfaab4a264aa1b": "사용", - "99587c601164537b7250fe9cf50fac93": "{0}(위)에 오류: {1}", - "a2bc72e22e890be19e1660493472495e": "효력이 없는 사용(가외의 논쟁),시도 {{{0}-도움.", - "a8c20f23a35195c295680377789d40b4": "이미 최신식인 제품을 {0}을 바탕으로 세워라", - "af6d9e7420995e5c0abb08a42724d606": "{0}(위)에 오류:", - "b244d9c9891555b90e18d551c5d082ea": "{{non-git}(위)에 작용하는 디렉토리를 범하여라 실행할 수 없다.", - "b25fa34ebd543c4e0c0669f94de5ddb8": "{0}을 달리지 못하였다:", - "ca6d677489e241e5af729aa7162389d1": "안에 {0}에 대한 응용을 싸기", - "d3ff137cf1ef8d22f3952261f2275780": "{0} 위에 헌신적인 체격 제품" -} diff --git a/intl/ko/sl-build.txt b/intl/ko/sl-build.txt deleted file mode 100644 index 0fe5e4e..0000000 --- a/intl/ko/sl-build.txt +++ /dev/null @@ -1 +0,0 @@ -사용: {{%MAIN%}[옵션] 노드 응용 패키지를 세워라. 옵션 없이 git 저장고를 탐지하는지에 대해,채무 불이행은 의존하지 않는다. {{git} 저장고를 탐지한다면 채무 불이행은 {{--git}이다: 그것이 이미 존재하지 않는다면 만들어 지는 \"{{deploy}\" 브랜치를 설치하고 체격 결과를 맡기어라. 어떤 {{git} 저장고도 탐지하지 않는다면 채무 불이행은 {{--npm}이다: {{-.tgz} 파일로 체격 결과를 설치하고 싸라. 옵션: {{-h,--help}이 이 메시지를 인쇄하고 퇴장한다. {{-v,--version} 프린트 버전과 출구. {{--install --pack}으로서 {{-n,--npm} 같은. {{--install --commit}으로서 {{-g,--git} 같은. 채무 불이행 옆의 스크립트 없는 {{-i,--install} 설치 의존 상태. 설치한다면 {{-s,--scripts},addons을 세울 런 스크립트. 출판된 공문서로 {{-p,--pack} 팩. 특정한 Git 옵션: {{-c,--commit}은 체격 아웃풋({{--onto}에 의하여 명시해 진 브랜치)을 범한다. {{--onto BRANCH} 체격 결과 를 맡길 필요하다면 만들어 진 브랜치 \"(\" 채무 불이행 옆의\" \"{{deploy})\" . diff --git a/intl/pt/messages.json b/intl/pt/messages.json deleted file mode 100644 index e3bc671..0000000 --- a/intl/pt/messages.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "030d811d2ab5819e6243c729824da0b6": "Executando ` {0} `", - "1135cb7ad2114989954c26dc4e9bebad": "", - "1c481aa99d081c32182011a758f73d33": "{0}", - "5c54f212be40a039151f4dcb56396070": "Aviso: o -- opção agora não configurável nada e não devem ser usados", - "6b394b7761ff45400e21c8cd2b9e232a": "", - "90d507cae0601242deeeea9b942544cb": "árvore de origem mesclada de ` {0} ` para ` {1} `", - "9366282e11c151558bdfaab4a264aa1b": "Uso", - "99587c601164537b7250fe9cf50fac93": "Erro no ` {0} `:\n {1}", - "a2bc72e22e890be19e1660493472495e": "", - "a8c20f23a35195c295680377789d40b4": "Os produtos de construção já atualizado sobre ` {0} `", - "af6d9e7420995e5c0abb08a42724d606": "Erro no ` {0} `:", - "b244d9c9891555b90e18d551c5d082ea": "", - "b25fa34ebd543c4e0c0669f94de5ddb8": "Falha ao executar ` {0} `:", - "ca6d677489e241e5af729aa7162389d1": "Empacotando aplicativo em {0}", - "d3ff137cf1ef8d22f3952261f2275780": "Os produtos de construção Confirmada para ` {0} `" -} diff --git a/intl/pt/sl-build.txt b/intl/pt/sl-build.txt deleted file mode 100644 index e69de29..0000000 diff --git a/intl/zh-Hans/messages.json b/intl/zh-Hans/messages.json deleted file mode 100644 index ef50f3d..0000000 --- a/intl/zh-Hans/messages.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "030d811d2ab5819e6243c729824da0b6": "运作`{0}`", - "1135cb7ad2114989954c26dc4e9bebad": "无效使用(离近选择余地‘{0})’,尝试`{{{1}--对有帮助`。", - "1c481aa99d081c32182011a758f73d33": "{0}", - "5c54f212be40a039151f4dcb56396070": "警告:现在捆选择余地做无足轻重和是将不被使用", - "6b394b7761ff45400e21c8cd2b9e232a": "不要合并{{HEAD}成为已经现代化`{0}`。", - "90d507cae0601242deeeea9b942544cb": "`{0}`的到`{1}`上面的合并成为来源树", - "9366282e11c151558bdfaab4a264aa1b": "使用", - "99587c601164537b7250fe9cf50fac93": "在`{0}`上的在中的错误:{1}", - "a2bc72e22e890be19e1660493472495e": "无效使用(额外和争辩),尝试`{{{0}--对有帮助`。", - "a8c20f23a35195c295680377789d40b4": "在`{0}`的基础上建立已经现代化产品", - "af6d9e7420995e5c0abb08a42724d606": "在`{0}`上的在中的错误:", - "b244d9c9891555b90e18d551c5d082ea": "不能表演在{{non-git}上犯使工作目录", - "b25fa34ebd543c4e0c0669f94de5ddb8": "未能运作`{0}`:", - "ca6d677489e241e5af729aa7162389d1": "包装在中适用于{0}", - "d3ff137cf1ef8d22f3952261f2275780": "到`{0}`上面的受托付的外型产品" -} diff --git a/intl/zh-Hans/sl-build.txt b/intl/zh-Hans/sl-build.txt deleted file mode 100644 index 9dedb72..0000000 --- a/intl/zh-Hans/sl-build.txt +++ /dev/null @@ -1 +0,0 @@ -使用:{{%MAIN%}[选择余地〕在的基础上建立一个节应用包裹。没有选择余地,未履行在是否一无用的人仓库被察觉上视情况而定。如果一{{git}仓库被察觉,未履行是`{{--git}`:安装和把外型结果交付给将被建立,如果它不确实已经存在的“{{deploy}”分枝。如果没有{{git}仓库被察觉,未履行是`{{--npm}`:安装和把塞进一`{{-.tgz}`关于的文件外型结果。选择余地: {{-h,--help}以加印这信息和从出去。{{-v,--version}印刷版本 和出口。{{-n,--npm}和`{{--install --pack}`同样的。{{-g,--git}和 `{{--install --commit}`同样的。没有按缺省的字体的{{-i,--install}安装 附属国。如果安装的{{-s,--scripts},在的基础上建立附带 加上去的东西的跑步字体。变为一可出版的档案文 件的{{-p,--pack}包。Git 所特有选择余地: {{-c,--commit}犯外型从输出到(经过{{--onto})指定分枝作为的。{{--onto BRANCH}向前犯外型结果的建立,如果 必然的分枝(按缺省的{{deploy}。 diff --git a/intl/zh-Hant/messages.json b/intl/zh-Hant/messages.json deleted file mode 100644 index 6bb7783..0000000 --- a/intl/zh-Hant/messages.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "030d811d2ab5819e6243c729824da0b6": "運作`{0}`", - "1135cb7ad2114989954c26dc4e9bebad": "無效使用(離近選擇餘地‘{0})」,嘗試`{{{1}--對有幫助`。", - "1c481aa99d081c32182011a758f73d33": "{0}", - "5c54f212be40a039151f4dcb56396070": "警告:現在捆選擇餘地做無足輕重和是將不被使用", - "6b394b7761ff45400e21c8cd2b9e232a": "不要合併{{HEAD}成為已經現代化`{0}`。", - "90d507cae0601242deeeea9b942544cb": "`{0}`的到`{1}`上面的合併成為來源樹", - "9366282e11c151558bdfaab4a264aa1b": "使用", - "99587c601164537b7250fe9cf50fac93": "在`{0}`上的在中的錯誤:{1}", - "a2bc72e22e890be19e1660493472495e": "無效使用(額外和爭辯),嘗試`{{{0}--對有幫助`。", - "a8c20f23a35195c295680377789d40b4": "在`{0}`的基礎上建立已經現代化產品", - "af6d9e7420995e5c0abb08a42724d606": "在`{0}`上的在中的錯誤:", - "b244d9c9891555b90e18d551c5d082ea": "不能表演在{{non-git}上犯使工作目錄", - "b25fa34ebd543c4e0c0669f94de5ddb8": "未能運作`{0}`:", - "ca6d677489e241e5af729aa7162389d1": "包裝在中適用於{0}", - "d3ff137cf1ef8d22f3952261f2275780": "到`{0}`上面的受託付的外型產品" -} diff --git a/intl/zh-Hant/sl-build.txt b/intl/zh-Hant/sl-build.txt deleted file mode 100644 index c49b341..0000000 --- a/intl/zh-Hant/sl-build.txt +++ /dev/null @@ -1 +0,0 @@ -使用:{{%MAIN%}[選擇餘地〕在的基礎上建立一個節應用包裹。沒有選擇餘地,未履行在是否一無用的人倉庫是察覺上視情況而定。如果一{{git}倉庫被察覺,未履行是`{{--git}`:安裝和把外型結果交付給將被建立,如果它不確實已經存在的“{{deploy}』分枝。如果沒有{{git}倉庫被察覺,未履行是`{{--npm}`:安裝和把塞進一`{{-.tgz}`關於的檔案外型結果。選擇餘地: {{-h,--help}以加印這訊息和從出去。{{-v,--version}印刷版本 和出口。{{-n,--npm}和`{{--install --pack}`同樣的。{{-g,--git}和 `{{--install --commit}`同樣的。沒有按預設的字體的{{-i,--install}安裝 附屬國。如果安裝的{{-s,--scripts},在的基礎上建立附帶 加上去的東西的跑步字體。變為一可出版的檔案的 {{-p,--pack}包。Git 所特有選擇餘地: {{-c,--commit}犯外型從輸出到(在{{--onto})旁邊指定分枝作為的。{{--onto BRANCH}向前犯外型結果的建立,如 果必然的分枝(按預設的{{deploy}。 From 1241430762cc98b08800f5fe924f11c034ad9d9e Mon Sep 17 00:00:00 2001 From: Tetsuo Seto Date: Sun, 24 Jan 2016 16:03:58 -0800 Subject: [PATCH 4/6] Add clrd-data as dependency --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index b8cb61e..3ea2ba0 100644 --- a/package.json +++ b/package.json @@ -29,6 +29,7 @@ "sl-build": "./bin/sl-build.js" }, "dependencies": { + "cldr-data": "^28.0.3", "debug": "^2.0.0", "lodash": "^3.8.0", "posix-getopt": "^1.0.0", From 16e6e0352bc2394779b90ea5dcd75752350a8211 Mon Sep 17 00:00:00 2001 From: Tetsuo Seto Date: Sun, 24 Jan 2016 20:34:50 -0800 Subject: [PATCH 5/6] Fix up - node_modules is created with node v5 - globalize git.js --- intl/en/messages.json | 10 +++++++++- lib/git.js | 16 ++++++++-------- test/build-example.js | 1 + test/test-build-install-nodeps.js | 6 +++++- 4 files changed, 23 insertions(+), 10 deletions(-) diff --git a/intl/en/messages.json b/intl/en/messages.json index c76abbb..96ddd53 100644 --- a/intl/en/messages.json +++ b/intl/en/messages.json @@ -13,5 +13,13 @@ "ca6d677489e241e5af729aa7162389d1": "Packing application in to {0}", "d3ff137cf1ef8d22f3952261f2275780": "Committed build products onto `{0}`", "a8c20f23a35195c295680377789d40b4": "Build products already up to date on `{0}`", - "99587c601164537b7250fe9cf50fac93": "Error on `{0}`:\n {1}" + "99587c601164537b7250fe9cf50fac93": "Error on `{0}`:\n {1}", + "1799e4e01c2fb3a088b19cfeb01eb2e1": "Failed to create branch \"{0}\"", + "7806fbe11cf7c1e9aad101f86bd20464": "Failed to parse branch `HEAD`, is this a git repository?", + "b8e0d3bbf3ba083e84b9e13231b40bc6": "Failed to commit `{0}` onto `{1}`", + "e8b2fb5beafaba433e270e4b31536907": "Failed to merge `{0}` onto `{1}`", + "0ad1a7faf2d75966b82d53fa818be4e6": "Failed to add build products", + "48b64f73122685bbbadefbc32ebfa2b3": "Failed to stage build products for commit", + "be16430c695022e715484af2ce2a667e": "Failed to create build products commit for `{0}`", + "03a3f207674407bfc212889a4aac83c8": "Failed to commit build products to `{0}`" } diff --git a/lib/git.js b/lib/git.js index 6f95b07..d9e427a 100644 --- a/lib/git.js +++ b/lib/git.js @@ -82,7 +82,7 @@ exports.ensureBranch = function ensureBranch(name) { if (!info.ref) execSync( fmt('git branch "%s"', name), - fmt('Failed to create branch "%s"', name) + g.t('Failed to create branch "%s"', name) ); }; @@ -103,7 +103,7 @@ exports.syncBranch = function gitSyncBranch(gitDstBranch) { var gitSrcTreeSha = execSync( 'git log -1 --pretty=format:"%t" HEAD', - 'Failed to parse branch `HEAD`, is this a git repository?' + g.t('Failed to parse branch `HEAD`, is this a git repository?') ); // Commit the source tree to the head of the destination branch, and update @@ -112,12 +112,12 @@ exports.syncBranch = function gitSyncBranch(gitDstBranch) { var commitSha = execSync( fmt('git commit-tree -p "%s" -p "%s" -m "%s" %s', dst.ref, src.ref, message, gitSrcTreeSha), - fmt('Failed to commit `%s` onto `%s`', src.ref, gitDstBranch) + g.t('Failed to commit `%s` onto `%s`', src.ref, gitDstBranch) ); execSync( fmt('git update-ref "%s" %s', dst.ref, commitSha), - fmt('Failed to merge `%s` onto `%s`', src.ref, gitDstBranch) + g.t('Failed to merge `%s` onto `%s`', src.ref, gitDstBranch) ); return { @@ -131,17 +131,17 @@ exports.syncBranch = function gitSyncBranch(gitDstBranch) { exports.commitAll = function gitCommitAll(gitDstBranch) { execSync( fmt('git add --force --all .'), - fmt('Failed to add build products') + g.t('Failed to add build products') ); var treeSha = execSync( fmt('git write-tree'), - fmt('Failed to stage build products for commit') + g.t('Failed to stage build products for commit') ); var dst = resolveBranch(gitDstBranch); var commitSha = execSync( fmt('git commit-tree -p "%s" -m "Commit build products" %s', dst.ref, treeSha), - fmt('Failed to create build products commit for `%s`', gitDstBranch), + g.t('Failed to create build products commit for `%s`', gitDstBranch), true ); @@ -152,7 +152,7 @@ exports.commitAll = function gitCommitAll(gitDstBranch) { execSync( fmt('git update-ref "%s" %s', dst.ref, commitSha), - fmt('Failed to commit build products to `%s`', gitDstBranch) + g.t('Failed to commit build products to `%s`', gitDstBranch) ); return { diff --git a/test/build-example.js b/test/build-example.js index fc0bc00..b401709 100644 --- a/test/build-example.js +++ b/test/build-example.js @@ -38,6 +38,7 @@ module.exports = function buildExample(fixture, args, callback) { } }); + sh.cd(__dirname); sh.rm('-rf', '_suite'); sh.cp('-Rf', fmt('fixtures/%s/*', fixture), '_suite'); sh.cd('_suite'); diff --git a/test/test-build-install-nodeps.js b/test/test-build-install-nodeps.js index d226958..0a84713 100644 --- a/test/test-build-install-nodeps.js +++ b/test/test-build-install-nodeps.js @@ -5,5 +5,9 @@ var test = require('shelljs').test; require('./build-example')('zero-dependency', ['-i'], function(er) { debug('built with error?', er); assert.ifError(er); - assert(!test('-d', 'node_modules'), 'no node_modules created'); + if (process.versions.node.split('.')[0] === '5') { + assert(test('-d', 'node_modules'), 'node_modules created'); + } else { + assert(!test('-d', 'node_modules'), 'no node_modules created'); + } }); From 20ec6591615c21445682f1ffd50e456b46ea77c6 Mon Sep 17 00:00:00 2001 From: Tetsuo Seto Date: Mon, 25 Jan 2016 20:10:55 -0800 Subject: [PATCH 6/6] Remove intl/en/messages.json and proof read strings --- .gitignore | 1 + intl/en/messages.json | 25 ------------------------- intl/en/sl-build.txt | 13 ++++--------- lib/git.js | 2 +- 4 files changed, 6 insertions(+), 35 deletions(-) delete mode 100644 intl/en/messages.json diff --git a/.gitignore b/.gitignore index 6ff42ff..ee8247a 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ intl/pt intl/ru intl/zh-Hans intl/zh-Hant +intl/en/*.json diff --git a/intl/en/messages.json b/intl/en/messages.json deleted file mode 100644 index 96ddd53..0000000 --- a/intl/en/messages.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "030d811d2ab5819e6243c729824da0b6": "Running `{0}`", - "af6d9e7420995e5c0abb08a42724d606": "Error on `{0}`:", - "b25fa34ebd543c4e0c0669f94de5ddb8": "Failed to run `{0}`:", - "5c54f212be40a039151f4dcb56396070": "Warning: the --bundle option now does nothing and should not be used", - "1135cb7ad2114989954c26dc4e9bebad": "Invalid usage (near option '{0}'), try `{{{1} --help}}`.", - "9366282e11c151558bdfaab4a264aa1b": "usage", - "a2bc72e22e890be19e1660493472495e": "Invalid usage (extra arguments), try `{{{0} --help}}`.", - "b244d9c9891555b90e18d551c5d082ea": "Cannot perform commit on {{non-git}} working directory", - "1c481aa99d081c32182011a758f73d33": "{0}", - "90d507cae0601242deeeea9b942544cb": "Merged source tree of `{0}` onto `{1}`", - "6b394b7761ff45400e21c8cd2b9e232a": "Not merging {{HEAD}} into `{0}`, already up to date.", - "ca6d677489e241e5af729aa7162389d1": "Packing application in to {0}", - "d3ff137cf1ef8d22f3952261f2275780": "Committed build products onto `{0}`", - "a8c20f23a35195c295680377789d40b4": "Build products already up to date on `{0}`", - "99587c601164537b7250fe9cf50fac93": "Error on `{0}`:\n {1}", - "1799e4e01c2fb3a088b19cfeb01eb2e1": "Failed to create branch \"{0}\"", - "7806fbe11cf7c1e9aad101f86bd20464": "Failed to parse branch `HEAD`, is this a git repository?", - "b8e0d3bbf3ba083e84b9e13231b40bc6": "Failed to commit `{0}` onto `{1}`", - "e8b2fb5beafaba433e270e4b31536907": "Failed to merge `{0}` onto `{1}`", - "0ad1a7faf2d75966b82d53fa818be4e6": "Failed to add build products", - "48b64f73122685bbbadefbc32ebfa2b3": "Failed to stage build products for commit", - "be16430c695022e715484af2ce2a667e": "Failed to create build products commit for `{0}`", - "03a3f207674407bfc212889a4aac83c8": "Failed to commit build products to `{0}`" -} diff --git a/intl/en/sl-build.txt b/intl/en/sl-build.txt index a9caf36..828c26d 100644 --- a/intl/en/sl-build.txt +++ b/intl/en/sl-build.txt @@ -2,15 +2,11 @@ usage: {{%MAIN%}} [options] Build a node application package. -With no options, the default depends on whether a git repository is -detected or not. +With no options, the default depends on whether a git repository is detected or not. -If a {{git}} repository is detected the default is `{{--git}}`: install and commit the -build results to the "{{deploy}}" branch, which will be created if it does not -already exist. +If a {{git}} repository is detected the default is `{{--git}}`: install and commit the build results to the "{{deploy}}" branch, which will be created if it does not already exist. -If no {{git}} repository is detected the default is `{{--npm}}`: install and -pack the build results into a `{{-.tgz}}` file. +If no {{git}} repository is detected the default is `{{--npm}}`: install and pack the build results into a `{{-.tgz}}` file. Options: {{-h,--help}} Print this message and exit. @@ -23,5 +19,4 @@ Options: Git specific options: {{-c,--commit}} Commit build output (branch specified by {{--onto}}). - {{--onto BRANCH}} Branch to commit build results to, created if - necessary ("{{deploy}}", by default). + {{--onto BRANCH}} Branch to commit build results to, created if necessary ("{{deploy}}", by default). diff --git a/lib/git.js b/lib/git.js index d9e427a..564b7da 100644 --- a/lib/git.js +++ b/lib/git.js @@ -103,7 +103,7 @@ exports.syncBranch = function gitSyncBranch(gitDstBranch) { var gitSrcTreeSha = execSync( 'git log -1 --pretty=format:"%t" HEAD', - g.t('Failed to parse branch `HEAD`, is this a git repository?') + g.t('Failed to parse branch `{{HEAD}}`, is this a git repository?') ); // Commit the source tree to the head of the destination branch, and update