From 1a88110770e4fd388d6c7cf99bb30e840893545f Mon Sep 17 00:00:00 2001
From: Simon Quigley <tsimonq2@ubuntu.com>
Date: Wed, 11 Jul 2018 00:10:37 -0500
Subject: [PATCH] Fix translations for Calamares.

---
 Makefile                               | 13 ++++++++-----
 debian/changelog                       |  6 ++++++
 debian/control                         |  2 +-
 debian/rules                           |  4 ----
 lubuntu/branding/lubuntu/lang/Makefile | 11 +++++++++++
 5 files changed, 26 insertions(+), 10 deletions(-)
 create mode 100755 lubuntu/branding/lubuntu/lang/Makefile

diff --git a/Makefile b/Makefile
index b7b9a14..b76c0ef 100755
--- a/Makefile
+++ b/Makefile
@@ -2,11 +2,14 @@
 
 #SUBDIRS :=
 
-all: install
-
-install:
-	make -C lubuntu/po/; \
-	find lubuntu/ -type f -iname "*.in" | xargs rm -f
+all:
+	# Desktop file
+	(cd lubuntu/po/ && make)
 	chmod +x lubuntu/*.desktop
+	# Slideshow
+	(cd lubuntu/branding/lubuntu/lang/ && make)
+	# Get rid of the unnecessary files
+	find lubuntu/ -type f -iname "*.in" | xargs rm -f
+	find lubuntu/ -type f -iname "Makefile" | xargs rm -f
 
 # vim:ts=4
diff --git a/debian/changelog b/debian/changelog
index 7b3792d..538c055 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+calamares-settings-ubuntu (6) UNRELEASED; urgency=medium
+
+  * Fix translations for Calamares.
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Wed, 11 Jul 2018 00:10:24 -0500
+
 calamares-settings-ubuntu (5) cosmic; urgency=medium
 
   * Add translations support for the desktop file and the installer slideshow.
diff --git a/debian/control b/debian/control
index 7025821..0045ea3 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: devel
 Priority: optional
 Maintainer: Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
 Uploaders: Simon Quigley <tsimonq2@ubuntu.com>
-Build-Depends: debhelper (>= 11), intltool
+Build-Depends: debhelper (>= 11), intltool, qttools5-dev-tools
 Standards-Version: 4.1.4
 Homepage: https://code.launchpad.net/ubuntu-calamares-settings
 Vcs-Git: https://git.launchpad.net/ubuntu-calamares-settings
diff --git a/debian/rules b/debian/rules
index 5942f9c..2d33f6a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,3 @@
 
 %:
 	dh $@
-
-override_dh_auto_build:
-	$(MAKE)
-	dh_auto_build
diff --git a/lubuntu/branding/lubuntu/lang/Makefile b/lubuntu/branding/lubuntu/lang/Makefile
new file mode 100755
index 0000000..b085609
--- /dev/null
+++ b/lubuntu/branding/lubuntu/lang/Makefile
@@ -0,0 +1,11 @@
+#!/usr/bin/make -f
+
+LANGUAGES := ar ca de es eu gl be da el et fr pl
+
+all:
+	for i in $(LANGUAGES); do \
+		/usr/lib/qt5/bin/lrelease "calamares-lubuntu_$$i.ts"; \
+		rm calamares-lubuntu_$$i.ts; \
+	done
+
+# vim:ts=4