diff options
| -rw-r--r-- | Makefile | 18 | ||||
| -rwxr-xr-x | configure | 4 | ||||
| -rw-r--r-- | gulpfile.js | 5 | ||||
| -rw-r--r-- | src/i18n/de.po | 4 | ||||
| -rw-r--r-- | src/i18n/en-US.po | 4 | ||||
| -rw-r--r-- | src/i18n/fr.po | 4 | ||||
| -rw-r--r-- | src/i18n/it.po | 4 | ||||
| -rw-r--r-- | src/i18n/taler-wallet-webex.pot | 4 |
8 files changed, 26 insertions, 21 deletions
@@ -6,18 +6,21 @@ gulp = node_modules/gulp/bin/gulp.js tsc = node_modules/typescript/bin/tsc po2json = node_modules/po2json/bin/po2json -.PHONY: pogen src/i18n/strings.js +.PHONY: pogen src/i18n/strings.js yarn-install -package-stable: tsc i18n +package-stable: tsc i18n yarn-install $(gulp) package-stable -package-unstable: tsc i18n +package-unstable: tsc i18n yarn-install $(gulp) package-unstable -tsc: tsconfig.json +tsc: tsconfig.json yarn-install $(tsc) -tsconfig.json: gulpfile.js +yarn-install: + yarn install + +tsconfig.json: gulpfile.js yarn-install $(gulp) tsconfig i18n: pogen msgmerge src/i18n/strings.js @@ -25,7 +28,7 @@ i18n: pogen msgmerge src/i18n/strings.js pogen/pogen.js: pogen/pogen.ts pogen/tsconfig.json cd pogen; ../$(tsc) -pogen: $(ts) pogen/pogen.js +pogen: $(ts) pogen/pogen.js yarn-install find $(src) \( -name '*.ts' -or -name '*.tsx' \) ! -name '*.d.ts' \ | xargs node pogen/pogen.js \ | msguniq \ @@ -41,9 +44,6 @@ msgmerge: dist: $(gulp) srcdist -appdist: - $(gulp) appdist - src/i18n/strings.js: # $(ts) cp src/i18n/strings-prelude.js src/i18n/strings.js for pofile in src/i18n/*.po; do \ @@ -16,8 +16,8 @@ if ! node -p 'process.exit(!(/v([0-9]+)/.exec(process.version)[1] >= 4))'; then exit 1 fi -if ! npm --version >/dev/null; then - echo 'Node Package Manager (npm) missing' +if ! yarn --version >/dev/null; then + echo 'yarn missing' exit 1 fi diff --git a/gulpfile.js b/gulpfile.js index 781929c11..62a4c0876 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -66,12 +66,17 @@ const paths = { "src/**/*-test*.ts", ], }, + // distributed in the chrome extension dist: [ "img/icon.png", "img/logo.png", "src/**/*.{js,css,html}", + "testlib/**/*.{js,ts,tsx,html}", ], + // for the source distribution extra: [ + "scripts/prove-node", + "scripts/prove-selenium", "src/i18n/*.po", "src/i18n/*.pot", "decl/**/*.d.ts", diff --git a/src/i18n/de.po b/src/i18n/de.po index ddf21a9d6..e1486d233 100644 --- a/src/i18n/de.po +++ b/src/i18n/de.po @@ -51,8 +51,8 @@ msgstr "" #, c-format msgid "" "You do not have any funds from an exchange that is accepted by this " -"merchant. None of the exchanges accepted " -"by the merchant is known to your wallet." +"merchant. None of the exchanges accepted by the merchant is known to your " +"wallet." msgstr "" #: src/pages/confirm-create-reserve.tsx:105 diff --git a/src/i18n/en-US.po b/src/i18n/en-US.po index e69d57d14..7ff886a01 100644 --- a/src/i18n/en-US.po +++ b/src/i18n/en-US.po @@ -51,8 +51,8 @@ msgstr "" #, c-format msgid "" "You do not have any funds from an exchange that is accepted by this " -"merchant. None of the exchanges accepted " -"by the merchant is known to your wallet." +"merchant. None of the exchanges accepted by the merchant is known to your " +"wallet." msgstr "" #: src/pages/confirm-create-reserve.tsx:105 diff --git a/src/i18n/fr.po b/src/i18n/fr.po index e9c3d69b5..8c68a63f1 100644 --- a/src/i18n/fr.po +++ b/src/i18n/fr.po @@ -51,8 +51,8 @@ msgstr "" #, c-format msgid "" "You do not have any funds from an exchange that is accepted by this " -"merchant. None of the exchanges accepted " -"by the merchant is known to your wallet." +"merchant. None of the exchanges accepted by the merchant is known to your " +"wallet." msgstr "" #: src/pages/confirm-create-reserve.tsx:105 diff --git a/src/i18n/it.po b/src/i18n/it.po index e9c3d69b5..8c68a63f1 100644 --- a/src/i18n/it.po +++ b/src/i18n/it.po @@ -51,8 +51,8 @@ msgstr "" #, c-format msgid "" "You do not have any funds from an exchange that is accepted by this " -"merchant. None of the exchanges accepted " -"by the merchant is known to your wallet." +"merchant. None of the exchanges accepted by the merchant is known to your " +"wallet." msgstr "" #: src/pages/confirm-create-reserve.tsx:105 diff --git a/src/i18n/taler-wallet-webex.pot b/src/i18n/taler-wallet-webex.pot index e9c3d69b5..8c68a63f1 100644 --- a/src/i18n/taler-wallet-webex.pot +++ b/src/i18n/taler-wallet-webex.pot @@ -51,8 +51,8 @@ msgstr "" #, c-format msgid "" "You do not have any funds from an exchange that is accepted by this " -"merchant. None of the exchanges accepted " -"by the merchant is known to your wallet." +"merchant. None of the exchanges accepted by the merchant is known to your " +"wallet." msgstr "" #: src/pages/confirm-create-reserve.tsx:105 |