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

[Thomas Voß]

Add i18n support to trust-store.

Add i18n support to trust-store.

[Loïc Minier (lool)]

LGTM, even if I dont fully grasp the mutable_service_text_domain() = domain; stuff

review: Approve

[Víctor R. Ruiz (vrruiz)]

It doesn't compile for me.

/home/phablet/trust-store/src/core/trust/daemon.cpp:334: undefined reference to `core::trust::i18n::set_service_text_domain(std::string const&)'
collect2: error: ld returned 1 exit status

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:44
http://jenkins.qa.ubuntu.com/job/trust-store-ci/66/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/trust-store-utopic-amd64-ci/66/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/trust-store-utopic-armhf-ci/66/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/trust-store-utopic-i386-ci/66/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

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

41. By Thomas Voß on 2014-10-01

Throw on invalid mir connection or invalid prompt session. Fixes: 1370444
Approved by: Alberto Aguirre, PS Jenkins bot

42. By PS Jenkins bot on 2014-10-01

Replaced 0replaceme with real versions.

43. By PS Jenkins bot on 2014-10-01

Releasing 1.0.0+14.10.20141001-0ubuntu1

44. By Alberto Aguirre on 2014-10-06

Attempt mir connection more than once Fixes: 1377159
Approved by: PS Jenkins bot, Thomas Voß

45. By PS Jenkins bot on 2014-10-06

Releasing 1.0.0+14.10.20141006-0ubuntu1

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Alberto Aguirre (albaguirre)]

LGTM

review: Approve

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Martin Pitt (pitti)]

Packaging fixes ack. (as discussed on IRC)

review: Approve

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

46. By Thomas Voß on 2014-10-08

Add i18n support to trust-store. Fixes: 1353333, 1354092, 1367707
Approved by: Loïc Minier, Alberto Aguirre, PS Jenkins bot, Martin Pitt

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-08-13 08:24:18 +0000
+++ CMakeLists.txt	2014-10-08 09:35:22 +0000
@@ -48,7 +48,7 @@
 pkg_check_modules(PROCESS_CPP process-cpp REQUIRED)
 
 set(TRUST_STORE_VERSION_MAJOR 1)
-set(TRUST_STORE_VERSION_MINOR 0)
+set(TRUST_STORE_VERSION_MINOR 1)
 set(TRUST_STORE_VERSION_PATCH 0)
 
 include(CTest)
@@ -64,6 +64,7 @@
 add_subdirectory(doc)
 add_subdirectory(data)
 add_subdirectory(include)
+add_subdirectory(po)
 add_subdirectory(src)
 add_subdirectory(tests)
 

=== modified file 'debian/changelog'
--- debian/changelog	2014-10-06 16:36:29 +0000
+++ debian/changelog	2014-10-08 09:35:22 +0000
@@ -1,3 +1,9 @@
+trust-store (1.1.0) UNRELEASED; urgency=medium
+
+  * Add i18n support to the store.
+
+ -- Thomas Voß <[e-mail]>  Fri, 19 Sep 2014 21:51:00 +0200
+
 trust-store (1.0.0+14.10.20141006-0ubuntu1) utopic; urgency=low
 
   [ Alberto Aguirre ]

=== modified file 'debian/libtrust-store1.install'
--- debian/libtrust-store1.install	2014-08-06 11:31:59 +0000
+++ debian/libtrust-store1.install	2014-10-08 09:35:22 +0000
@@ -1,1 +1,2 @@
 usr/lib/*/lib*.so.*
+

=== removed symlink 'debian/libtrust-store1.install.amd64'
=== target was u'libtrust-store1.install.with_mir'
=== removed symlink 'debian/libtrust-store1.install.arm64'
=== target was u'libtrust-store1.install.with_mir'
=== removed symlink 'debian/libtrust-store1.install.armhf'
=== target was u'libtrust-store1.install.with_mir'
=== removed symlink 'debian/libtrust-store1.install.i386'
=== target was u'libtrust-store1.install.with_mir'
=== removed file 'debian/libtrust-store1.install.with_mir'
--- debian/libtrust-store1.install.with_mir	2014-08-06 11:31:59 +0000
+++ debian/libtrust-store1.install.with_mir	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-usr/lib/*/lib*.so.*
-usr/lib/*/trust-prompt
-usr/share/core/trust/mir/*

=== modified file 'debian/libtrust-store1.symbols'
--- debian/libtrust-store1.symbols	2014-10-01 20:32:28 +0000
+++ debian/libtrust-store1.symbols	2014-10-08 09:35:22 +0000
@@ -1,4 +1,9 @@
 libtrust-store.so.1 libtrust-store1 #MINVER#
+ (c++)"core::trust::i18n::default_text_domain()@Base" 0replaceme
+ (c++)"core::trust::i18n::service_text_domain()@Base" 0replaceme
+ (c++)"core::trust::i18n::set_service_text_domain(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0replaceme
+ (c++)"core::trust::i18n::tr(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0replaceme
+ (c++)"core::trust::i18n::tr(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0replaceme
  (c++)"core::trust::CachedAgent::Configuration::~Configuration()@Base" 1.0.0+14.10.20140806.7
  (c++)"core::trust::CachedAgent::authenticate_request_with_parameters(core::trust::Agent::RequestParameters const&)@Base" 1.0.0+14.10.20140806.7
  (c++)"core::trust::CachedAgent::Reporter::report_cached_answer_found(core::trust::Agent::RequestParameters const&, core::trust::Request const&)@Base" 1.0.0+14.10.20140814.1

=== modified file 'debian/trust-store-bin.install'
--- debian/trust-store-bin.install	2014-07-29 20:39:51 +0000
+++ debian/trust-store-bin.install	2014-10-08 09:35:22 +0000
@@ -1,1 +1,2 @@
-usr/bin/trust*
\ No newline at end of file
+usr/bin/trust*
+usr/share/locale/*

=== added symlink 'debian/trust-store-bin.install.amd64'
=== target is u'trust-store-bin.install.with_mir'
=== added symlink 'debian/trust-store-bin.install.arm64'
=== target is u'trust-store-bin.install.with_mir'
=== added symlink 'debian/trust-store-bin.install.armhf'
=== target is u'trust-store-bin.install.with_mir'
=== added symlink 'debian/trust-store-bin.install.i386'
=== target is u'trust-store-bin.install.with_mir'
=== added file 'debian/trust-store-bin.install.with_mir'
--- debian/trust-store-bin.install.with_mir	1970-01-01 00:00:00 +0000
+++ debian/trust-store-bin.install.with_mir	2014-10-08 09:35:22 +0000
@@ -0,0 +1,4 @@
+usr/bin/trust*
+usr/lib/*/trust-prompt
+usr/share/locale/*
+usr/share/core/trust/mir/*
\ No newline at end of file

=== added directory 'po'
=== added file 'po/CMakeLists.txt'
--- po/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ po/CMakeLists.txt	2014-10-08 09:35:22 +0000
@@ -0,0 +1,37 @@
+include(FindGettext REQUIRED)
+find_program(GETTEXT_XGETTEXT_EXECUTABLE xgettext)
+
+set(DOMAIN trust-store)
+set(POT_FILE ${CMAKE_CURRENT_SOURCE_DIR}/${DOMAIN}.pot)
+file(GLOB PO_FILES *.po)
+
+# We look through all source files and find
+# usages of i18n::tr.
+file(
+    GLOB_RECURSE I18N_CPP_SRC_FILES
+    ${CMAKE_SOURCE_DIR}/src/*.cpp ${CMAKE_SOURCE_DIR}/src/*.qml)
+
+list(SORT I18N_CPP_SRC_FILES)
+
+add_custom_target(
+    trust-store-pot
+    COMMAND ${GETTEXT_XGETTEXT_EXECUTABLE}
+        --default-domain=trust-store
+        --output=${POT_FILE}
+        --from-code=UTF-8
+        --c++ --add-comments=TRANSLATORS
+        --keyword='tr'
+        --boost
+        --package-name=trust-store
+        --copyright-holder='Canonical Ltd.'
+        ${I18N_CPP_SRC_FILES})
+
+foreach(PO_FILE ${PO_FILES})
+    get_filename_component(LANG ${PO_FILE} NAME_WE)
+    gettext_process_po_files(${LANG} ALL PO_FILES ${PO_FILE})
+    set(INSTALL_DIR ${CMAKE_INSTALL_LOCALEDIR}/${LANG}/LC_MESSAGES)
+    install(
+        FILES ${CMAKE_CURRENT_BINARY_DIR}/${LANG}.gmo
+        DESTINATION ${INSTALL_DIR}
+        RENAME ${DOMAIN}.mo)
+endforeach(PO_FILE)

=== added file 'po/de.po'
--- po/de.po	1970-01-01 00:00:00 +0000
+++ po/de.po	2014-10-08 09:35:22 +0000
@@ -0,0 +1,24 @@
+# Copyright (C) 2014 Canonical Ltd.
+# This file is distributed under the same license as the PACKAGE package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: trust-store\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-09-19 16:15+0200\n"
+"PO-Revision-Date: 2014-09-19 16:29+0100\n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.5.4\n"
+"Language: de\n"
+
+#: /tmp/trust-store-i18n/src/core/trust/mir/prompt_main.qml:42
+msgid "Deny"
+msgstr "Verbieten"
+
+#: /tmp/trust-store-i18n/src/core/trust/mir/prompt_main.qml:49
+msgid "Allow"
+msgstr "Erlauben"

=== added file 'po/trust-store.pot'
--- po/trust-store.pot	1970-01-01 00:00:00 +0000
+++ po/trust-store.pot	2014-10-08 09:35:22 +0000
@@ -0,0 +1,24 @@
+# Copyright (C) 2014 Canonical Ltd.
+# This file is distributed under the same license as the PACKAGE package.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: trust-store\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-09-19 16:15+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"
+
+#: /tmp/trust-store-i18n/src/core/trust/mir/prompt_main.qml:42
+msgid "Deny"
+msgstr ""
+
+#: /tmp/trust-store-i18n/src/core/trust/mir/prompt_main.qml:49
+msgid "Allow"
+msgstr ""

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2014-08-19 14:11:30 +0000
+++ src/CMakeLists.txt	2014-10-08 09:35:22 +0000
@@ -35,6 +35,10 @@
 set(
   TRUST_STORE_AGENT_SOURCES
 
+  # Translation helper
+  core/trust/i18n.h
+  core/trust/i18n.cpp
+
   # An agent-implementation transforming ensuring legible application ids.
   core/trust/app_id_formatting_trust_agent.h
   core/trust/app_id_formatting_trust_agent.cpp
@@ -87,11 +91,6 @@
     core/trust/mir/prompt_main.cpp
   )
 
-  set_target_properties(
-    trust-prompt
-    PROPERTIES INCLUDE_DIRECTORIES ${CMAKE_CURRENT_BINARY_DIR}/core/trust/mir
-  )
-
   qt5_use_modules(trust-prompt Core Gui Qml Quick)
 
   target_link_libraries(

=== modified file 'src/core/trust/daemon.cpp'
--- src/core/trust/daemon.cpp	2014-10-06 14:46:58 +0000
+++ src/core/trust/daemon.cpp	2014-10-08 09:35:22 +0000
@@ -21,6 +21,7 @@
 #include <core/trust/app_id_formatting_trust_agent.h>
 #include <core/trust/cached_agent.h>
 #include <core/trust/expose.h>
+#include <core/trust/i18n.h>
 #include <core/trust/store.h>
 
 #include <core/trust/mir_agent.h>
@@ -311,6 +312,7 @@
     Options::options_description options{"Known options"};
     options.add_options()
             (Parameters::ForService::name, Options::value<std::string>()->required(), Parameters::ForService::description)
+            (Parameters::WithTextDomain::name, Options::value<std::string>(), Parameters::WithTextDomain::description)
             (Parameters::StoreBus::name, Options::value<std::string>()->default_value("session"), Parameters::StoreBus::description)
             (Parameters::LocalAgent::name, Options::value<std::string>()->required(), Parameters::LocalAgent::description)
             (Parameters::RemoteAgent::name, Options::value<std::string>()->required(), Parameters::RemoteAgent::description);
@@ -338,6 +340,13 @@
 
     auto service_name = vm[Parameters::ForService::name].as<std::string>();
 
+    auto service_text_domain = service_name;
+
+    if (vm.count(Parameters::WithTextDomain::name) > 0)
+        service_text_domain = vm[Parameters::WithTextDomain::name].as<std::string>();
+
+    core::trust::i18n::set_service_text_domain(service_text_domain);
+
     auto local_agent_factory = core::trust::Daemon::Skeleton::known_local_agent_factories()
             .at(vm[Parameters::LocalAgent::name].as<std::string>());
 

=== modified file 'src/core/trust/daemon.h'
--- src/core/trust/daemon.h	2014-07-30 08:20:19 +0000
+++ src/core/trust/daemon.h	2014-10-08 09:35:22 +0000
@@ -143,6 +143,12 @@
                 static constexpr const char* description{"The name of the service to handle trust for"};
             };
 
+            struct WithTextDomain
+            {
+                static constexpr const char* name{"with-text-domain"};
+                static constexpr const char* description{"The text domain that should be used for translations"};
+            };
+
             struct LocalAgent
             {
                 static constexpr const char* name{"local-agent"};

=== added file 'src/core/trust/i18n.cpp'
--- src/core/trust/i18n.cpp	1970-01-01 00:00:00 +0000
+++ src/core/trust/i18n.cpp	2014-10-08 09:35:22 +0000
@@ -0,0 +1,85 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Thomas Voß <[e-mail]>
+ */
+
+#include <core/trust/i18n.h>
+
+#include <libintl.h>
+
+#include <clocale>
+
+#include <iostream>
+
+namespace
+{
+static constexpr const char* this_text_domain
+{
+    "trust-store"
+};
+
+std::string& mutable_service_text_domain()
+{
+    static std::string s{this_text_domain};
+    return s;
+}
+
+bool init()
+{
+    // Make sure that *gettext calls work correctly.
+    std::setlocale(LC_ALL, "");
+
+    ::bindtextdomain(this_text_domain, nullptr);
+    ::textdomain(this_text_domain);
+
+    return true;
+}
+
+static const bool initialized = init();
+}
+
+std::string core::trust::i18n::default_text_domain()
+{
+    return this_text_domain;
+}
+
+// Returns the text domain of the service we are acting for
+std::string core::trust::i18n::service_text_domain()
+{
+    return mutable_service_text_domain();
+}
+
+// Adjusts the text domain of the service;
+void core::trust::i18n::set_service_text_domain(const std::string& domain)
+{
+    mutable_service_text_domain() = domain;
+}
+
+std::string core::trust::i18n::tr(const std::string& in)
+{
+    if (not initialized)
+        return in;
+
+    return ::gettext(in.c_str());
+}
+
+std::string core::trust::i18n::tr(const std::string& in, const std::string& domain)
+{
+    if (not initialized)
+        return in;
+
+    return ::dgettext(domain.c_str(), in.c_str());
+}

=== added file 'src/core/trust/i18n.h'
--- src/core/trust/i18n.h	1970-01-01 00:00:00 +0000
+++ src/core/trust/i18n.h	2014-10-08 09:35:22 +0000
@@ -0,0 +1,46 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Thomas Voß <[e-mail]>
+ */
+
+#ifndef CORE_TRUST_I18N_H_
+#define CORE_TRUST_I18N_H_
+
+#include <core/trust/visibility.h>
+
+#include <string>
+
+namespace core
+{
+namespace trust
+{
+namespace i18n
+{
+// Returns the default text domain of this package.
+CORE_TRUST_DLL_PUBLIC std::string default_text_domain();
+// Returns the text domain of the service we are acting for
+CORE_TRUST_DLL_PUBLIC std::string service_text_domain();
+// Adjusts the text domain of the service;
+CORE_TRUST_DLL_PUBLIC void set_service_text_domain(const std::string& domain);
+// Translates the given input string for the default domain.
+CORE_TRUST_DLL_PUBLIC std::string tr(const std::string& in);
+// Translates the given input string for the given domain.
+CORE_TRUST_DLL_PUBLIC std::string tr(const std::string& in, const std::string& domain);
+}
+}
+}
+
+#endif // CORE_TRUST_I18N_H_

=== modified file 'src/core/trust/mir/agent.cpp'
--- src/core/trust/mir/agent.cpp	2014-10-03 22:09:14 +0000
+++ src/core/trust/mir/agent.cpp	2014-10-08 09:35:22 +0000
@@ -20,6 +20,12 @@
 #include "prompt_main.h"
 #include <core/trust/mir_agent.h>
 
+#include <core/trust/i18n.h>
+
+#include <boost/format.hpp>
+
+#include <regex>
+
 // For getuid
 #include <fcntl.h>
 #include <unistd.h>
@@ -128,11 +134,28 @@
 {
     static auto child_setup = []() {};
 
+    // We translate to human readable strings here, and do it a non-translateable way first
+    // We post-process the application id and try to extract the unversioned package name.
+    // Please see https://wiki.ubuntu.com/AppStore/Interfaces/ApplicationId.
+    static const std::regex regex_full_app_id{"(.*)_(.*)_(.*)"};
+    static const std::regex regex_short_app_id{"(.*)_(.*)"};
+    static constexpr std::size_t index_app{2};
+
+    auto app_name = args.application_id;
+
+    std::smatch match;
+    if (std::regex_match(app_name, match, regex_full_app_id))
+        app_name = std::string{match[index_app]};
+    else if (std::regex_match(app_name, match, regex_short_app_id))
+        app_name = std::string{match[index_app]};
+
+    auto description = (boost::format(i18n::tr(args.description, i18n::service_text_domain())) % app_name).str();
+
     std::vector<std::string> argv
     {
         "--" + std::string{core::trust::mir::cli::option_server_socket}, "fd://" + std::to_string(args.fd),
-        "--" + std::string{core::trust::mir::cli::option_title}, args.application_id,
-        "--" + std::string{core::trust::mir::cli::option_description}, args.description
+        "--" + std::string{core::trust::mir::cli::option_title}, app_name,
+        "--" + std::string{core::trust::mir::cli::option_description}, description
     };
 
     // We just copy the environment

=== modified file 'src/core/trust/mir/agent.h'
--- src/core/trust/mir/agent.h	2014-09-18 20:57:58 +0000
+++ src/core/trust/mir/agent.h	2014-10-08 09:35:22 +0000
@@ -128,7 +128,7 @@
     {
         // The pre-authenticated fd that the helper
         // should use for connecting to Mir.
-        int fd;
+        int fd;        
         // The application id of the requesting app.
         std::string application_id;
         // The extended description that should be presented to the user.
@@ -178,14 +178,13 @@
     static std::function<core::trust::Request::Answer(const core::posix::wait::Result&)> translator_only_accepting_exit_status_success();
 
     // Creates a new MirAgent instance with the given MirConnectionVirtualTable instance.
-    Agent(
-            // VTable object providing access to Mir's trusted prompting functionality.
-            const ConnectionVirtualTable::Ptr& connection_vtable,
-            // Exec helper for starting up prompt provider child processes with the correct setup
-            // of command line arguments and environment variables.
-            const PromptProviderHelper::Ptr& exec_helper,
-            // A translator function for mapping child process exit states to trust::Request answers.
-            const std::function<core::trust::Request::Answer(const core::posix::wait::Result&)>& translator);
+    Agent(// VTable object providing access to Mir's trusted prompting functionality.
+          const ConnectionVirtualTable::Ptr& connection_vtable,
+          // Exec helper for starting up prompt provider child processes with the correct setup
+          // of command line arguments and environment variables.
+          const PromptProviderHelper::Ptr& exec_helper,
+          // A translator function for mapping child process exit states to trust::Request answers.
+          const std::function<core::trust::Request::Answer(const core::posix::wait::Result&)>& translator);
 
     // From core::trust::Agent:
     // Throws a std::logic_error if anything unforeseen happens during execution, thus

=== modified file 'src/core/trust/mir/prompt_main.cpp'
--- src/core/trust/mir/prompt_main.cpp	2014-08-05 08:56:32 +0000
+++ src/core/trust/mir/prompt_main.cpp	2014-10-08 09:35:22 +0000
@@ -31,6 +31,8 @@
 #include <boost/program_options.hpp>
 #include <boost/program_options/environment_iterator.hpp>
 
+#include <core/trust/i18n.h>
+
 #include <core/posix/this_process.h>
 
 #include "prompt_config.h"

=== modified file 'tests/mir_agent_test.cpp'
--- tests/mir_agent_test.cpp	2014-09-18 20:57:58 +0000
+++ tests/mir_agent_test.cpp	2014-10-08 09:35:22 +0000
@@ -173,7 +173,7 @@
     {
         42,
         "does.not.exist.application",
-        "Just an extended description"
+        "Just an extended description for %1%"
     };
 
     core::trust::mir::PromptProviderHelper helper{cargs};
@@ -195,7 +195,7 @@
     const core::trust::Pid app_pid {21};
     const std::string app_id {"does.not.exist.application"};
     const core::trust::Feature feature{42};
-    const std::string app_description {"This is just an extended description"};
+    const std::string app_description {"This is just an extended description %1%"};
     const int pre_authenticated_fd {42};
 
     const core::trust::mir::PromptProviderHelper::InvocationArguments reference_invocation_args
@@ -252,7 +252,7 @@
     const core::trust::Pid app_pid {21};
     const std::string app_id {"does.not.exist.application"};
     const core::trust::Feature feature{42};
-    const std::string app_description {"This is just an extended description"};
+    const std::string app_description {"This is just an extended description for %1%"};
     const int pre_authenticated_fd {42};
 
     auto a_spinning_process = []()