Merge branch 'master' into better_inventory

 Conflicts:
	README
	data/templates/products/entry.html
	docker/Dockerfile
	docker/init.sh
	src/database/database.vala
	src/database/db-interface.vala
	src/pdf-stock/Makefile
	src/pdf-stock/pdf-stock-interface.vala
	src/pdf-stock/pdf-stock.vala
	src/web/Makefile
	src/web/main.vala
	templates/menu.html
	templates/products/index.html

1 files changed, 15 insertions, 9 deletions

diff --git a/src/serial-device/main.vala b/src/serial-device/main.vala
index 0dea907..95926b5 100644
--- a/src/serial-device/main.vala
+++ b/src/serial-device/main.vala
@@ -1,4 +1,5 @@
 /* Copyright 2013, Sebastian Reichel <sre@ring0.de>
+ * Copyright 2017-2018, Johannes Rudolph <johannes.rudolph@gmx.com>
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -13,35 +14,40 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-Device dev;
+Device scanner;
 
 public static int main(string[] args) {
+	Intl.setlocale(LocaleCategory.ALL, "");
+	Intl.textdomain("shopsystem");
+
 	try {
 		Config cfg = Bus.get_proxy_sync(BusType.SYSTEM, "io.mainframe.shopsystem.Config", "/io/mainframe/shopsystem/config");
-		dev = new Device(cfg.get_string("INPUT", "device"), 9600, 8, 1);
+		scanner = new Device(cfg.get_string("INPUT", "barcodescanner"), 9600, 8, 1);
 	} catch(IOError e) {
-		error("IOError: %s\n", e.message);
+		error(_("IO Error: %s\n"), e.message);
 	} catch(KeyFileError e) {
-		error("Config Error: %s\n", e.message);
+		error(_("Config Error: %s\n"), e.message);
+	} catch(DBusError e) {
+		error(_("DBus Error: %s\n"), e.message);
 	}
 
 	Bus.own_name(
 		BusType.SYSTEM,
 		"io.mainframe.shopsystem.InputDevice",
 		BusNameOwnerFlags.NONE,
-		on_bus_aquired,
+		on_bus_acquired,
 		() => {},
-		() => stderr.printf("Could not aquire name\n"));
+		() => stderr.printf(_("Could not acquire name\n")));
 
 	new MainLoop().run();
 
 	return 0;
 }
 
-void on_bus_aquired(DBusConnection con) {
+void on_bus_acquired(DBusConnection con) {
     try {
-        con.register_object("/io/mainframe/shopsystem/device", dev);
+        con.register_object("/io/mainframe/shopsystem/devicescanner", scanner);
     } catch(IOError e) {
-        stderr.printf("Could not register service\n");
+        stderr.printf(_("Could not register service\n"));
     }
 }