Merge lp:~thomas-voss/trust-store/lp-1596951 into lp:trust-store

[Thomas Voß]

Special case for handling CameraService translations.

Special case for handling CameraService translations.

[Simon Fels (morphis)]

LGTM

review: Approve

Unmerged revisions

159. By Thomas Voß on 2016-06-30

Special case for handling CameraService translations.

=== modified file 'po/trust-store.pot'
--- po/trust-store.pot	2016-01-12 20:04:43 +0000
+++ po/trust-store.pot	2016-06-30 21:35:42 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: trust-store\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-12 21:03+0100\n"
+"POT-Creation-Date: 2016-06-30 23:33+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"
@@ -17,14 +17,18 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: /home/tvoss/ubuntu/scratch/fix-1532870/src/core/trust/daemon.cpp:266
+#: /home/tvoss/ubuntu/scratch/lp-1596951/src/core/trust/daemon.cpp:171
 msgid "is trying to access"
 msgstr ""
 
-#: /home/tvoss/ubuntu/scratch/fix-1532870/src/core/trust/mir/prompt_main.qml:78
+#: /home/tvoss/ubuntu/scratch/lp-1596951/src/core/trust/daemon.cpp:173
+msgid "CameraService"
+msgstr ""
+
+#: /home/tvoss/ubuntu/scratch/lp-1596951/src/core/trust/mir/prompt_main.qml:78
 msgid "Allow"
 msgstr ""
 
-#: /home/tvoss/ubuntu/scratch/fix-1532870/src/core/trust/mir/prompt_main.qml:83
+#: /home/tvoss/ubuntu/scratch/lp-1596951/src/core/trust/mir/prompt_main.qml:83
 msgid "Don’t Allow"
 msgstr ""
 
=== modified file 'src/core/trust/daemon.cpp'
--- src/core/trust/daemon.cpp	2016-01-11 09:51:51 +0000
+++ src/core/trust/daemon.cpp	2016-06-30 21:35:42 +0000
@@ -168,6 +168,11 @@
                     "Missing endpoint specification for UnixDomainSocketRemoteAgent."
                 };
 
+                const auto default_description_pattern = core::trust::i18n::tr("is trying to access") + " " +
+                        (service_name == "CameraService"
+                            ? core::trust::i18n::tr("CameraService") // We have to special-case and mark CameraService to enable translations.
+                            : service_name) + ".";
+
                 core::trust::remote::posix::Skeleton::Configuration config
                 {
                     agent,
@@ -177,7 +182,7 @@
                     core::trust::remote::helpers::aa_get_task_con_app_id_resolver(),
                     dict.count("description-pattern") > 0 ?
                             dict.at("description-pattern") :
-                            core::trust::i18n::tr("is trying to access") + " " + service_name + ".",
+                            default_description_pattern,
                     dict.count("verify-process-timestamp") > 0
                 };