Merge lp:~aacid/telephony-service/mark_metrics_for_extraction into lp:telephony-service

[Albert Astals Cid]

Mark User Metrics strings for translation and extract them so they can get translated

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:875
http://jenkins.qa.ubuntu.com/job/telephony-service-ci/278/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/telephony-service-utopic-amd64-ci/94/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/telephony-service-utopic-armhf-ci/94/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/telephony-service-utopic-i386-ci/95/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/telephony-service-ci/278/rebuild

review: Needs Fixing (continuous-integration)

[David Planella (dpm)]

Is there a way we could use plural forms in strings such as these -> "<b>%1</b> calls made today"?

[Tiago Salem Herrmann (tiagosh)]

Hi thanks for the patch, but I had a similar branch here: https://code.launchpad.net/~tiagosh/telephony-service/fix-18n-metrics

[Albert Astals Cid (aacid)]

Your patch is less good because it translates the string when sent to the database instead, which is not what has to be done according to the UserMetrics developers.

[Albert Astals Cid (aacid)]

David, you'll have to ask Pete Woods about that, my understanding is that not at the moment.

[lp:~aacid/telephony-service/mark_metrics_for_extraction]

874. By Launchpad Translations on behalf of phablet-team on 2014-08-09

Launchpad automatic translations update.

875. By Launchpad Translations on behalf of phablet-team on 2014-08-10

Launchpad automatic translations update.

876. By Launchpad Translations on behalf of phablet-team on 2014-08-11

Launchpad automatic translations update.

877. By Launchpad Translations on behalf of phablet-team on 2014-08-13

Launchpad automatic translations update.

878. By Tiago Salem Herrmann on 2014-08-13

Use system settings to retrieve sim card display names.
Approved by: Gustavo Pichorim Boiko, PS Jenkins bot

879. By Martti Piirainen on 2014-08-13

Adding support for tone generator (LP: #1187453). Fixes: 1187453, 1228711
Approved by: Tiago Salem Herrmann

880. By Tiago Salem Herrmann on 2014-08-13

- Reduce vibration duration for text messages
- Fix vibration in silent mode options for calls/messages Fixes: 1347908
Approved by: Gustavo Pichorim Boiko, PS Jenkins bot

881. By Gustavo Pichorim Boiko on 2014-08-13

Check if the self contact actually exists before getting its presence. Fixes: 1355388
Approved by: Tiago Salem Herrmann

882. By Gustavo Pichorim Boiko on 2014-08-13

Do not update the .po files during `make`, update only the .pot file.
Approved by: Tiago Salem Herrmann

883. By PS Jenkins bot on 2014-08-13

Releasing 0.1+14.10.20140813.1-0ubuntu1

884. By PS Jenkins bot on 2014-08-14

Resync trunk

885. By Tiago Salem Herrmann on 2014-08-14

Fix USSDManager for multiple accounts

886. By PS Jenkins bot on 2014-08-14

Releasing 0.1+14.10.20140814-0ubuntu1

887. By PS Jenkins bot on 2014-08-15

Resync trunk

[Leo Arias (elopio)]

Hey Tiago. Your branch is not proposed to merge. Can we land this one?
I'll add Pete Woods as a reviewer to ask him about plurals.

[lp:~aacid/telephony-service/mark_metrics_for_extraction]

888. By Launchpad Translations on behalf of phablet-team on 2014-08-16

Launchpad automatic translations update.

889. By Launchpad Translations on behalf of phablet-team on 2014-08-17

Launchpad automatic translations update.

890. By Launchpad Translations on behalf of phablet-team on 2014-08-18

Launchpad automatic translations update.

891. By Albert Astals Cid on 2014-08-18

Update .pot file

892. By Albert Astals Cid on 2014-08-20

Mark User Metrics strings for translation and extract them so they can get translated

893. By Albert Astals Cid on 2014-08-20

Run make telephony-service.pot after extraction fixes

[Manuel de la Peña (mandel)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:893
http://jenkins.qa.ubuntu.com/job/telephony-service-ci/292/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-utopic-amd64-ci/108
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-utopic-armhf-ci/108
        deb: http://jenkins.qa.ubuntu.com/job/telephony-service-utopic-armhf-ci/108/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-utopic-i386-ci/109

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/telephony-service-ci/292/rebuild

review: Approve (continuous-integration)

[Tiago Salem Herrmann (tiagosh)]

I am ok to land this too.
I will delete my old branch.
Thanks.

review: Approve

=== modified file 'indicator/metrics.cpp'
--- indicator/metrics.cpp	2013-09-26 18:20:05 +0000
+++ indicator/metrics.cpp	2014-08-20 09:38:38 +0000
@@ -30,6 +30,8 @@
 const QString DIALER_OUTGOING_STATISTICS_ID = QString("dialer-calls-outgoing");
 const QString DIALER_CALL_DURATION_STATISTICS_ID = QString("dialer-calls-duration");
 
+#define GettextMarkExtraction(x) x
+
 using namespace UserMetricsInput;
 
 Metrics::Metrics(QObject *parent) :
@@ -37,16 +39,16 @@
 {
     try {
         mMetricManager.reset(MetricManager::getInstance());
-        mMetrics[SentMessages] = mMetricManager->add(MetricParameters(MESSAGES_SENT_STATISTICS_ID).formatString("<b>%1</b> text messages sent today")
-                                                      .emptyDataString("No text messages sent today").textDomain(APP_ID).minimum(0.0));
-        mMetrics[ReceivedMessages] = mMetricManager->add(MetricParameters(MESSAGES_RECEIVED_STATISTICS_ID).formatString("<b>%1</b> text messages received today")
-                                                     .emptyDataString("No text messages received today").textDomain(APP_ID).minimum(0.0));
-        mMetrics[IncomingCalls] = mMetricManager->add(MetricParameters(DIALER_INCOMING_STATISTICS_ID).formatString("<b>%1</b> calls received today")
-                                                      .emptyDataString("No calls received today").textDomain(APP_ID).minimum(0.0));
-        mMetrics[OutgoingCalls] = mMetricManager->add(MetricParameters(DIALER_OUTGOING_STATISTICS_ID).formatString("<b>%1</b> calls made today")
-                                                      .emptyDataString("No calls made today").textDomain(APP_ID).minimum(0.0));
-        mMetrics[CallDurations] = mMetricManager->add(MetricParameters(DIALER_CALL_DURATION_STATISTICS_ID).formatString("Spent <b>%1</b> minutes in calls today")
-                                                      .emptyDataString("No calls made today").textDomain(APP_ID).minimum(0.0));
+        mMetrics[SentMessages] = mMetricManager->add(MetricParameters(MESSAGES_SENT_STATISTICS_ID).formatString(GettextMarkExtraction("<b>%1</b> text messages sent today"))
+                                                      .emptyDataString(GettextMarkExtraction("No text messages sent today")).textDomain(APP_ID).minimum(0.0));
+        mMetrics[ReceivedMessages] = mMetricManager->add(MetricParameters(MESSAGES_RECEIVED_STATISTICS_ID).formatString(GettextMarkExtraction("<b>%1</b> text messages received today"))
+                                                     .emptyDataString(GettextMarkExtraction("No text messages received today")).textDomain(APP_ID).minimum(0.0));
+        mMetrics[IncomingCalls] = mMetricManager->add(MetricParameters(DIALER_INCOMING_STATISTICS_ID).formatString(GettextMarkExtraction("<b>%1</b> calls received today"))
+                                                      .emptyDataString(GettextMarkExtraction("No calls received today")).textDomain(APP_ID).minimum(0.0));
+        mMetrics[OutgoingCalls] = mMetricManager->add(MetricParameters(DIALER_OUTGOING_STATISTICS_ID).formatString(GettextMarkExtraction("<b>%1</b> calls made today"))
+                                                      .emptyDataString(GettextMarkExtraction("No calls made today")).textDomain(APP_ID).minimum(0.0));
+        mMetrics[CallDurations] = mMetricManager->add(MetricParameters(DIALER_CALL_DURATION_STATISTICS_ID).formatString(GettextMarkExtraction("Spent <b>%1</b> minutes in calls today"))
+                                                      .emptyDataString(GettextMarkExtraction("No calls made today")).textDomain(APP_ID).minimum(0.0));
     } catch(std::exception &e) {
         qWarning() << "Error connecting to metrics service:" << e.what();
     }

=== modified file 'po/CMakeLists.txt'
--- po/CMakeLists.txt	2014-08-13 20:22:56 +0000
+++ po/CMakeLists.txt	2014-08-20 09:38:38 +0000
@@ -30,7 +30,7 @@
 if(XGETTEXT_EXECUTABLE)
     add_custom_target(${POT_FILE} ALL
         COMMENT "Generating translation template"
-        COMMAND ${XGETTEXT_EXECUTABLE} --c++ --qt --add-comments=TRANSLATORS --keyword=tr --keyword=tr:1,2 -D ${CMAKE_SOURCE_DIR} -s -p ${CMAKE_CURRENT_SOURCE_DIR} -o ${POT_FILE} ${I18N_SRCS}
+        COMMAND ${XGETTEXT_EXECUTABLE} --c++ --qt --add-comments=TRANSLATORS --keyword=GettextMarkExtraction --keyword=tr --keyword=tr:1,2 -D ${CMAKE_SOURCE_DIR} -s -p ${CMAKE_CURRENT_SOURCE_DIR} -o ${POT_FILE} ${I18N_SRCS}
     )
 
     add_custom_target(translations

=== modified file 'po/telephony-service.pot'
--- po/telephony-service.pot	2014-08-20 09:38:38 +0000
+++ po/telephony-service.pot	2014-08-20 09:38:38 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-18 09:41+0200\n"
+"POT-Creation-Date: 2014-08-20 11:37+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"
@@ -32,6 +32,26 @@
 msgstr[0] ""
 msgstr[1] ""
 
+#: indicator/metrics.cpp:48
+#, qt-format
+msgid "<b>%1</b> calls made today"
+msgstr ""
+
+#: indicator/metrics.cpp:46
+#, qt-format
+msgid "<b>%1</b> calls received today"
+msgstr ""
+
+#: indicator/metrics.cpp:44
+#, qt-format
+msgid "<b>%1</b> text messages received today"
+msgstr ""
+
+#: indicator/metrics.cpp:42
+#, qt-format
+msgid "<b>%1</b> text messages sent today"
+msgstr ""
+
 #: approver/approver.cpp:292
 msgid "Accept"
 msgstr ""
@@ -86,6 +106,22 @@
 msgid "Message from %1"
 msgstr ""
 
+#: indicator/metrics.cpp:49 indicator/metrics.cpp:51
+msgid "No calls made today"
+msgstr ""
+
+#: indicator/metrics.cpp:47
+msgid "No calls received today"
+msgstr ""
+
+#: indicator/metrics.cpp:45
+msgid "No text messages received today"
+msgstr ""
+
+#: indicator/metrics.cpp:43
+msgid "No text messages sent today"
+msgstr ""
+
 #: indicator/textchannelobserver.cpp:169 indicator/ussdindicator.cpp:79
 msgid "Ok"
 msgstr ""
@@ -123,6 +159,11 @@
 msgid "Sorry, I'm still busy. I'll call you later."
 msgstr ""
 
+#: indicator/metrics.cpp:50
+#, qt-format
+msgid "Spent <b>%1</b> minutes in calls today"
+msgstr ""
+
 #: indicator/messagingmenu.cpp:55 indicator/messagingmenu.cpp:59
 msgid "Telephony Service"
 msgstr ""