Merge lp:~thomas-voss/trust-store/qml-fix-1354092 into lp:trust-store

[Thomas Voß]

Select correct gettext domain for the trust prompt.

Select correct gettext domain for the trust prompt.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:72
http://jenkins.qa.ubuntu.com/job/trust-store-ci/80/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/trust-store-vivid-amd64-ci/1/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/trust-store-vivid-armhf-ci/1
        deb: http://jenkins.qa.ubuntu.com/job/trust-store-vivid-armhf-ci/1/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/trust-store-vivid-i386-ci/1

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/trust-store-ci/80/rebuild

review: Needs Fixing (continuous-integration)

[David Planella (dpm)]

See inline comment. However, I still don't manage to get the prompt using OSMTouch on mako.

review: Needs Fixing

[Sebastien Bacher (seb128)]

That doesn't seem to work, the dialog fails to load with this change

review: Needs Fixing

[lp:~thomas-voss/trust-store/qml-fix-1354092]

73. By Thomas Voß on 2014-11-06

Adjust gettext domain in main.cpp.

[David Planella (dpm)]

After talking to the SDK guys, what they suggested was:

        Button {
            objectName: "deny"
- text: i18n.tr("Deny")
+ text: i18n.dtr("trust-store", "Deny")
            color: UbuntuColors.red
            onClicked: quit(1)
        }

        Button {
            objectName: "allow"
- text: i18n.tr("Allow")
+ text: i18n.dtr("trust-store", "Allow")
            color: UbuntuColors.green
            onClicked: quit(0)

This seems to work for me after testing it on the phone.

[Michał Sawicz (saviq)]

Yup, that's the approach we employ. Only way to make sure the domain is set early enough.

review: Approve (code)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:73
http://jenkins.qa.ubuntu.com/job/trust-store-ci/81/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/trust-store-vivid-amd64-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/trust-store-vivid-armhf-ci/2
        deb: http://jenkins.qa.ubuntu.com/job/trust-store-vivid-armhf-ci/2/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/trust-store-vivid-i386-ci/2

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/trust-store-ci/81/rebuild

review: Approve (continuous-integration)

[lp:~thomas-voss/trust-store/qml-fix-1354092]

74. By Thomas Voß on 2014-11-07

Enfore initialization on query for default text domain.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:74
http://jenkins.qa.ubuntu.com/job/trust-store-ci/82/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/trust-store-vivid-amd64-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/trust-store-vivid-armhf-ci/3
        deb: http://jenkins.qa.ubuntu.com/job/trust-store-vivid-armhf-ci/3/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/trust-store-vivid-i386-ci/3

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/trust-store-ci/82/rebuild

review: Approve (continuous-integration)

[Sebastien Bacher (seb128)]

Looks good, and confirmed to be working on silo 5, thanks

review: Approve

[David Planella (dpm)]

Same here, also successful test from silo 5.

review: Approve

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2014-10-15 14:16:09 +0000
+++ src/CMakeLists.txt	2014-11-07 08:17:57 +0000
@@ -90,6 +90,10 @@
   add_executable(
     trust-prompt
 
+    # Translation helper
+    core/trust/i18n.h
+    core/trust/i18n.cpp
+
     core/trust/mir/prompt_main.cpp
   )
 

=== modified file 'src/core/trust/i18n.cpp'
--- src/core/trust/i18n.cpp	2014-10-14 07:22:40 +0000
+++ src/core/trust/i18n.cpp	2014-11-07 08:17:57 +0000
@@ -57,6 +57,9 @@
 
 std::string core::trust::i18n::default_text_domain()
 {
+    if (not is_initialized())
+        return std::string{};
+
     return this_text_domain;
 }
 

=== modified file 'src/core/trust/mir/prompt_main.cpp'
--- src/core/trust/mir/prompt_main.cpp	2014-09-19 14:30:12 +0000
+++ src/core/trust/mir/prompt_main.cpp	2014-11-07 08:17:57 +0000
@@ -142,6 +142,9 @@
                     vm[core::trust::mir::cli::option_server_socket].as<std::string>());
     }
 
+    // We install our default gettext domain prior to anything qt.
+    core::trust::i18n::default_text_domain();
+
     // We install a custom message handler to silence Qt's chattiness
     qInstallMessageHandler([](QtMsgType type, const QMessageLogContext&, const QString& msg)
     {