fix makefile

This commit is contained in:
Florian Dold 2016-11-18 22:08:59 +01:00
parent 7838cdc901
commit 9b7526c2db
6 changed files with 27 additions and 375 deletions

View File

@ -1,4 +1,4 @@
src = lib background content_scripts pages popup
src = src
ts = $(shell git ls-files $(src) | grep '\.tsx\?$$')
poname = taler-wallet-webex
@ -6,7 +6,7 @@ gulp = node_modules/gulp/bin/gulp.js
tsc = node_modules/typescript/bin/tsc
po2json = node_modules/po2json/bin/po2json
.PHONY: pogen i18n/strings.js
.PHONY: pogen src/i18n/strings.js
package-stable: tsc i18n
$(gulp) package-stable
@ -20,7 +20,7 @@ tsc: tsconfig.json
tsconfig.json: gulpfile.js
$(gulp) tsconfig
i18n: pogen msgmerge i18n/strings.js
i18n: pogen msgmerge src/i18n/strings.js
pogen/pogen.js: pogen/pogen.ts pogen/tsconfig.json
cd pogen; ../$(tsc)
@ -29,13 +29,13 @@ pogen: $(ts) pogen/pogen.js
find $(src) \( -name '*.ts' -or -name '*.tsx' \) ! -name '*.d.ts' \
| xargs node pogen/pogen.js \
| msguniq \
| msgmerge i18n/poheader - \
> i18n/$(poname).pot
| msgmerge src/i18n/poheader - \
> src/i18n/$(poname).pot
msgmerge:
@for pofile in i18n/*.po; do \
@for pofile in src/i18n/*.po; do \
echo merging $$pofile; \
msgmerge -o $$pofile $$pofile i18n/$(poname).pot; \
msgmerge -o $$pofile $$pofile src/i18n/$(poname).pot; \
done; \
dist:
@ -45,8 +45,8 @@ appdist:
$(gulp) appdist
i18n/strings.js: # $(ts)
cp i18n/strings-prelude.js i18n/strings.js
for pofile in i18n/*.po; do \
cp src/i18n/strings-prelude.js src/i18n/strings.js
for pofile in src/i18n/*.po; do \
b=`basename $$pofile`; \
lang=$${b%%.po}; \
$(po2json) -F -f jed1.x -d $$lang $$pofile $$pofile.json; \

View File

@ -27,76 +27,28 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: lib/wallet/renderHtml.tsx:37
#, c-format
msgid ""
"%1$s\n"
" wants to enter a contract over %2$s\n"
" with you."
msgstr ""
"%1$s\n"
" möchte einen Vertrag über %2$s\n"
" mit Ihnen abschließen."
#~ msgid ""
#~ "%1$s\n"
#~ " wants to enter a contract over %2$s\n"
#~ " with you."
#~ msgstr ""
#~ "%1$s\n"
#~ " möchte einen Vertrag über %2$s\n"
#~ " mit Ihnen abschließen."
#: lib/wallet/renderHtml.tsx:42
#, c-format
msgid "You are about to purchase:"
msgstr "Sie sind dabei, Folgendes zu kaufen:"
#~ msgid "You are about to purchase:"
#~ msgstr "Sie sind dabei, Folgendes zu kaufen:"
#: pages/confirm-contract.tsx:141
#, c-format
msgid "You have insufficient funds of the requested currency in your wallet."
msgstr ""
#, fuzzy
#~ msgid "Bank requested reserve (%1$s) for %2$s."
#~ msgstr "Bank bestätig anlegen der Reserve (%1$s) bei %2$s"
#: pages/confirm-create-reserve.tsx:275
#, c-format
msgid "Error: URL is empty"
msgstr ""
#, fuzzy
#~ msgid "Withdrew %1$s from %2$s (%3$s)."
#~ msgstr "Reserve (%1$s) mit %2$s bei %3$s erzeugt"
#: pages/confirm-create-reserve.tsx:282
#, c-format
msgid "Error: URL may not be relative"
msgstr ""
#: popup/popup.tsx:270
#, c-format
msgid "Error: could not retrieve balance information."
msgstr ""
#: popup/popup.tsx:303
#, fuzzy, c-format
msgid "Bank requested reserve (%1$s) for %2$s."
msgstr "Bank bestätig anlegen der Reserve (%1$s) bei %2$s"
#: popup/popup.tsx:314
#, c-format
msgid "Started to withdraw %1$s from %2$s (%3$s)."
msgstr ""
#: popup/popup.tsx:324
#, c-format
msgid "Merchant %1$s offered contract %2$s."
msgstr ""
#: popup/popup.tsx:333
#, fuzzy, c-format
msgid "Withdrew %1$s from %2$s (%3$s)."
msgstr "Reserve (%1$s) mit %2$s bei %3$s erzeugt"
#: popup/popup.tsx:343
#, c-format
msgid "Paid %1$s to merchant %2$s. (%3$s)"
msgstr ""
#: popup/popup.tsx:381
#, c-format
msgid "Error: could not retrieve event history"
msgstr ""
#: popup/popup.tsx:415
#, c-format
msgid "Your wallet has no events recorded."
msgstr "Ihre Geldbörse verzeichnet keine Vorkommnisse."
#~ msgid "Your wallet has no events recorded."
#~ msgstr "Ihre Geldbörse verzeichnet keine Vorkommnisse."
#~ msgid "Confirm Payment"
#~ msgstr "Bezahlung bestätigen"

View File

@ -27,74 +27,6 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: lib/wallet/renderHtml.tsx:37
#, c-format
msgid ""
"%1$s\n"
" wants to enter a contract over %2$s\n"
" with you."
msgstr ""
#: lib/wallet/renderHtml.tsx:42
#, c-format
msgid "You are about to purchase:"
msgstr ""
#: pages/confirm-contract.tsx:141
#, c-format
msgid "You have insufficient funds of the requested currency in your wallet."
msgstr ""
#: pages/confirm-create-reserve.tsx:275
#, c-format
msgid "Error: URL is empty"
msgstr ""
#: pages/confirm-create-reserve.tsx:282
#, c-format
msgid "Error: URL may not be relative"
msgstr ""
#: popup/popup.tsx:270
#, c-format
msgid "Error: could not retrieve balance information."
msgstr ""
#: popup/popup.tsx:303
#, c-format
msgid "Bank requested reserve (%1$s) for %2$s."
msgstr ""
#: popup/popup.tsx:314
#, c-format
msgid "Started to withdraw %1$s from %2$s (%3$s)."
msgstr ""
#: popup/popup.tsx:324
#, c-format
msgid "Merchant %1$s offered contract %2$s."
msgstr ""
#: popup/popup.tsx:333
#, c-format
msgid "Withdrew %1$s from %2$s (%3$s)."
msgstr ""
#: popup/popup.tsx:343
#, c-format
msgid "Paid %1$s to merchant %2$s. (%3$s)"
msgstr ""
#: popup/popup.tsx:381
#, c-format
msgid "Error: could not retrieve event history"
msgstr ""
#: popup/popup.tsx:415
#, c-format
msgid "Your wallet has no events recorded."
msgstr ""
#, fuzzy
#~ msgid "DEBUG: Your balance on %1$s is %2$s KUDO. Get more at %3$s"
#~ msgstr "DEBUG: Your balance is %2$s KUDO on %1$s. Get more at %3$s"

View File

@ -26,71 +26,3 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: lib/wallet/renderHtml.tsx:37
#, c-format
msgid ""
"%1$s\n"
" wants to enter a contract over %2$s\n"
" with you."
msgstr ""
#: lib/wallet/renderHtml.tsx:42
#, c-format
msgid "You are about to purchase:"
msgstr ""
#: pages/confirm-contract.tsx:141
#, c-format
msgid "You have insufficient funds of the requested currency in your wallet."
msgstr ""
#: pages/confirm-create-reserve.tsx:275
#, c-format
msgid "Error: URL is empty"
msgstr ""
#: pages/confirm-create-reserve.tsx:282
#, c-format
msgid "Error: URL may not be relative"
msgstr ""
#: popup/popup.tsx:270
#, c-format
msgid "Error: could not retrieve balance information."
msgstr ""
#: popup/popup.tsx:303
#, c-format
msgid "Bank requested reserve (%1$s) for %2$s."
msgstr ""
#: popup/popup.tsx:314
#, c-format
msgid "Started to withdraw %1$s from %2$s (%3$s)."
msgstr ""
#: popup/popup.tsx:324
#, c-format
msgid "Merchant %1$s offered contract %2$s."
msgstr ""
#: popup/popup.tsx:333
#, c-format
msgid "Withdrew %1$s from %2$s (%3$s)."
msgstr ""
#: popup/popup.tsx:343
#, c-format
msgid "Paid %1$s to merchant %2$s. (%3$s)"
msgstr ""
#: popup/popup.tsx:381
#, c-format
msgid "Error: could not retrieve event history"
msgstr ""
#: popup/popup.tsx:415
#, c-format
msgid "Your wallet has no events recorded."
msgstr ""

View File

@ -26,71 +26,3 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: lib/wallet/renderHtml.tsx:37
#, c-format
msgid ""
"%1$s\n"
" wants to enter a contract over %2$s\n"
" with you."
msgstr ""
#: lib/wallet/renderHtml.tsx:42
#, c-format
msgid "You are about to purchase:"
msgstr ""
#: pages/confirm-contract.tsx:141
#, c-format
msgid "You have insufficient funds of the requested currency in your wallet."
msgstr ""
#: pages/confirm-create-reserve.tsx:275
#, c-format
msgid "Error: URL is empty"
msgstr ""
#: pages/confirm-create-reserve.tsx:282
#, c-format
msgid "Error: URL may not be relative"
msgstr ""
#: popup/popup.tsx:270
#, c-format
msgid "Error: could not retrieve balance information."
msgstr ""
#: popup/popup.tsx:303
#, c-format
msgid "Bank requested reserve (%1$s) for %2$s."
msgstr ""
#: popup/popup.tsx:314
#, c-format
msgid "Started to withdraw %1$s from %2$s (%3$s)."
msgstr ""
#: popup/popup.tsx:324
#, c-format
msgid "Merchant %1$s offered contract %2$s."
msgstr ""
#: popup/popup.tsx:333
#, c-format
msgid "Withdrew %1$s from %2$s (%3$s)."
msgstr ""
#: popup/popup.tsx:343
#, c-format
msgid "Paid %1$s to merchant %2$s. (%3$s)"
msgstr ""
#: popup/popup.tsx:381
#, c-format
msgid "Error: could not retrieve event history"
msgstr ""
#: popup/popup.tsx:415
#, c-format
msgid "Your wallet has no events recorded."
msgstr ""

View File

@ -1,96 +0,0 @@
# This file is part of TALER
# (C) 2016 GNUnet e.V.
#
# TALER is free software; you can redistribute it and/or modify it under the
# terms of the GNU General Public License as published by the Free Software
# Foundation; either version 3, or (at your option) any later version.
#
# TALER is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
# A PARTICULAR PURPOSE. See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along with
# TALER; see the file COPYING. If not, see <http://www.gnu.org/licenses/>
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: Taler Wallet\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-11-09 22:39+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: lib/wallet/renderHtml.tsx:37
#, c-format
msgid ""
"%1$s\n"
" wants to enter a contract over %2$s\n"
" with you."
msgstr ""
#: lib/wallet/renderHtml.tsx:42
#, c-format
msgid "You are about to purchase:"
msgstr ""
#: pages/confirm-contract.tsx:141
#, c-format
msgid "You have insufficient funds of the requested currency in your wallet."
msgstr ""
#: pages/confirm-create-reserve.tsx:275
#, c-format
msgid "Error: URL is empty"
msgstr ""
#: pages/confirm-create-reserve.tsx:282
#, c-format
msgid "Error: URL may not be relative"
msgstr ""
#: popup/popup.tsx:270
#, c-format
msgid "Error: could not retrieve balance information."
msgstr ""
#: popup/popup.tsx:303
#, c-format
msgid "Bank requested reserve (%1$s) for %2$s."
msgstr ""
#: popup/popup.tsx:314
#, c-format
msgid "Started to withdraw %1$s from %2$s (%3$s)."
msgstr ""
#: popup/popup.tsx:324
#, c-format
msgid "Merchant %1$s offered contract %2$s."
msgstr ""
#: popup/popup.tsx:333
#, c-format
msgid "Withdrew %1$s from %2$s (%3$s)."
msgstr ""
#: popup/popup.tsx:343
#, c-format
msgid "Paid %1$s to merchant %2$s. (%3$s)"
msgstr ""
#: popup/popup.tsx:381
#, c-format
msgid "Error: could not retrieve event history"
msgstr ""
#: popup/popup.tsx:415
#, c-format
msgid "Your wallet has no events recorded."
msgstr ""