Merge lp:~thomas-voss/location-service/fix-1354092 into lp:location-service/trunk

[Thomas Voß]

Make the service translateable.

Make the service translateable.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:107
http://jenkins.qa.ubuntu.com/job/location-service-ci/293/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-utopic-amd64-ci/200/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-utopic-armhf-ci/200/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-utopic-i386-ci/200/console

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

review: Needs Fixing (continuous-integration)

[Loïc Minier (lool)]

This fails to build; could it be because of .mo files and langpacks?

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Manuel de la Peña (mandel)]

review: Approve

[Loïc Minier (lool)]

LGTM

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:110
http://jenkins.qa.ubuntu.com/job/location-service-ci/296/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/location-service-utopic-amd64-ci/203
    SUCCESS: http://jenkins.qa.ubuntu.com/job/location-service-utopic-armhf-ci/203
        deb: http://jenkins.qa.ubuntu.com/job/location-service-utopic-armhf-ci/203/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/location-service-utopic-i386-ci/203

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

review: Approve (continuous-integration)

[lp:~thomas-voss/location-service/fix-1354092]

111. By Thomas Voß on 2014-10-06

[ thomas-voss ]
* Implement heuristic to invalidate 3G cells after 60 seconds. (LP:
  #1371514)
[ thomas-voss ]
* Expose remote::Interface and respective stub/skeleton for using and
  exposing remote location providers.
* Add a standalone daemon for executing providers out of process.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:111
http://jenkins.qa.ubuntu.com/job/location-service-ci/310/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-utopic-amd64-ci/217/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-utopic-armhf-ci/217/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-utopic-i386-ci/217/console

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

review: Needs Fixing (continuous-integration)

[Alberto Aguirre (albaguirre)]

LGTM

review: Approve

[lp:~thomas-voss/location-service/fix-1354092]

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

Mark source package as using langpacks.

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

Remove langpack marker as location-service is in main.

[Martin Pitt (pitti)]

packaging ack, thanks!

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-07-31 09:57:46 +0000
+++ CMakeLists.txt	2014-10-08 09:05:02 +0000
@@ -78,6 +78,7 @@
 add_subdirectory(doc)
 add_subdirectory(examples)
 add_subdirectory(include)
+add_subdirectory(po)
 add_subdirectory(src)
 add_subdirectory(tests)
 

=== modified file 'data/ubuntu-location-service-trust-stored.conf.in'
--- data/ubuntu-location-service-trust-stored.conf.in	2014-09-15 18:26:04 +0000
+++ data/ubuntu-location-service-trust-stored.conf.in	2014-10-08 09:05:02 +0000
@@ -18,5 +18,6 @@
         --local-agent MirAgent \
         --trusted-mir-socket=/var/run/user/$(id -u)/mir_socket_trusted \
         --for-service UbuntuLocationService \
+        --with-text-domain ubuntu-location-service \
         --store-bus session
 end script

=== modified file 'debian/ubuntu-location-service-bin.install'
--- debian/ubuntu-location-service-bin.install	2014-09-17 13:26:15 +0000
+++ debian/ubuntu-location-service-bin.install	2014-10-08 09:05:02 +0000
@@ -1,5 +1,6 @@
 etc/dbus-1/system.d/
 etc/init/*
+usr/share/locale/*
 usr/share/upstart/sessions/ubuntu-location-service-trust-stored.conf
 usr/bin/ubuntu-location-service-providerd
 usr/bin/ubuntu-location-serviced

=== 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:05:02 +0000
@@ -0,0 +1,37 @@
+include(FindGettext REQUIRED)
+find_program(GETTEXT_XGETTEXT_EXECUTABLE xgettext)
+
+set(DOMAIN ubuntu-location-service)
+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)
+
+list(SORT I18N_CPP_SRC_FILES)
+
+add_custom_target(
+    ubuntu-location-service-pot
+    COMMAND ${GETTEXT_XGETTEXT_EXECUTABLE}
+        --default-domain=ubuntu-location-service
+        --output=${POT_FILE}
+        --from-code=UTF-8
+        --c++ --add-comments=TRANSLATORS
+        --keyword='tr'
+        --boost
+        --package-name=ubuntu-location-service
+        --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:05:02 +0000
@@ -0,0 +1,30 @@
+# Copyright (C) 2014 Canonical Ltd.
+# This file is distributed under the same license as the ubuntu-location-service package.
+# Thomas Voß <[e-mail]>, 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ubuntu-location-service\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-09-19 01:04+0200\n"
+"PO-Revision-Date: 2014-09-19 09:27+0100\n"
+"Last-Translator: Thomas Voß <[e-mail]>\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/i18n/src/location_service/com/ubuntu/location/service/trust_store_permission_manager.cpp:170
+msgid "An unconfined application wants to access your current location."
+msgstr ""
+"Eine App mit uneingeschränkten Zugriffsrechten möchte auf Ihre aktuelle "
+"Position zugreifen. Möchten Sie dieser Applikation vertrauen?"
+
+#: /tmp/i18n/src/location_service/com/ubuntu/location/service/trust_store_permission_manager.cpp:173
+#, boost-format
+msgid "%1% wants to access your current location."
+msgstr ""
+"%1% will auf Ihre aktuelle Position zugreifen. Möchten Sie dieser "
+"Applikation vertrauen?"

=== added file 'po/ubuntu-location-service.pot'
--- po/ubuntu-location-service.pot	1970-01-01 00:00:00 +0000
+++ po/ubuntu-location-service.pot	2014-10-08 09:05:02 +0000
@@ -0,0 +1,26 @@
+# Copyright (C) 2014 Canonical Ltd.
+# This file is distributed under the same license as the ubuntu-location-service package.
+# Thomas Voß <[e-mail]>, 2014.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: ubuntu-location-service\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-09-19 01:04+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/i18n/src/location_service/com/ubuntu/location/service/trust_store_permission_manager.cpp:170
+msgid "An unconfined application wants to access your current location."
+msgstr ""
+
+#: /tmp/i18n/src/location_service/com/ubuntu/location/service/trust_store_permission_manager.cpp:173
+#, boost-format
+msgid "%1% wants to access your current location."
+msgstr ""

=== modified file 'src/location_service/com/ubuntu/location/service/trust_store_permission_manager.cpp'
--- src/location_service/com/ubuntu/location/service/trust_store_permission_manager.cpp	2014-08-14 20:31:09 +0000
+++ src/location_service/com/ubuntu/location/service/trust_store_permission_manager.cpp	2014-10-08 09:05:02 +0000
@@ -28,6 +28,8 @@
 
 #include <core/posix/this_process.h>
 
+#include <boost/format.hpp>
+
 #include <sys/apparmor.h>
 
 namespace location = com::ubuntu::location;
@@ -42,6 +44,17 @@
                 "0") == "1";
 
 }
+
+namespace i18n
+{
+// We only tag strings that should be translated but do not do the actual translation.
+// Point is: The service might run in a system context, without correct locale information.
+// We leave the translation to in-session trust-store instances.
+std::string tr(const std::string& msg)
+{
+    return msg;
+}
+}
 }
 
 service::TrustStorePermissionManager::AppArmorProfileResolver service::TrustStorePermissionManager::libapparmor_profile_resolver()
@@ -133,15 +146,7 @@
         return service::PermissionManager::Result::rejected;
     }
 
-    std::string description;
-
-    if (profile == "unconfined")
-    {
-        description = "An unconfined application wants to access your current location.";
-    } else
-    {
-        description = profile + " wants to access your current location.";
-    }
+    std::string description = i18n::tr("%1% wants to access your current location.");
 
     core::trust::Agent::RequestParameters params
     {