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, 7 insertions, 6 deletions

diff --git a/src/config/main.vala b/src/config/main.vala
index 5ae15be..1a5328d 100644
--- a/src/config/main.vala
+++ b/src/config/main.vala
@@ -16,27 +16,28 @@
 Cfg cfg;
 
 public static int main(string[] args) {
-	string binarylocation = File.new_for_path(args[0]).get_parent().get_path();
+	Intl.setlocale(LocaleCategory.ALL, "");
+	Intl.textdomain("shopsystem");
 
-	cfg = new Cfg(binarylocation + "/../../ktt-shopsystem.cfg");
+	cfg = new Cfg("/etc/shopsystem/config.ini");
 
 	Bus.own_name(
 		BusType.SYSTEM,
 		"io.mainframe.shopsystem.Config",
 		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/config", cfg);
     } catch(IOError e) {
-        stderr.printf("Could not register service\n");
+        stderr.printf(_("Could not register service\n"));
     }
 }