trust-store

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

  1. lp-1596951
  2. Merge into trunk
Proposed by Thomas Voß
Status: Approved
Approved by: Thomas Voß
Approved revision: 159
Proposed branch: lp:~thomas-voss/trust-store/lp-1596951
Merge into: lp:trust-store
Diff against target: 58 lines (+14/-5)
2 files modified
po/trust-store.pot (+8/-4)
src/core/trust/daemon.cpp (+6/-1)
To merge this branch: bzr merge lp:~thomas-voss/trust-store/lp-1596951
Reviewer Review Type Date Requested Status
Simon Fels Approve
PS Jenkins bot continuous-integration Pending
Review via email: mp+298839@code.launchpad.net

Commit message

Special case for handling CameraService translations.

Description of the change

Special case for handling CameraService translations.

To post a comment you must log in.
Revision history for this message
Simon Fels (morphis) wrote :

LGTM

review: Approve
Reply

Unmerged revisions

159. By Thomas Voß

Special case for handling CameraService translations.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'po/trust-store.pot'
2--- po/trust-store.pot 2016-01-12 20:04:43 +0000
3+++ po/trust-store.pot 2016-06-30 21:35:42 +0000
4@@ -8,7 +8,7 @@
5 msgstr ""
6 "Project-Id-Version: trust-store\n"
7 "Report-Msgid-Bugs-To: \n"
8-"POT-Creation-Date: 2016-01-12 21:03+0100\n"
9+"POT-Creation-Date: 2016-06-30 23:33+0200\n"
10 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
11 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
12 "Language-Team: LANGUAGE <LL@li.org>\n"
13@@ -17,14 +17,18 @@
14 "Content-Type: text/plain; charset=UTF-8\n"
15 "Content-Transfer-Encoding: 8bit\n"
16
17-#: /home/tvoss/ubuntu/scratch/fix-1532870/src/core/trust/daemon.cpp:266
18+#: /home/tvoss/ubuntu/scratch/lp-1596951/src/core/trust/daemon.cpp:171
19 msgid "is trying to access"
20 msgstr ""
21
22-#: /home/tvoss/ubuntu/scratch/fix-1532870/src/core/trust/mir/prompt_main.qml:78
23+#: /home/tvoss/ubuntu/scratch/lp-1596951/src/core/trust/daemon.cpp:173
24+msgid "CameraService"
25+msgstr ""
26+
27+#: /home/tvoss/ubuntu/scratch/lp-1596951/src/core/trust/mir/prompt_main.qml:78
28 msgid "Allow"
29 msgstr ""
30
31-#: /home/tvoss/ubuntu/scratch/fix-1532870/src/core/trust/mir/prompt_main.qml:83
32+#: /home/tvoss/ubuntu/scratch/lp-1596951/src/core/trust/mir/prompt_main.qml:83
33 msgid "Don’t Allow"
34 msgstr ""
35
36=== modified file 'src/core/trust/daemon.cpp'
37--- src/core/trust/daemon.cpp 2016-01-11 09:51:51 +0000
38+++ src/core/trust/daemon.cpp 2016-06-30 21:35:42 +0000
39@@ -168,6 +168,11 @@
40 "Missing endpoint specification for UnixDomainSocketRemoteAgent."
41 };
42
43+ const auto default_description_pattern = core::trust::i18n::tr("is trying to access") + " " +
44+ (service_name == "CameraService"
45+ ? core::trust::i18n::tr("CameraService") // We have to special-case and mark CameraService to enable translations.
46+ : service_name) + ".";
47+
48 core::trust::remote::posix::Skeleton::Configuration config
49 {
50 agent,
51@@ -177,7 +182,7 @@
52 core::trust::remote::helpers::aa_get_task_con_app_id_resolver(),
53 dict.count("description-pattern") > 0 ?
54 dict.at("description-pattern") :
55- core::trust::i18n::tr("is trying to access") + " " + service_name + ".",
56+ default_description_pattern,
57 dict.count("verify-process-timestamp") > 0
58 };
59

Subscribers

People subscribed via source and target branches