Merge lp:~lukas-kde/ubuntu-settings-components/extractPo into lp:~registry/ubuntu-settings-components/trunk

[Lukáš Tinkl]

Setup message extraction, load the catalog from the plugins

Setup message extraction, load the catalog from the plugins

Until now, the user visible strings haven't been extracted and therefore couldn't be translated.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:94
http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-ci/118/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-qmltests-vivid/43
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-vivid-amd64-ci/25
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-vivid-armhf-ci/25
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-vivid-armhf-ci/25/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-settings-components-ci/118/rebuild

review: Approve (continuous-integration)

[Albert Astals Cid (aacid)]

I don't think we should include the Czech translation, should be done via https://translations.launchpad.net/ubuntu-settings-components once we commit this and configure that page correctly

review: Needs Fixing

[Lukáš Tinkl (lukas-kde)]

> I don't think we should include the Czech translation, should be done via
> https://translations.launchpad.net/ubuntu-settings-components once we commit
> this and configure that page correctly

Fair enough, yup. I'll adjust it

[lp:~lukas-kde/ubuntu-settings-components/extractPo]

95. By Lukáš Tinkl on 2015-08-04

don't ship cs.po, rely on launchpad for the translations

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:95
http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-ci/119/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-qmltests-vivid/44
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-vivid-amd64-ci/26
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-vivid-armhf-ci/26
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-vivid-armhf-ci/26/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-settings-components-ci/119/rebuild

review: Approve (continuous-integration)

[Albert Astals Cid (aacid)]

Thinkign about this, i think this is not the correct solution, calling textdomain will overwrite the text domain set by the application that uses this plugin making its i18n() untranslated.

We should just use i18n.dtr() instead of i18n.tr()

review: Needs Fixing

[lp:~lukas-kde/ubuntu-settings-components/extractPo]

96. By Lukáš Tinkl on 2015-08-04

use i18n.dtr() instead of overwriting the textdomain

[Albert Astals Cid (aacid)]

Looks good to me.

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-04-07 09:42:19 +0000
+++ CMakeLists.txt	2015-08-04 14:58:07 +0000
@@ -98,3 +98,4 @@
 add_subdirectory(plugins)
 add_subdirectory(examples)
 add_subdirectory(tests)
+add_subdirectory(po)

=== modified file 'plugins/Ubuntu/Settings/Components/QuickReply.qml'
--- plugins/Ubuntu/Settings/Components/QuickReply.qml	2014-09-25 11:35:37 +0000
+++ plugins/Ubuntu/Settings/Components/QuickReply.qml	2015-08-04 14:58:07 +0000
@@ -60,7 +60,7 @@
                 height: parent.height
                 verticalAlignment: Text.AlignVCenter
                 fontSize: "small"
-                text: i18n.tr("Quick reply with:")
+                text: i18n.dtr("ubuntu-settings-components", "Quick reply with:")
             }
         }
 

=== modified file 'plugins/Ubuntu/Settings/Menus/SnapDecisionMenu.qml'
--- plugins/Ubuntu/Settings/Menus/SnapDecisionMenu.qml	2015-04-22 10:39:31 +0000
+++ plugins/Ubuntu/Settings/Menus/SnapDecisionMenu.qml	2015-08-04 14:58:07 +0000
@@ -27,10 +27,10 @@
     id: menu
 
     property bool actionEnabled: true
-    property string actionButtonText: i18n.tr("Call back")
+    property string actionButtonText: i18n.dtr("ubuntu-settings-components", "Call back")
 
     property bool replyEnabled: true
-    property string replyButtonText: i18n.tr("Send")
+    property string replyButtonText: i18n.dtr("ubuntu-settings-components", "Send")
     property string replyHintText
     property bool replyExpanded: false
 
@@ -55,7 +55,7 @@
 
                 Button {
                     objectName: "messageButton"
-                    text: i18n.tr("Message")
+                    text: i18n.dtr("ubuntu-settings-components", "Message")
                     Layout.fillWidth: true
 
                     onClicked: {

=== modified file 'plugins/Ubuntu/Settings/Menus/TextMessageMenu.qml'
--- plugins/Ubuntu/Settings/Menus/TextMessageMenu.qml	2015-04-22 10:39:31 +0000
+++ plugins/Ubuntu/Settings/Menus/TextMessageMenu.qml	2015-08-04 14:58:07 +0000
@@ -26,7 +26,7 @@
     id: menu
 
     property bool replyEnabled: true
-    property string replyButtonText: i18n.tr("Send")
+    property string replyButtonText: i18n.dtr("ubuntu-settings-components", "Send")
     property string replyHintText
 
     signal replied(string value)

=== added directory 'po'
=== added file 'po/CMakeLists.txt'
--- po/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ po/CMakeLists.txt	2015-08-04 14:58:07 +0000
@@ -0,0 +1,33 @@
+cmake_minimum_required(VERSION 2.8.9)
+find_package(Gettext REQUIRED)
+
+SET(POT_FILE
+  ubuntu-settings-components.pot
+)
+
+FILE(GLOB PO_FILES
+  *.po
+)
+
+SET(MO_FILE ubuntu-settings-components.mo)
+
+FOREACH(_file ${PO_FILES})
+  GET_FILENAME_COMPONENT(_lang ${_file} NAME_WE)
+  SET(_gmoFile ${CMAKE_CURRENT_BINARY_DIR}/${_lang}.gmo)
+  ADD_CUSTOM_COMMAND(OUTPUT ${_gmoFile}
+    COMMAND ${GETTEXT_MSGFMT_EXECUTABLE} -o ${_gmoFile} ${_file}
+    COMMAND install -D ${_gmoFile} ${CMAKE_CURRENT_BINARY_DIR}/locale/${_lang}/LC_MESSAGES/${MO_FILE}
+    WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+    DEPENDS ${_file}
+  )
+  INSTALL (FILES ${CMAKE_CURRENT_BINARY_DIR}/${_lang}.gmo DESTINATION ${CMAKE_INSTALL_PREFIX}/share/locale/${_lang}/LC_MESSAGES/ RENAME ${MO_FILE})
+  _GETTEXT_GET_UNIQUE_TARGET_NAME( pofiles uniqueTargetName)
+  ADD_CUSTOM_TARGET(${uniqueTargetName} ALL DEPENDS ${_gmoFile})
+ENDFOREACH(_file)
+
+ADD_CUSTOM_COMMAND(OUTPUT ${POT_FILE}
+  COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/update-usc-pot
+)
+ADD_CUSTOM_TARGET(pot_file
+  DEPENDS ${POT_FILE}
+)

=== added file 'po/ubuntu-settings-components.pot'
--- po/ubuntu-settings-components.pot	1970-01-01 00:00:00 +0000
+++ po/ubuntu-settings-components.pot	2015-08-04 14:58:07 +0000
@@ -0,0 +1,35 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Canonical Ltd.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: ubuntu-settings-components\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-08-02 16:26+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <[e-mail]>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: plugins/Ubuntu/Settings/Components/QuickReply.qml:63
+msgid "Quick reply with:"
+msgstr ""
+
+#: plugins/Ubuntu/Settings/Menus/SnapDecisionMenu.qml:30
+msgid "Call back"
+msgstr ""
+
+#: plugins/Ubuntu/Settings/Menus/SnapDecisionMenu.qml:33
+#: plugins/Ubuntu/Settings/Menus/TextMessageMenu.qml:29
+msgid "Send"
+msgstr ""
+
+#: plugins/Ubuntu/Settings/Menus/SnapDecisionMenu.qml:58
+msgid "Message"
+msgstr ""

=== added file 'po/update-usc-pot'
--- po/update-usc-pot	1970-01-01 00:00:00 +0000
+++ po/update-usc-pot	2015-08-04 14:58:07 +0000
@@ -0,0 +1,36 @@
+#!/bin/sh
+set -e
+cd $(dirname $0)
+PO_DIR=$PWD
+
+PROGNAME=$(basename $0)
+
+# Create a list of files to scan
+GETTEXT_FILES=$(mktemp --tmpdir usc.lst.XXXXX)
+trap 'rm -f "$GETTEXT_FILES"' EXIT
+cd ..
+find \( -name '*.h' -o -name '*.cpp' -o -name '*.qml' -o -name '*.js' \) \
+    -a ! \( -path './debian/*' -o -path './builddir/*' -o -path './build/*' -o -path './tests/*' -o -path './.bzr/*' -o -path './examples/*' \) | sort \
+> $GETTEXT_FILES
+
+# Generate pot from our list
+xgettext \
+    --output $PO_DIR/ubuntu-settings-components.pot \
+    --from-code=UTF-8 \
+    --files-from $GETTEXT_FILES \
+    --qt --c++ \
+    --add-comments=Translators \
+    --keyword=tr \
+    --keyword=tr:1,2 \
+    --keyword=dtr:2 \
+    --keyword=dtr:2,3 \
+    --keyword=ctr:1c,2 \
+    --keyword=dctr:2c,3 \
+    --keyword=tag \
+    --keyword=tag:1c,2 \
+    --keyword=dgettext_datetime \
+    --package-name="ubuntu-settings-components" \
+    --copyright-holder="Canonical Ltd." \
+    --from-code="UTF-8"
+
+echo "$PROGNAME: $PO_DIR/ubuntu-settings-components.pot updated"