From 0b8d8572c6c68753c54622551b2ba40f431d8c17 Mon Sep 17 00:00:00 2001
From: Yuri Chornoivan <yurchor@ukr.net>
Date: Fri, 21 Dec 2018 20:13:29 +0200
Subject: Fix desktop file localization

---
 i18n/update_translations.sh                           | 7 ++++---
 setup.py                                              | 2 +-
 usr/share/applications/mageiawelcome.desktop.in       | 9 ---------
 usr/share/applications/template_mageiawelcome.desktop | 9 +++++++++
 4 files changed, 14 insertions(+), 13 deletions(-)
 delete mode 100644 usr/share/applications/mageiawelcome.desktop.in
 create mode 100644 usr/share/applications/template_mageiawelcome.desktop

diff --git a/i18n/update_translations.sh b/i18n/update_translations.sh
index 3c9f321..7a75a0b 100644
--- a/i18n/update_translations.sh
+++ b/i18n/update_translations.sh
@@ -1,14 +1,15 @@
 #!/bin/bash
 POFILE=$1
 
-intltool-extract --type=gettext/ini share/applications/mageiawelcome.desktop.in
+xgettext usr/share/applications/template_mageiawelcome.desktop -o desktop.pot
 
 pylupdate5 qml/mageiawelcome.py -ts py.ts
 lupdate mageiawelcome.pro -ts qml.ts
 
-lconvert -i py.ts qml.ts -o po/mageiawelcome.pot
+lconvert -i py.ts qml.ts -o main.pot
+msgcat *.pot > po/mageiawelcome.pot
 
-rm -rf py.ts qml.ts
+rm -rf py.ts qml.ts desktop.pot main.pot
 
 if [[ $POFILE == "" ]]; then
   for i in po/*.po
diff --git a/setup.py b/setup.py
index 857e405..d52d462 100644
--- a/setup.py
+++ b/setup.py
@@ -8,7 +8,7 @@ class BuildQm(build):
   for ts in glob.glob('i18n/*.ts'):
     os.system('lrelease {0} -qm {1}'.format(ts, (ts[:-2]+'qm')))
   os.system("rm -f i18n/*.ts")
-  os.system('intltool-merge --desktop-style po usr/share/applications/mageiawelcome.desktop.in usr/share/applications/mageiawelcome.desktop')
+  os.system('msgfmt --desktop --template=usr/share/applications/template_mageiawelcome.desktop -d po -o usr/share/applications/mageiawelcome.desktop')
 
 
 data_files = [("bin",["usr/bin/mageiawelcome","usr/bin/mageiawelcome-launcher"]),
diff --git a/usr/share/applications/mageiawelcome.desktop.in b/usr/share/applications/mageiawelcome.desktop.in
deleted file mode 100644
index 5259fdd..0000000
--- a/usr/share/applications/mageiawelcome.desktop.in
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-_Name=Mageia Welcome
-_GenericName=Mageia Welcome Screen
-_Comment=Welcome screen for Mageia, that is displayed upon first users boot
-Type=Application
-Terminal=false
-Icon=mgaonline
-Exec=mageiawelcome
-Categories=Utility;X-MageiaLinux-CrossDesktop;
diff --git a/usr/share/applications/template_mageiawelcome.desktop b/usr/share/applications/template_mageiawelcome.desktop
new file mode 100644
index 0000000..883dc55
--- /dev/null
+++ b/usr/share/applications/template_mageiawelcome.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Mageia Welcome
+GenericName=Mageia Welcome Screen
+Comment=Welcome screen for Mageia, that is displayed upon first users boot
+Type=Application
+Terminal=false
+Icon=mgaonline
+Exec=mageiawelcome
+Categories=Utility;X-MageiaLinux-CrossDesktop;
-- 
cgit v1.2.1