i18n: add args keyword to merge_file

* i18n: add args keyword to merge_file

* i18n: add testcase to msgfmt args

6 files changed, 42 insertions, 3 deletions

diff --git a/test cases/frameworks/6 gettext/data2/meson.build b/test cases/frameworks/6 gettext/data2/meson.build
index d927ba3af..b8c90a138 100644
--- a/test cases/frameworks/6 gettext/data2/meson.build
+++ b/test cases/frameworks/6 gettext/data2/meson.build
@@ -1,8 +1,9 @@
 i18n.merge_file(
   input: 'test.desktop.in',
-  output: 'test.desktop',
+  output: 'test.plugin',
   type: 'desktop',
   po_dir: '../po',
+  args: ['--keyword=Description'],
   install: true,
   install_dir: join_paths(get_option('datadir'), 'applications')
 )
diff --git a/test cases/frameworks/6 gettext/data2/test.desktop.in b/test cases/frameworks/6 gettext/data2/test.desktop.in
index 33b9a9fd8..5c8ea2eb7 100644
--- a/test cases/frameworks/6 gettext/data2/test.desktop.in
+++ b/test cases/frameworks/6 gettext/data2/test.desktop.in
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Name=Test
 GenericName=Application
-Comment=Test Application
+Description=Test Application
 Type=Application
 
diff --git a/test cases/frameworks/6 gettext/installed_files.txt b/test cases/frameworks/6 gettext/installed_files.txt
index 850711a5c..f32b282d4 100644
--- a/test cases/frameworks/6 gettext/installed_files.txt
+++ b/test cases/frameworks/6 gettext/installed_files.txt
@@ -1,8 +1,10 @@
 usr/bin/intlprog?exe
 usr/share/locale/de/LC_MESSAGES/intltest.mo
 usr/share/locale/fi/LC_MESSAGES/intltest.mo
+usr/share/locale/ru/LC_MESSAGES/intltest.mo
 usr/share/applications/something.desktop
 usr/share/applications/test.desktop
+usr/share/applications/test.plugin
 usr/share/applications/test2.desktop
 usr/share/applications/test3.desktop
 usr/share/applications/test4.desktop
diff --git a/test cases/frameworks/6 gettext/po/LINGUAS b/test cases/frameworks/6 gettext/po/LINGUAS
index d319e4891..c9274bff0 100644
--- a/test cases/frameworks/6 gettext/po/LINGUAS
+++ b/test cases/frameworks/6 gettext/po/LINGUAS
@@ -1,2 +1,4 @@
 de
 fi
+ru
+
diff --git a/test cases/frameworks/6 gettext/po/meson.build b/test cases/frameworks/6 gettext/po/meson.build
index 8ea2c1113..86e02f1c6 100644
--- a/test cases/frameworks/6 gettext/po/meson.build
+++ b/test cases/frameworks/6 gettext/po/meson.build
@@ -1,3 +1,3 @@
-langs = ['fi', 'de']
+langs = ['fi', 'de', 'ru']
 
 i18n.gettext('intltest', languages : langs)
diff --git a/test cases/frameworks/6 gettext/po/ru.po b/test cases/frameworks/6 gettext/po/ru.po
new file mode 100644
index 000000000..e5867c8de
--- /dev/null
+++ b/test cases/frameworks/6 gettext/po/ru.po
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the intltest package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: intltest\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-05-31 05:16-0500\n"
+"PO-Revision-Date: 2019-04-22 02:38+0300\n"
+"Language: ru\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"X-Generator: Poedit 2.2.1\n"
+
+#: src/intlmain.c:15
+msgid "International greeting."
+msgstr "Межнациональное приветствие."
+
+#: data/test.desktop.in:3
+msgid "Test"
+msgstr "Тест"
+
+#: data/test.desktop.in:4
+msgid "Application"
+msgstr "Приложение"
+
+#: data/test.desktop.in:5
+msgid "Test Application"
+msgstr "Тестовое приложение"