From 22df08c29f6e4566d418e2a80a8279303406a733 Mon Sep 17 00:00:00 2001 From: Sebastian Reichel Date: Fri, 29 Jun 2018 00:58:19 +0200 Subject: build: switch to meson buildsystem We build the project with 'meson' now instead of using custom configure script + GNU Makefiles. To build the project, go to the project root directory and use the following commands: Building: meson build cd build ninja Update Language Files: ninja shopsystem-pot ninja shopsystem-update-po Install: DESTDIR=./tmp ninja install --- data/po/de.po | 477 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 477 insertions(+) create mode 100644 data/po/de.po (limited to 'data/po/de.po') diff --git a/data/po/de.po b/data/po/de.po new file mode 100644 index 0000000..f70e4ce --- /dev/null +++ b/data/po/de.po @@ -0,0 +1,477 @@ +# Copyright (C) 2018 Sebastian Reichel +# This file is distributed under the same license as the main package. +# +msgid "" +msgstr "" +"Project-Id-Version: shopsystem 0.1\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2018-06-29 01:20+0200\n" +"PO-Revision-Date: 2018-06-28 21:14+0200\n" +"Last-Translator: Sebastian Reichel \n" +"Language-Team: German\n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: curses-ui/message_box.vala:52 +msgid "" +"\n" +"Date Changed: " +msgstr "" +"\n" +"Datumswechsel: " + +#: scanner-session/scannersession.vala:289 +#, c-format +msgid "%s bought %d items for %s €" +msgstr "%s hat gerade %d Posten für %s € gekauft" + +#: web/template.vala:53 web/template.vala:55 web/template.vala:57 +#: web/template.vala:59 web/template.vala:82 +#, c-format +msgid "%s could not be loaded!" +msgstr "%s konnte nicht geladen werden!" + +#: web/template.vala:40 web/template.vala:43 web/template.vala:46 +#: web/template.vala:49 web/template.vala:78 +#, c-format +msgid "%s not found!" +msgstr "%s wurde nicht gefunden!" + +#: pdf-invoice/pdf-invoice.vala:591 +#, c-format +msgid "Article name \"%s\" does not fit on a single page!" +msgstr "Artikelname \"%s\" passt nicht auf eine Seite" + +#: serial-device/serial-device.vala:39 +msgid "Can't read lock file!\n" +msgstr "Konnte Lock-Datei nicht lesen\n" + +#: audio/audio.vala:38 +msgid "Cannot find alsa GStreamer plugin" +msgstr "GStreamer Plugin für ALSA konnte nicht gefunden werden" + +#: audio/audio.vala:42 +msgid "Cannot find playbin2 GStreamer plugin" +msgstr "GStreamer Plugin playbin2 konnte nicht gefunden werden" + +#: audio/main.vala:39 database/main.vala:29 input-device/main.vala:31 +#: pdf-invoice/main.vala:30 pgp/main.vala:35 serial-device/main.vala:29 +#, c-format +msgid "Config Error: %s\n" +msgstr "Konfigurationsfehler: %s\n" + +#: serial-device/serial-device.vala:211 +#, c-format +msgid "Convert Error: %s" +msgstr "Konvertierungsfehler" + +#: audio/main.vala:30 cli/main.vala:37 config/main.vala:32 +#: database/main.vala:40 input-device/main.vala:42 pdf-invoice/main.vala:39 +#: pdf-stock/main.vala:26 pgp/main.vala:44 scanner-session/main.vala:28 +#: serial-device/main.vala:40 +msgid "Could not acquire name\n" +msgstr "Konnte DBus Namen nicht erlangen\n" + +#: input-device/input-device.vala:40 serial-device/serial-device.vala:165 +msgid "Could not bind IOChannel" +msgstr "IOChannel Verbindung konnte nicht hergestellt werden" + +#: serial-device/serial-device.vala:59 +#, c-format +msgid "Could not create lock file: %s!\n" +msgstr "Konnte Lock-Datei nicht erstellen: %s!\n" + +#: pdf-invoice/pdf-invoice.vala:81 +#, c-format +msgid "Could not load SVG: %s\n" +msgstr "Konnte SVG nicht laden: %s\n" + +#: config/config.vala:26 +#, c-format +msgid "Could not load configuration file: %s" +msgstr "Konnte Konfigurationsdatei nicht laden: %s" + +#: invoice/invoice.vala:338 pdf-invoice/pdf-invoice.vala:379 +#, c-format +msgid "Could not open VAT template: %s" +msgstr "Konnte VAT-Template nicht öffnen: %s" + +#: serial-device/serial-device.vala:55 +msgid "Could not open device!\n" +msgstr "Konnte Gerätedatei nicht öffnen!\n" + +#: invoice/invoice.vala:252 invoice/invoice.vala:319 +#, c-format +msgid "Could not open invoice template: %s" +msgstr "Konnte Rechnungs-Template nicht öffnen: %s" + +#: audio/main.vala:53 cli/main.vala:68 config/main.vala:43 +#: database/main.vala:51 input-device/main.vala:53 input-device/main.vala:58 +#: pdf-stock/main.vala:37 pgp/main.vala:55 scanner-session/main.vala:41 +#: serial-device/main.vala:51 +msgid "Could not register service\n" +msgstr "Konnte DBus-Service nicht registrieren\n" + +#: pdf-invoice/main.vala:50 +#, c-format +msgid "Could not register service: %s\n" +msgstr "Konnte DBus-Servicenicht registieren: %s\n" + +#: web/web.vala:1482 +msgid "Could not setup webserver!" +msgstr "Konnte Webserver nicht konfigurieren!" + +#: web/main.vala:64 +#, c-format +msgid "Could not start Webserver: %s\n" +msgstr "Konnte Webserver nicht starten: %s\n" + +#: pdf-stock/test.vala:26 scanner-session/scannersession.vala:300 +#, c-format +msgid "DBus Error: %s" +msgstr "DBus Fehler: %s" + +#: audio/main.vala:41 database/main.vala:31 input-device/main.vala:33 +#: pdf-invoice/main.vala:26 pgp/main.vala:31 serial-device/main.vala:31 +#: web/main.vala:51 +#, c-format +msgid "DBus Error: %s\n" +msgstr "DBus Fehler: %s\n" + +#: scanner-session/scannersession.vala:304 +#, c-format +msgid "Database Error: %s" +msgstr "Datenbank Fehler: %s" + +#: scanner-session/scannersession.vala:66 +#, c-format +msgid "Error (user=%d): %s" +msgstr "Fehler (Nutzer %d): %s" + +#: cli/main.vala:51 +#, c-format +msgid "Error sending command: %s" +msgstr "Fehler beim senden des Kommandos: %s" + +#: pgp/pgp.vala:123 +msgid "Error!\n" +msgstr "Fehler!\n" + +#: curses-ui/logo.vala:44 scanner-session/scannersession.vala:178 +#: scanner-session/scannersession.vala:225 +#, c-format +msgid "Error: %s" +msgstr "Fehler: %s" + +#: backup/main.vala:41 invoice/main.vala:51 invoice/main.vala:58 +#: invoice/single.vala:51 invoice/single.vala:58 mail/main.vala:26 +#: web/web.vala:1143 +#, c-format +msgid "Error: %s\n" +msgstr "Fehler: %s\n" + +#: mail/main.vala:35 +msgid "Error: Could not acquire name\n" +msgstr "Fehler: Konnte DBus-Namen nicht bekommen\n" + +#: mail/main.vala:47 +msgid "Error: Could not register service\n" +msgstr "Fehler: Konnte DBus-Service nicht registrieren\n" + +#: database/database.vala:81 +msgid "Error: could not open database!" +msgstr "Fehler: Konnte Datenbank nicht öffnen!" + +#: database/database.vala:28 +#, c-format +msgid "Error: could not prepare statement: %s" +msgstr "Fehler: Konnte SQL-Anweisung nicht erstellen: %s" + +#: scanner-session/scannersession.vala:174 +#: scanner-session/scannersession.vala:221 +#, c-format +msgid "Error: unknown product: %llu" +msgstr "Fehler: unbekanntes Produkt: %llu" + +#: serial-device/serial-device.vala:163 +msgid "Failed to set encoding" +msgstr "Fehler beim setzten der Zeichenkodierung" + +#: curses-ui/logo.vala:31 +#, c-format +msgid "File '%s' doesn't exist.\n" +msgstr "Datei '%s' existiert nicht.\n" + +#: input-device/input-device.vala:43 pdf-stock/test.vala:24 +#, c-format +msgid "File Error: %s" +msgstr "Datei Fehler: %s" + +#: pdf-invoice/pdf-invoice.vala:387 +#, c-format +msgid "File Error: %s\n" +msgstr "Datei Fehler: %s\n" + +#: scanner-session/scannersession.vala:20 +msgid "Guest" +msgstr "Gast" + +#: pdf-stock/test.vala:22 scanner-session/scannersession.vala:302 +#, c-format +msgid "IO Error: %s" +msgstr "EA Fehler: %s" + +#: audio/main.vala:37 curses-ui/main.vala:60 database/main.vala:27 +#: input-device/main.vala:29 pdf-invoice/main.vala:28 pgp/main.vala:33 +#: scanner-session/scannersession.vala:49 serial-device/main.vala:27 +#: web/main.vala:47 +#, c-format +msgid "IO Error: %s\n" +msgstr "EA Fehler: %s\n" + +#: serial-device/serial-device.vala:207 +#, c-format +msgid "IOChannel Error: %s" +msgstr "IOChannel Fehler: %s" + +#: serial-device/serial-device.vala:168 +#, c-format +msgid "IOChannel: %s" +msgstr "IOChannel: %s" + +#: input-device/input-device.vala:27 +msgid "Ignoring InputDevice!\n" +msgstr "Eingabegerät wird ignoriert\n" + +#: scanner-session/scannersession.vala:168 +#: scanner-session/scannersession.vala:215 +msgid "Internal Error!" +msgstr "Interner Fehler!" + +#: web/main.vala:44 web/main.vala:49 +#, c-format +msgid "KeyFile Error: %s\n" +msgstr "Schlüsseldatei Fehler: %s\n" + +#: scanner-session/scannersession.vala:149 +msgid "Login as GUEST" +msgstr "Login als Gast" + +#: scanner-session/scannersession.vala:141 +#, c-format +msgid "Login failed (User ID = %d)" +msgstr "Login fehlgeschlagen (User ID = %d)" + +#: scanner-session/scannersession.vala:155 +msgid "Login failed as GUEST" +msgstr "Gast-Login fehlgeschlagen" + +#: web/websession.vala:165 +#, c-format +msgid "Login for user id %d failed\n" +msgstr "Login für Benutzer %d fehlgeschlagen\n" + +#: scanner-session/scannersession.vala:135 +#, c-format +msgid "Login: %s (%d)" +msgstr "Login: %s (%d)" + +#: input-device/input-device.vala:215 serial-device/serial-device.vala:189 +msgid "Lost device" +msgstr "Gerät verloren" + +#: pdf-invoice/pdf-invoice.vala:628 +msgid "No invoice ID given!" +msgstr "Keine Rechnungsnummer übergeben!" + +#: pdf-invoice/pdf-invoice.vala:631 +msgid "No invoice data given!" +msgstr "Keine Rechnungsdaten übergeben!" + +#: pdf-invoice/pdf-invoice.vala:634 +msgid "No invoice date given!" +msgstr "Kein Rechnungsdatum übergeben!" + +#: pdf-invoice/pdf-invoice.vala:637 +msgid "No invoice recipient given!" +msgstr "Kein Rechnungsempfänger übergeben!" + +#: scanner-session/scannersession.vala:253 +msgid "No more Items on your Shopping Cart" +msgstr "Keine weiteren Gegenstände im Einkaufswagen" + +#: mail/mailer.vala:141 mail/mailer.vala:149 +msgid "No such mail" +msgstr "Mail wurde nicht gefunden" + +#: database/database.vala:611 +msgid "No such session available in database!" +msgstr "Keine solche Session in der Datenbank verfügbar!" + +#: database/database.vala:710 database/database.vala:722 +msgid "No such user available in database!" +msgstr "Kein solcher Nutzer in der Datenbank verfügbar!" + +#: cli/main.vala:25 +#, c-format +msgid "" +"Nothing to send.\n" +"Usage: %s \n" +"Example: %s \"USER 1\" \"LOGOUT\"\n" +msgstr "" +"Nichts zu senden.\n" +"Benutzung: %s \n" +"Beispiel: %s \"USER 1\" \"LOGOUT\"\n" + +#: invoice/main.vala:20 +msgid "Possible values for : temporary, final\n" +msgstr "Mögliche Werte für : temporary, final\n" + +#: pdf-invoice/pdf-invoice.vala:471 +msgid "Prices > 9999.99€ are not supported!" +msgstr "Preise > 9999,99€ werden nicht unterstützt!" + +#: database/database.vala:487 +#, c-format +msgid "Remove purchase of %s" +msgstr "Einkaufsposten %s wurde entfernt" + +#: mail/mailer.vala:180 +#, c-format +msgid "Reply from SMTP-Server: %s" +msgstr "Antwort vom SMTP-Server: %s" + +#: cli/cli.vala:24 +#, c-format +msgid "Sending: %s\n" +msgstr "Sende: %s\n" + +#: curses-ui/main.vala:72 +msgid "Shop System has been started" +msgstr "Shop System wurde gestartet" + +#: curses-ui/main.vala:78 +msgid "Stopping Shop System" +msgstr "Shop System wird gestoppt" + +#: web/main.vala:55 +#, c-format +msgid "TLS certificate: %s\n" +msgstr "TLS Zertifikat: %s\n" + +#: web/main.vala:56 +#, c-format +msgid "TLS private key: %s\n" +msgstr "TLS Privater Schlüssel: %s\n" + +#: invoice/invoice.vala:314 +msgid "Unknown MessageType" +msgstr "Unbekannter Nachrichten Typ" + +#: invoice/main.vala:19 +#, c-format +msgid "Usage: %s [timestamp]\n" +msgstr "Benutzung: %s [timestamp]\n" + +#: web/main.vala:54 +#, c-format +msgid "Web Server Port: %u\n" +msgstr "Webserver Port: %u\n" + +#: pdf-invoice/pdf-invoice.vala:475 +msgid "Years after 9999 are not supported!" +msgstr "Jahre nach 9999 werden nicht unterstützt!" + +#: scanner-session/scannersession.vala:240 +#, c-format +msgid "article added to shopping card: %s (%s €)" +msgstr "Artikel %s (%s €) wurde zum Warenkorb hinzugefügt" + +#: scanner-session/scannersession.vala:189 +#, c-format +msgid "article info: %s (Member: %s €, Guest: %s €" +msgstr "Artikelinfo: %s (Mitglied: %s €, Gast: %s €" + +#: input-device/input-device.vala:249 +#, c-format +msgid "barcode: %s\n" +msgstr "Barcode: %s\n" + +#: mail/mailer.vala:107 +msgid "could not configure STARTTLS" +msgstr "Konnte STARTTLS nicht konfigurieren" + +#: web/template.vala:61 web/template.vala:84 +msgid "could not load templates!" +msgstr "Konnte Templates nicht laden!" + +#: curses-ui/main.vala:27 curses-ui/main.vala:29 +#, c-format +msgid "could not play audio: %s" +msgstr "Konnte Audio Datei nicht abspielen: %s" + +#: mail/mailer.vala:99 +msgid "could not setup server" +msgstr "Konnte Server nicht konfigurieren" + +#: mail/mailer.vala:176 +msgid "eSMTP: Start Session failed!" +msgstr "eSMTP: Session Start fehlgeschlagen!" + +#: database/database.vala:370 database/database.vala:387 +#: database/database.vala:403 database/database.vala:419 +#: database/database.vala:435 database/database.vala:448 +#: database/database.vala:470 database/database.vala:492 +#: database/database.vala:500 database/database.vala:527 +#: database/database.vala:541 database/database.vala:556 +#: database/database.vala:583 database/database.vala:591 +#: database/database.vala:601 database/database.vala:638 +#: database/database.vala:675 database/database.vala:689 +#: database/database.vala:700 database/database.vala:737 +#: database/database.vala:765 database/database.vala:884 +#: database/database.vala:892 database/database.vala:913 +#: database/database.vala:919 database/database.vala:927 +#: database/database.vala:1028 database/database.vala:1079 +#: database/database.vala:1129 database/database.vala:1212 +#, c-format +msgid "internal error: %d" +msgstr "Interner Fehler: %d" + +#: scanner-session/scannersession.vala:249 +#, c-format +msgid "removed last Item from Shopping Cart: %s" +msgstr "Letzter Posten wurde aus dem Warenkorb entfernt: %s" + +#: serial-device/serial-device.vala:43 +msgid "serial device is locked!\n" +msgstr "Serielles Gerät ist blockiert!\n" + +#: mail/mailer.vala:79 +msgid "server or port configuration is missing" +msgstr "Server oder Port Konfiguration fehlt" + +#: input-device/input-device.vala:224 +msgid "short read!\n" +msgstr "Unvollständige Daten aus Gerätedatei gelesen\n" + +#: database/database.vala:490 +msgid "undo not possible without purchases" +msgstr "Rückgängig nicht möglich ohne Einkäufe" + +#: database/database.vala:385 database/database.vala:401 +#: database/database.vala:417 database/database.vala:433 +#: database/database.vala:468 +#, c-format +msgid "unknown product: %llu" +msgstr "Unbekanntes Produkt: %llu" + +#: database/database.vala:1210 +#, c-format +msgid "unknown rfid: %s" +msgstr "Unbekannter RFID: %s" + +#: database/database.vala:636 +msgid "user not found" +msgstr "User nicht gefunden" -- cgit v1.2.3 From cce1953eb1f8fe8c927a1720c95caed45b71ef1d Mon Sep 17 00:00:00 2001 From: Sebastian Reichel Date: Fri, 29 Jun 2018 21:05:46 +0200 Subject: all: simplify datadir configuration This simplifies the datadir configuration and removes the expectation, that the code is executed from the repository. It should now be possible to install this into the system like any other common Linux application. --- data/po/de.po | 48 ++++++++++++++++++++++---------------------- data/po/shopsystem.pot | 48 ++++++++++++++++++++++---------------------- example.cfg | 5 +---- src/audio/main.vala | 3 ++- src/config/main.vala | 4 +--- src/curses-ui/curses-ui.vala | 4 ++-- src/curses-ui/logo.vala | 14 ++++++------- src/curses-ui/main.vala | 14 +++++++++---- src/invoice/invoice.vala | 3 ++- src/pdf-invoice/main.vala | 3 ++- src/web/main.vala | 3 ++- 11 files changed, 77 insertions(+), 72 deletions(-) (limited to 'data/po/de.po') diff --git a/data/po/de.po b/data/po/de.po index f70e4ce..9196b50 100644 --- a/data/po/de.po +++ b/data/po/de.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: shopsystem 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-06-29 01:20+0200\n" +"POT-Creation-Date: 2018-06-29 21:19+0200\n" "PO-Revision-Date: 2018-06-28 21:14+0200\n" "Last-Translator: Sebastian Reichel \n" "Language-Team: German\n" @@ -56,8 +56,8 @@ msgstr "GStreamer Plugin für ALSA konnte nicht gefunden werden" msgid "Cannot find playbin2 GStreamer plugin" msgstr "GStreamer Plugin playbin2 konnte nicht gefunden werden" -#: audio/main.vala:39 database/main.vala:29 input-device/main.vala:31 -#: pdf-invoice/main.vala:30 pgp/main.vala:35 serial-device/main.vala:29 +#: audio/main.vala:40 database/main.vala:29 input-device/main.vala:31 +#: pdf-invoice/main.vala:31 pgp/main.vala:35 serial-device/main.vala:29 #, c-format msgid "Config Error: %s\n" msgstr "Konfigurationsfehler: %s\n" @@ -67,8 +67,8 @@ msgstr "Konfigurationsfehler: %s\n" msgid "Convert Error: %s" msgstr "Konvertierungsfehler" -#: audio/main.vala:30 cli/main.vala:37 config/main.vala:32 -#: database/main.vala:40 input-device/main.vala:42 pdf-invoice/main.vala:39 +#: audio/main.vala:30 cli/main.vala:37 config/main.vala:30 +#: database/main.vala:40 input-device/main.vala:42 pdf-invoice/main.vala:40 #: pdf-stock/main.vala:26 pgp/main.vala:44 scanner-session/main.vala:28 #: serial-device/main.vala:40 msgid "Could not acquire name\n" @@ -93,7 +93,7 @@ msgstr "Konnte SVG nicht laden: %s\n" msgid "Could not load configuration file: %s" msgstr "Konnte Konfigurationsdatei nicht laden: %s" -#: invoice/invoice.vala:338 pdf-invoice/pdf-invoice.vala:379 +#: invoice/invoice.vala:339 pdf-invoice/pdf-invoice.vala:379 #, c-format msgid "Could not open VAT template: %s" msgstr "Konnte VAT-Template nicht öffnen: %s" @@ -102,19 +102,19 @@ msgstr "Konnte VAT-Template nicht öffnen: %s" msgid "Could not open device!\n" msgstr "Konnte Gerätedatei nicht öffnen!\n" -#: invoice/invoice.vala:252 invoice/invoice.vala:319 +#: invoice/invoice.vala:253 invoice/invoice.vala:320 #, c-format msgid "Could not open invoice template: %s" msgstr "Konnte Rechnungs-Template nicht öffnen: %s" -#: audio/main.vala:53 cli/main.vala:68 config/main.vala:43 +#: audio/main.vala:54 cli/main.vala:68 config/main.vala:41 #: database/main.vala:51 input-device/main.vala:53 input-device/main.vala:58 #: pdf-stock/main.vala:37 pgp/main.vala:55 scanner-session/main.vala:41 #: serial-device/main.vala:51 msgid "Could not register service\n" msgstr "Konnte DBus-Service nicht registrieren\n" -#: pdf-invoice/main.vala:50 +#: pdf-invoice/main.vala:51 #, c-format msgid "Could not register service: %s\n" msgstr "Konnte DBus-Servicenicht registieren: %s\n" @@ -123,7 +123,7 @@ msgstr "Konnte DBus-Servicenicht registieren: %s\n" msgid "Could not setup webserver!" msgstr "Konnte Webserver nicht konfigurieren!" -#: web/main.vala:64 +#: web/main.vala:65 #, c-format msgid "Could not start Webserver: %s\n" msgstr "Konnte Webserver nicht starten: %s\n" @@ -133,9 +133,9 @@ msgstr "Konnte Webserver nicht starten: %s\n" msgid "DBus Error: %s" msgstr "DBus Fehler: %s" -#: audio/main.vala:41 database/main.vala:31 input-device/main.vala:33 -#: pdf-invoice/main.vala:26 pgp/main.vala:31 serial-device/main.vala:31 -#: web/main.vala:51 +#: audio/main.vala:42 curses-ui/main.vala:68 database/main.vala:31 +#: input-device/main.vala:33 pdf-invoice/main.vala:27 pgp/main.vala:31 +#: serial-device/main.vala:31 web/main.vala:52 #, c-format msgid "DBus Error: %s\n" msgstr "DBus Fehler: %s\n" @@ -223,10 +223,10 @@ msgstr "Gast" msgid "IO Error: %s" msgstr "EA Fehler: %s" -#: audio/main.vala:37 curses-ui/main.vala:60 database/main.vala:27 -#: input-device/main.vala:29 pdf-invoice/main.vala:28 pgp/main.vala:33 +#: audio/main.vala:38 curses-ui/main.vala:66 database/main.vala:27 +#: input-device/main.vala:29 pdf-invoice/main.vala:29 pgp/main.vala:33 #: scanner-session/scannersession.vala:49 serial-device/main.vala:27 -#: web/main.vala:47 +#: web/main.vala:48 #, c-format msgid "IO Error: %s\n" msgstr "EA Fehler: %s\n" @@ -250,7 +250,7 @@ msgstr "Eingabegerät wird ignoriert\n" msgid "Internal Error!" msgstr "Interner Fehler!" -#: web/main.vala:44 web/main.vala:49 +#: curses-ui/main.vala:70 web/main.vala:45 web/main.vala:50 #, c-format msgid "KeyFile Error: %s\n" msgstr "Schlüsseldatei Fehler: %s\n" @@ -348,25 +348,25 @@ msgstr "Antwort vom SMTP-Server: %s" msgid "Sending: %s\n" msgstr "Sende: %s\n" -#: curses-ui/main.vala:72 +#: curses-ui/main.vala:78 msgid "Shop System has been started" msgstr "Shop System wurde gestartet" -#: curses-ui/main.vala:78 +#: curses-ui/main.vala:84 msgid "Stopping Shop System" msgstr "Shop System wird gestoppt" -#: web/main.vala:55 +#: web/main.vala:56 #, c-format msgid "TLS certificate: %s\n" msgstr "TLS Zertifikat: %s\n" -#: web/main.vala:56 +#: web/main.vala:57 #, c-format msgid "TLS private key: %s\n" msgstr "TLS Privater Schlüssel: %s\n" -#: invoice/invoice.vala:314 +#: invoice/invoice.vala:315 msgid "Unknown MessageType" msgstr "Unbekannter Nachrichten Typ" @@ -375,7 +375,7 @@ msgstr "Unbekannter Nachrichten Typ" msgid "Usage: %s [timestamp]\n" msgstr "Benutzung: %s [timestamp]\n" -#: web/main.vala:54 +#: web/main.vala:55 #, c-format msgid "Web Server Port: %u\n" msgstr "Webserver Port: %u\n" @@ -407,7 +407,7 @@ msgstr "Konnte STARTTLS nicht konfigurieren" msgid "could not load templates!" msgstr "Konnte Templates nicht laden!" -#: curses-ui/main.vala:27 curses-ui/main.vala:29 +#: curses-ui/main.vala:28 curses-ui/main.vala:30 #, c-format msgid "could not play audio: %s" msgstr "Konnte Audio Datei nicht abspielen: %s" diff --git a/data/po/shopsystem.pot b/data/po/shopsystem.pot index abab319..757f7a5 100644 --- a/data/po/shopsystem.pot +++ b/data/po/shopsystem.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: shopsystem\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-06-29 01:20+0200\n" +"POT-Creation-Date: 2018-06-29 21:19+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -57,8 +57,8 @@ msgstr "" msgid "Cannot find playbin2 GStreamer plugin" msgstr "" -#: audio/main.vala:39 database/main.vala:29 input-device/main.vala:31 -#: pdf-invoice/main.vala:30 pgp/main.vala:35 serial-device/main.vala:29 +#: audio/main.vala:40 database/main.vala:29 input-device/main.vala:31 +#: pdf-invoice/main.vala:31 pgp/main.vala:35 serial-device/main.vala:29 #, c-format msgid "Config Error: %s\n" msgstr "" @@ -68,8 +68,8 @@ msgstr "" msgid "Convert Error: %s" msgstr "" -#: audio/main.vala:30 cli/main.vala:37 config/main.vala:32 -#: database/main.vala:40 input-device/main.vala:42 pdf-invoice/main.vala:39 +#: audio/main.vala:30 cli/main.vala:37 config/main.vala:30 +#: database/main.vala:40 input-device/main.vala:42 pdf-invoice/main.vala:40 #: pdf-stock/main.vala:26 pgp/main.vala:44 scanner-session/main.vala:28 #: serial-device/main.vala:40 msgid "Could not acquire name\n" @@ -94,7 +94,7 @@ msgstr "" msgid "Could not load configuration file: %s" msgstr "" -#: invoice/invoice.vala:338 pdf-invoice/pdf-invoice.vala:379 +#: invoice/invoice.vala:339 pdf-invoice/pdf-invoice.vala:379 #, c-format msgid "Could not open VAT template: %s" msgstr "" @@ -103,19 +103,19 @@ msgstr "" msgid "Could not open device!\n" msgstr "" -#: invoice/invoice.vala:252 invoice/invoice.vala:319 +#: invoice/invoice.vala:253 invoice/invoice.vala:320 #, c-format msgid "Could not open invoice template: %s" msgstr "" -#: audio/main.vala:53 cli/main.vala:68 config/main.vala:43 +#: audio/main.vala:54 cli/main.vala:68 config/main.vala:41 #: database/main.vala:51 input-device/main.vala:53 input-device/main.vala:58 #: pdf-stock/main.vala:37 pgp/main.vala:55 scanner-session/main.vala:41 #: serial-device/main.vala:51 msgid "Could not register service\n" msgstr "" -#: pdf-invoice/main.vala:50 +#: pdf-invoice/main.vala:51 #, c-format msgid "Could not register service: %s\n" msgstr "" @@ -124,7 +124,7 @@ msgstr "" msgid "Could not setup webserver!" msgstr "" -#: web/main.vala:64 +#: web/main.vala:65 #, c-format msgid "Could not start Webserver: %s\n" msgstr "" @@ -134,9 +134,9 @@ msgstr "" msgid "DBus Error: %s" msgstr "" -#: audio/main.vala:41 database/main.vala:31 input-device/main.vala:33 -#: pdf-invoice/main.vala:26 pgp/main.vala:31 serial-device/main.vala:31 -#: web/main.vala:51 +#: audio/main.vala:42 curses-ui/main.vala:68 database/main.vala:31 +#: input-device/main.vala:33 pdf-invoice/main.vala:27 pgp/main.vala:31 +#: serial-device/main.vala:31 web/main.vala:52 #, c-format msgid "DBus Error: %s\n" msgstr "" @@ -224,10 +224,10 @@ msgstr "" msgid "IO Error: %s" msgstr "" -#: audio/main.vala:37 curses-ui/main.vala:60 database/main.vala:27 -#: input-device/main.vala:29 pdf-invoice/main.vala:28 pgp/main.vala:33 +#: audio/main.vala:38 curses-ui/main.vala:66 database/main.vala:27 +#: input-device/main.vala:29 pdf-invoice/main.vala:29 pgp/main.vala:33 #: scanner-session/scannersession.vala:49 serial-device/main.vala:27 -#: web/main.vala:47 +#: web/main.vala:48 #, c-format msgid "IO Error: %s\n" msgstr "" @@ -251,7 +251,7 @@ msgstr "" msgid "Internal Error!" msgstr "" -#: web/main.vala:44 web/main.vala:49 +#: curses-ui/main.vala:70 web/main.vala:45 web/main.vala:50 #, c-format msgid "KeyFile Error: %s\n" msgstr "" @@ -346,25 +346,25 @@ msgstr "" msgid "Sending: %s\n" msgstr "" -#: curses-ui/main.vala:72 +#: curses-ui/main.vala:78 msgid "Shop System has been started" msgstr "" -#: curses-ui/main.vala:78 +#: curses-ui/main.vala:84 msgid "Stopping Shop System" msgstr "" -#: web/main.vala:55 +#: web/main.vala:56 #, c-format msgid "TLS certificate: %s\n" msgstr "" -#: web/main.vala:56 +#: web/main.vala:57 #, c-format msgid "TLS private key: %s\n" msgstr "" -#: invoice/invoice.vala:314 +#: invoice/invoice.vala:315 msgid "Unknown MessageType" msgstr "" @@ -373,7 +373,7 @@ msgstr "" msgid "Usage: %s [timestamp]\n" msgstr "" -#: web/main.vala:54 +#: web/main.vala:55 #, c-format msgid "Web Server Port: %u\n" msgstr "" @@ -405,7 +405,7 @@ msgstr "" msgid "could not load templates!" msgstr "" -#: curses-ui/main.vala:27 curses-ui/main.vala:29 +#: curses-ui/main.vala:28 curses-ui/main.vala:30 #, c-format msgid "could not play audio: %s" msgstr "" diff --git a/example.cfg b/example.cfg index a56e074..bfae3ea 100644 --- a/example.cfg +++ b/example.cfg @@ -2,6 +2,7 @@ longname = Kreativität trifft Technik e.V. shortname = KTT spacename = Mainframe +datapath = /usr/share/shopsystem/ [DATABASE] file = /path/to/shop.db [INPUT] @@ -16,16 +17,12 @@ password = my_top_secret_password starttls = true mailfromaddress = shop@kreativitaet-trifft-technik.de treasurermailaddress = shop-einzug@kreativitaet-trifft-technik.de -[AUDIO] -path = /path/to/sounds/ [PGP] keyring = /path/to/keyring/ keyid = 0x12345678 [WEB] -filepath = /path/to/web/templates/ port = 8080 [INVOICE] -datadir = /path/to/invoice/ vat = no addressrow = Kreativität trifft Technik e.V., Bahnhofsplatz 10, 26122 Oldenburg footer1 = Kreativität trifft Technik e.V.\nAmtsgericht Oldenburg VR 201044\n\nHackspace „Mainframe“\nFabLab „Fab-O-Lab“\nSchnittstelle „Schnittstelle“\n\nBahnhofsplatz 10 • 26122 Oldenburg diff --git a/src/audio/main.vala b/src/audio/main.vala index 4a1da2f..2fdaf61 100644 --- a/src/audio/main.vala +++ b/src/audio/main.vala @@ -31,7 +31,8 @@ public static int main(string[] args) { try { Config cfg = Bus.get_proxy_sync(BusType.SYSTEM, "io.mainframe.shopsystem.Config", "/io/mainframe/shopsystem/config"); - var path = cfg.get_string("AUDIO", "path"); + var datapath = cfg.get_string("GENERAL", "datapath"); + var path = Path.build_filename(datapath, "sounds"); player = new AudioPlayerImplementation(path); } catch(IOError e) { error(_("IO Error: %s\n"), e.message); diff --git a/src/config/main.vala b/src/config/main.vala index c24b572..6a90ad0 100644 --- a/src/config/main.vala +++ b/src/config/main.vala @@ -19,9 +19,7 @@ public static int main(string[] args) { Intl.setlocale(LocaleCategory.ALL, ""); Intl.textdomain("shopsystem"); - string binarylocation = File.new_for_path(args[0]).get_parent().get_path(); - - cfg = new Cfg(binarylocation + "/../../ktt-shopsystem.cfg"); + cfg = new Cfg("/etc/shopsystem.cfg"); Bus.own_name( BusType.SYSTEM, diff --git a/src/curses-ui/curses-ui.vala b/src/curses-ui/curses-ui.vala index 0cd6281..e98c6ea 100644 --- a/src/curses-ui/curses-ui.vala +++ b/src/curses-ui/curses-ui.vala @@ -23,7 +23,7 @@ public class CursesUI { //StatusPanel statuswin; MessageBoxOverlay mbOverlay; - public CursesUI(string binarylocation) { + public CursesUI(string datadir) { /* unicode support */ Intl.setlocale(LocaleCategory.CTYPE, ""); @@ -40,7 +40,7 @@ public class CursesUI { Curses.init_pair(2, Curses.Color.WHITE, Curses.Color.RED); /* initialize widgets */ - banner = new Logo(binarylocation); + banner = new Logo(datadir); //statuswin = new StatusPanel(); messages = new MessageBox(); clkwin = new ClockWindow(); diff --git a/src/curses-ui/logo.vala b/src/curses-ui/logo.vala index e7f6fb8..a4a2c2c 100644 --- a/src/curses-ui/logo.vala +++ b/src/curses-ui/logo.vala @@ -19,28 +19,28 @@ using Curses; public class Logo { Window win; - public Logo(string binarylocation) { + public Logo(string datadir) { win = new Window(8, COLS - 2, 0, 1); win.bkgdset(COLOR_PAIR(1) | Attribute.BOLD); win.addstr("\n"); - var file = File.new_for_path (binarylocation + "/../../logo.txt"); - - if (!file.query_exists ()) { + var logofilename = Path.build_filename(datadir, "logo.txt"); + var file = File.new_for_path(logofilename); + if (!file.query_exists()) { stderr.printf (_("File '%s' doesn't exist.\n"), file.get_path ()); } try { // Open file for reading and wrap returned FileInputStream into a // DataInputStream, so we can read line by line - var dis = new DataInputStream (file.read ()); + var dis = new DataInputStream(file.read()); string line; // Read lines until end of file (null) is reached - while ((line = dis.read_line (null)) != null) { + while ((line = dis.read_line(null)) != null) { win.addstr(line+"\n"); } - } catch (Error e) { + } catch(Error e) { error (_("Error: %s"), e.message); } diff --git a/src/curses-ui/main.vala b/src/curses-ui/main.vala index e5ad4c8..3518bb2 100644 --- a/src/curses-ui/main.vala +++ b/src/curses-ui/main.vala @@ -19,6 +19,7 @@ public MainLoop loop; public AudioPlayer audio; public ScannerSession scanner; public CursesUI ui; +private Config cfg; private static void play(string file) { try { @@ -56,14 +57,19 @@ public static int main(string[] args) { try { audio = Bus.get_proxy_sync(BusType.SYSTEM, "io.mainframe.shopsystem.AudioPlayer", "/io/mainframe/shopsystem/audio"); scanner = Bus.get_proxy_sync(BusType.SYSTEM, "io.mainframe.shopsystem.ScannerSession", "/io/mainframe/shopsystem/scanner_session"); + cfg = Bus.get_proxy_sync(BusType.SYSTEM, "io.mainframe.shopsystem.Config", "/io/mainframe/shopsystem/config"); + + var datapath = cfg.get_string("GENERAL", "datapath"); + var datadir = Path.build_filename(datapath, "curses-ui"); + ui = new CursesUI(datadir); } catch(IOError e) { error(_("IO Error: %s\n"), e.message); + } catch(DBusError e) { + error(_("DBus Error: %s\n"), e.message); + } catch(KeyFileError e) { + error(_("KeyFile Error: %s\n"), e.message); } - string binarylocation = File.new_for_path(args[0]).get_parent().get_path(); - - ui = new CursesUI(binarylocation); - Log.set_default_handler(log_handler); scanner.msg.connect(msg_handler); diff --git a/src/invoice/invoice.vala b/src/invoice/invoice.vala index f899cb5..1321071 100644 --- a/src/invoice/invoice.vala +++ b/src/invoice/invoice.vala @@ -44,7 +44,8 @@ public class InvoiceImplementation { db = Bus.get_proxy_sync(BusType.SYSTEM, "io.mainframe.shopsystem.Database", "/io/mainframe/shopsystem/database"); pdf = Bus.get_proxy_sync(BusType.SYSTEM, "io.mainframe.shopsystem.InvoicePDF", "/io/mainframe/shopsystem/invoicepdf"); Config cfg = Bus.get_proxy_sync(BusType.SYSTEM, "io.mainframe.shopsystem.Config", "/io/mainframe/shopsystem/config"); - datadir = cfg.get_string("INVOICE", "datadir"); + var datapath = cfg.get_string("GENERAL", "datapath"); + datadir = Path.build_filename(datapath, "invoice"); mailfromaddress = cfg.get_string("MAIL", "mailfromaddress"); treasurermailaddress = cfg.get_string("MAIL", "treasurermailaddress"); shortname = cfg.get_string("GENERAL", "shortname"); diff --git a/src/pdf-invoice/main.vala b/src/pdf-invoice/main.vala index 1848852..4217eb8 100644 --- a/src/pdf-invoice/main.vala +++ b/src/pdf-invoice/main.vala @@ -21,7 +21,8 @@ public static int main(string[] args) { try { Config cfg = Bus.get_proxy_sync(BusType.SYSTEM, "io.mainframe.shopsystem.Config", "/io/mainframe/shopsystem/config"); - datadir = cfg.get_string("INVOICE", "datadir"); + var datapath = cfg.get_string("GENERAL", "datapath"); + datadir = Path.build_filename(datapath, "invoice"); } catch(DBusError e) { error(_("DBus Error: %s\n"), e.message); } catch(IOError e) { diff --git a/src/web/main.vala b/src/web/main.vala index f7b0c30..2043df0 100644 --- a/src/web/main.vala +++ b/src/web/main.vala @@ -34,7 +34,8 @@ public static int main(string[] args) { pgp = Bus.get_proxy_sync(BusType.SYSTEM, "io.mainframe.shopsystem.PGP", "/io/mainframe/shopsystem/pgp"); cfg = Bus.get_proxy_sync(BusType.SYSTEM, "io.mainframe.shopsystem.Config", "/io/mainframe/shopsystem/config"); audio = Bus.get_proxy_sync(BusType.SYSTEM, "io.mainframe.shopsystem.AudioPlayer", "/io/mainframe/shopsystem/audio"); - templatedir = cfg.get_string("WEB", "filepath"); + var datapath = cfg.get_string("GENERAL", "datapath"); + templatedir = Path.build_filename(datapath, "templates"); port = cfg.get_integer("WEB", "port"); try { -- cgit v1.2.3 From e821aca14ee3c59380c82e32c9cfcdbcca144a96 Mon Sep 17 00:00:00 2001 From: Sebastian Reichel Date: Sun, 1 Jul 2018 17:22:56 +0200 Subject: all: fix all remaining warnings --- data/po/de.po | 16 +++++++++++----- data/po/shopsystem.pot | 16 +++++++++++----- src/mail/mailer.vala | 12 ++++++++---- src/pdf-invoice/test.vala | 24 ++++++++++++++++++++---- 4 files changed, 50 insertions(+), 18 deletions(-) (limited to 'data/po/de.po') diff --git a/data/po/de.po b/data/po/de.po index 9196b50..49b85e8 100644 --- a/data/po/de.po +++ b/data/po/de.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: shopsystem 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-06-29 21:19+0200\n" +"POT-Creation-Date: 2018-07-01 17:19+0200\n" "PO-Revision-Date: 2018-06-28 21:14+0200\n" "Last-Translator: Sebastian Reichel \n" "Language-Team: German\n" @@ -134,8 +134,8 @@ msgid "DBus Error: %s" msgstr "DBus Fehler: %s" #: audio/main.vala:42 curses-ui/main.vala:68 database/main.vala:31 -#: input-device/main.vala:33 pdf-invoice/main.vala:27 pgp/main.vala:31 -#: serial-device/main.vala:31 web/main.vala:52 +#: input-device/main.vala:33 pdf-invoice/main.vala:27 pdf-invoice/test.vala:58 +#: pgp/main.vala:31 serial-device/main.vala:31 web/main.vala:52 #, c-format msgid "DBus Error: %s\n" msgstr "DBus Fehler: %s\n" @@ -209,7 +209,7 @@ msgstr "Datei '%s' existiert nicht.\n" msgid "File Error: %s" msgstr "Datei Fehler: %s" -#: pdf-invoice/pdf-invoice.vala:387 +#: pdf-invoice/pdf-invoice.vala:387 pdf-invoice/test.vala:64 #, c-format msgid "File Error: %s\n" msgstr "Datei Fehler: %s\n" @@ -224,7 +224,8 @@ msgid "IO Error: %s" msgstr "EA Fehler: %s" #: audio/main.vala:38 curses-ui/main.vala:66 database/main.vala:27 -#: input-device/main.vala:29 pdf-invoice/main.vala:29 pgp/main.vala:33 +#: input-device/main.vala:29 pdf-invoice/main.vala:29 pdf-invoice/test.vala:22 +#: pdf-invoice/test.vala:60 pgp/main.vala:33 #: scanner-session/scannersession.vala:49 serial-device/main.vala:27 #: web/main.vala:48 #, c-format @@ -250,6 +251,11 @@ msgstr "Eingabegerät wird ignoriert\n" msgid "Internal Error!" msgstr "Interner Fehler!" +#: pdf-invoice/test.vala:62 +#, fuzzy, c-format +msgid "Invoice PDF Error: %s\n" +msgstr "Datei Fehler: %s\n" + #: curses-ui/main.vala:70 web/main.vala:45 web/main.vala:50 #, c-format msgid "KeyFile Error: %s\n" diff --git a/data/po/shopsystem.pot b/data/po/shopsystem.pot index 757f7a5..63da7dc 100644 --- a/data/po/shopsystem.pot +++ b/data/po/shopsystem.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: shopsystem\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-06-29 21:19+0200\n" +"POT-Creation-Date: 2018-07-01 17:19+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -135,8 +135,8 @@ msgid "DBus Error: %s" msgstr "" #: audio/main.vala:42 curses-ui/main.vala:68 database/main.vala:31 -#: input-device/main.vala:33 pdf-invoice/main.vala:27 pgp/main.vala:31 -#: serial-device/main.vala:31 web/main.vala:52 +#: input-device/main.vala:33 pdf-invoice/main.vala:27 pdf-invoice/test.vala:58 +#: pgp/main.vala:31 serial-device/main.vala:31 web/main.vala:52 #, c-format msgid "DBus Error: %s\n" msgstr "" @@ -210,7 +210,7 @@ msgstr "" msgid "File Error: %s" msgstr "" -#: pdf-invoice/pdf-invoice.vala:387 +#: pdf-invoice/pdf-invoice.vala:387 pdf-invoice/test.vala:64 #, c-format msgid "File Error: %s\n" msgstr "" @@ -225,7 +225,8 @@ msgid "IO Error: %s" msgstr "" #: audio/main.vala:38 curses-ui/main.vala:66 database/main.vala:27 -#: input-device/main.vala:29 pdf-invoice/main.vala:29 pgp/main.vala:33 +#: input-device/main.vala:29 pdf-invoice/main.vala:29 pdf-invoice/test.vala:22 +#: pdf-invoice/test.vala:60 pgp/main.vala:33 #: scanner-session/scannersession.vala:49 serial-device/main.vala:27 #: web/main.vala:48 #, c-format @@ -251,6 +252,11 @@ msgstr "" msgid "Internal Error!" msgstr "" +#: pdf-invoice/test.vala:62 +#, c-format +msgid "Invoice PDF Error: %s\n" +msgstr "" + #: curses-ui/main.vala:70 web/main.vala:45 web/main.vala:50 #, c-format msgid "KeyFile Error: %s\n" diff --git a/src/mail/mailer.vala b/src/mail/mailer.vala index 3d7a996..642ceaa 100644 --- a/src/mail/mailer.vala +++ b/src/mail/mailer.vala @@ -172,12 +172,16 @@ public class MailerImplementation { message.set_reverse_path(current_mail.get_reverse_path()); int result = session.start_session(); - if(result == 0) - throw new IOError.FAILED(_("eSMTP: Start Session failed!")); + if(result == 0) { + stderr.printf(_("eSMTP: Start Session failed!")); + return false; + } unowned Smtp.Status status = message.transfer_status(); - if(status.code < 200 || status.code >= 300) - throw new IOError.FAILED(_("Reply from SMTP-Server: %s"), status.text); + if(status.code < 200 || status.code >= 300) { + stderr.printf(_("Reply from SMTP-Server: %s")); + return false; + } current_mail = null; diff --git a/src/pdf-invoice/test.vala b/src/pdf-invoice/test.vala index e55f3a3..5eb7f52 100644 --- a/src/pdf-invoice/test.vala +++ b/src/pdf-invoice/test.vala @@ -14,7 +14,13 @@ */ public static int main(string args[]) { - PDFInvoice invoice = Bus.get_proxy_sync(BusType.SYSTEM, "io.mainframe.shopsystem.InvoicePDF", "/io/mainframe/shopsystem/invoicepdf"); + PDFInvoice invoice; + + try { + invoice = Bus.get_proxy_sync(BusType.SYSTEM, "io.mainframe.shopsystem.InvoicePDF", "/io/mainframe/shopsystem/invoicepdf"); + } catch(IOError e) { + error(_("IO Error: %s\n"), e.message); + } InvoiceRecipient r = { "Max", @@ -43,10 +49,20 @@ public static int main(string args[]) { invoice.invoice_entries = {e1}; /* generate pdf */ - var pdfdata = invoice.generate(); + try { + var pdfdata = invoice.generate(); - /* write pdf into file */ - FileUtils.set_contents("test.pdf", (string) pdfdata, pdfdata.length); + /* write pdf into file */ + FileUtils.set_contents("test.pdf", (string) pdfdata, pdfdata.length); + } catch(DBusError e) { + error(_("DBus Error: %s\n"), e.message); + } catch(IOError e) { + error(_("IO Error: %s\n"), e.message); + } catch(InvoicePDFError e) { + error(_("Invoice PDF Error: %s\n"), e.message); + } catch(FileError e) { + error(_("File Error: %s\n"), e.message); + } return 0; } -- cgit v1.2.3