Merge lp:~unity-api-team/libusermetrics/read-translations-from-click into lp:libusermetrics/rtm-14.09

[Pete Woods]

Read translations from click packages

Read translations from click packages

[lp:~unity-api-team/libusermetrics/read-translations-from-click]

190. By Pete Woods on 2015-01-29

Remove debugging code

191. By Pete Woods on 2015-01-29

Remove noise

192. By Pete Woods on 2015-02-18

There's a new leak in QNetworkAccessManager

193. By Pete Woods on 2015-02-18

Build under latest Qt revision

194. By Pete Woods on 2015-02-18

More fixes for new Qt version

195. By Pete Woods on 2015-02-18

Disable pointless test

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-09-26 09:12:58 +0000
+++ CMakeLists.txt	2015-02-18 16:24:46 +0000
@@ -40,6 +40,15 @@
 find_package(Qt5Qml REQUIRED)
 include_directories(${Qt5Qml_INCLUDE_DIRS})
 
+pkg_check_modules(GLIB2 REQUIRED glib-2.0)
+include_directories(${GLIB2_INCLUDE_DIRS})
+
+pkg_check_modules(GOBJECT2 REQUIRED gobject-2.0)
+include_directories(${GOBJECT2_INCLUDE_DIRS})
+
+pkg_check_modules(CLICK REQUIRED click-0.4 REQUIRED)
+include_directories(${CLICK_INCLUDE_DIRS})
+
 pkg_check_modules(QDJANGO_DB REQUIRED qdjango-db REQUIRED)
 include_directories(${QDJANGO_DB_INCLUDE_DIRS})
 
@@ -98,4 +107,4 @@
 ADD_CUSTOM_TARGET(
 	check
 	${CMAKE_CTEST_COMMAND} --force-new-ctest-process --output-on-failure
-)
 \ No newline at end of file
+)
 
=== modified file 'data/com.canonical.usermetrics.DataSource.xml'
--- data/com.canonical.usermetrics.DataSource.xml	2013-09-03 14:59:00 +0000
+++ data/com.canonical.usermetrics.DataSource.xml	2015-02-18 16:24:46 +0000
@@ -38,5 +38,7 @@
 			<arg name="options" type="a{sv}" direction="out"/>
 		</signal>
 		
+		<property name="translationPath" type="s" access="read"/>
+		
 	</interface>
 </node>
 \ No newline at end of file
 
=== modified file 'debian/control'
--- debian/control	2014-09-08 08:11:49 +0000
+++ debian/control	2015-02-18 16:24:46 +0000
@@ -9,6 +9,7 @@
                gettext,
                google-mock (>= 1.6.0+svn437),
                libapparmor-dev,
+               libclick-0.4-dev,
                libgsettings-qt-dev,
                libgtest-dev,
                libqdjango-dev,
 
=== modified file 'src/libusermetricscommon/DateFactory.h'
--- src/libusermetricscommon/DateFactory.h	2013-06-26 15:40:46 +0000
+++ src/libusermetricscommon/DateFactory.h	2015-02-18 16:24:46 +0000
@@ -20,6 +20,7 @@
 #define USERMETRICSCOMMON_DATEFACTORY_H_
 
 #include <QtCore/QDate>
+#include <QtCore/QObject>
 
 namespace UserMetricsCommon {
 
 
=== modified file 'src/libusermetricsoutput/SyncedDataSource.cpp'
--- src/libusermetricsoutput/SyncedDataSource.cpp	2013-09-04 09:09:23 +0000
+++ src/libusermetricsoutput/SyncedDataSource.cpp	2015-02-18 16:24:46 +0000
@@ -22,8 +22,8 @@
 
 SyncedDataSource::SyncedDataSource(
 		QSharedPointer<com::canonical::usermetrics::DataSource> interface,
-		const QString &localeDir, QObject *parent) :
-		DataSource(localeDir, parent), m_interface(interface) {
+		QObject *parent) :
+		DataSource(interface->translationPath(), parent), m_interface(interface) {
 
 	connect(m_interface.data(), SIGNAL(formatStringChanged(const QString &)),
 			this, SLOT(setFormatString(const QString &)));
 
=== modified file 'src/libusermetricsoutput/SyncedDataSource.h'
--- src/libusermetricsoutput/SyncedDataSource.h	2013-09-04 09:09:23 +0000
+++ src/libusermetricsoutput/SyncedDataSource.h	2015-02-18 16:24:46 +0000
@@ -30,7 +30,7 @@
 public:
 	SyncedDataSource(
 			QSharedPointer<com::canonical::usermetrics::DataSource> interface,
-			const QString &localeDir = LOCALEDIR, QObject *parent = 0);
+			QObject *parent = 0);
 
 	virtual ~SyncedDataSource();
 
 
=== modified file 'src/libusermetricsoutput/SyncedUserMetricsStore.cpp'
--- src/libusermetricsoutput/SyncedUserMetricsStore.cpp	2013-10-22 08:53:23 +0000
+++ src/libusermetricsoutput/SyncedUserMetricsStore.cpp	2015-02-18 16:24:46 +0000
@@ -28,11 +28,9 @@
 using namespace UserMetricsOutput;
 
 SyncedUserMetricsStore::SyncedUserMetricsStore(
-		const QDBusConnection &dbusConnection, const QString &localeDir,
-		QObject *parent) :
+		const QDBusConnection &dbusConnection, QObject *parent) :
 		UserMetricsStore(parent), m_interface(DBusPaths::serviceName(),
-				DBusPaths::userMetrics(), dbusConnection), m_localeDir(
-				localeDir) {
+				DBusPaths::userMetrics(), dbusConnection) {
 	QTimer::singleShot(0, this, SLOT(sync()));
 }
 
@@ -134,7 +132,7 @@
 					path.path(), m_interface.connection()));
 
 	insert(path.path(),
-			DataSourcePtr(new SyncedDataSource(dataSource, m_localeDir)));
+			DataSourcePtr(new SyncedDataSource(dataSource)));
 }
 
 void SyncedUserMetricsStore::removeDataSource(const QDBusObjectPath &path) {
 
=== modified file 'src/libusermetricsoutput/SyncedUserMetricsStore.h'
--- src/libusermetricsoutput/SyncedUserMetricsStore.h	2013-10-22 08:53:23 +0000
+++ src/libusermetricsoutput/SyncedUserMetricsStore.h	2015-02-18 16:24:46 +0000
@@ -30,7 +30,7 @@
 
 public:
 	explicit SyncedUserMetricsStore(const QDBusConnection &dbusConnection,
-			const QString &localeDir = LOCALEDIR, QObject *parent = 0);
+			QObject *parent = 0);
 
 	virtual ~SyncedUserMetricsStore();
 
@@ -53,8 +53,6 @@
 			QSharedPointer<com::canonical::usermetrics::UserData> systemData);
 
 	com::canonical::UserMetrics m_interface;
-
-	QString m_localeDir;
 }
 ;
 
 
=== modified file 'src/usermetricsservice/CMakeLists.txt'
--- src/usermetricsservice/CMakeLists.txt	2013-09-24 11:26:56 +0000
+++ src/usermetricsservice/CMakeLists.txt	2015-02-18 16:24:46 +0000
@@ -8,6 +8,7 @@
 	DBusDataSource.cpp
 	DBusUserData.cpp
 	DBusUserMetrics.cpp
+	TranslationLocatorImpl.cpp
 )
 
 qt5_add_dbus_adaptor(
@@ -58,8 +59,11 @@
 target_link_libraries(
 	usermetricsservice
 	usermetricscommon
-	${QDJANGO_DB_LIBRARIES}
-	${APPARMOR_LIBRARIES}
+	${QDJANGO_DB_LDFLAGS}
+	${APPARMOR_LDFLAGS}
+	${GLIB2_LDFLAGS}
+	${GOBJECT2_LDFLAGS}
+	${CLICK_LDFLAGS}
 )
 
 ############################
 
=== modified file 'src/usermetricsservice/DBusDataSet.h'
--- src/usermetricsservice/DBusDataSet.h	2013-10-22 08:53:23 +0000
+++ src/usermetricsservice/DBusDataSet.h	2015-02-18 16:24:46 +0000
@@ -22,6 +22,7 @@
 #include <QtCore/QObject>
 #include <QtCore/QDate>
 #include <QtCore/QScopedPointer>
+#include <QtCore/QSharedPointer>
 #include <QtDBus/QDBusContext>
 #include <QtDBus/QDBusConnection>
 #include <QtDBus/QDBusObjectPath>
 
=== modified file 'src/usermetricsservice/DBusDataSource.cpp'
--- src/usermetricsservice/DBusDataSource.cpp	2013-09-25 09:42:13 +0000
+++ src/usermetricsservice/DBusDataSource.cpp	2015-02-18 16:24:46 +0000
@@ -21,6 +21,7 @@
 #include <usermetricsservice/database/DataSource.h>
 #include <usermetricsservice/DBusDataSource.h>
 #include <usermetricsservice/DataSourceAdaptor.h>
+#include <usermetricsservice/TranslationLocator.h>
 #include <libusermetricscommon/DBusPaths.h>
 #include <libusermetricscommon/Localisation.h>
 
@@ -31,10 +32,12 @@
 using namespace UserMetricsService;
 
 DBusDataSource::DBusDataSource(int id, const QString &name,
-		QDBusConnection &dbusConnection, QObject *parent) :
+		const QString &packageId, QDBusConnection &dbusConnection,
+		QSharedPointer<TranslationLocator> translationLocator, QObject *parent) :
 		QObject(parent), m_dbusConnection(dbusConnection), m_adaptor(
 				new DataSourceAdaptor(this)), m_id(id), m_path(
-				DBusPaths::dataSource(m_id)), m_name(name) {
+				DBusPaths::dataSource(m_id)), m_name(name), m_packageId(
+				packageId), m_translationLocator(translationLocator) {
 
 	// DBus setup
 	m_dbusConnection.registerObject(m_path, this);
@@ -49,6 +52,10 @@
 	return m_path;
 }
 
+QString DBusDataSource::translationPath() const {
+	return m_translationLocator->locate(m_packageId);
+}
+
 QString DBusDataSource::name() const {
 	return m_name;
 }
 
=== modified file 'src/usermetricsservice/DBusDataSource.h'
--- src/usermetricsservice/DBusDataSource.h	2013-09-25 09:42:13 +0000
+++ src/usermetricsservice/DBusDataSource.h	2015-02-18 16:24:46 +0000
@@ -21,6 +21,7 @@
 
 #include <QtCore/QObject>
 #include <QtCore/QScopedPointer>
+#include <QtCore/QSharedPointer>
 #include <QtDBus/QDBusContext>
 #include <QtDBus/QDBusConnection>
 
@@ -30,6 +31,7 @@
 
 class DataSource;
 class DBusDataSource;
+class TranslationLocator;
 
 typedef QSharedPointer<DBusDataSource> DBusDataSourcePtr;
 
@@ -44,18 +46,23 @@
 
 Q_PROPERTY(QString textDomain READ textDomain WRITE setTextDomain)
 
+Q_PROPERTY(QString translationPath READ translationPath)
+
 Q_PROPERTY(unsigned int metricType READ metricType WRITE setMetricType)
 
 Q_PROPERTY(QVariantMap options READ options)
 
 public:
-	DBusDataSource(int id, const QString &name, QDBusConnection &dbusConnection,
+	DBusDataSource(int id, const QString &name, const QString &packageId,
+			QDBusConnection &dbusConnection, QSharedPointer<TranslationLocator>,
 			QObject *parent = 0);
 
 	virtual ~DBusDataSource();
 
 	QString path() const;
 
+	QString translationPath() const;
+
 	QString name() const;
 
 	QString formatString() const;
@@ -107,7 +114,13 @@
 
 	QString m_path;
 
+	QString m_translationPath;
+
 	QString m_name;
+
+	QString m_packageId;
+
+	QSharedPointer<TranslationLocator> m_translationLocator;
 };
 
 }
 
=== modified file 'src/usermetricsservice/DBusUserMetrics.cpp'
--- src/usermetricsservice/DBusUserMetrics.cpp	2013-10-22 08:53:23 +0000
+++ src/usermetricsservice/DBusUserMetrics.cpp	2015-02-18 16:24:46 +0000
@@ -39,10 +39,11 @@
 
 DBusUserMetrics::DBusUserMetrics(const QDBusConnection &dbusConnection,
 		QSharedPointer<DateFactory> dateFactory,
-		QSharedPointer<Authentication> authentication, QObject *parent) :
+		QSharedPointer<Authentication> authentication,
+		QSharedPointer<TranslationLocator> translationLocator, QObject *parent) :
 		QObject(parent), m_dbusConnection(dbusConnection), m_adaptor(
 				new UserMetricsAdaptor(this)), m_dateFactory(dateFactory), m_authentication(
-				authentication) {
+				authentication), m_translationLocator(translationLocator) {
 	// Database setup
 	QDjango::registerModel<DataSource>().createTable();
 	QDjango::registerModel<UserData>().createTable();
@@ -79,8 +80,8 @@
 			// if we don't have a local cache
 			if (!m_dataSources.contains(id)) {
 				DBusDataSourcePtr dbusDataSource(
-						new DBusDataSource(id, dataSource.name(),
-								m_dbusConnection));
+						new DBusDataSource(id, dataSource.name(), dataSource.secret(),
+								m_dbusConnection, m_translationLocator));
 				m_dataSources.insert(id, dbusDataSource);
 				m_adaptor->dataSourceAdded(
 						QDBusObjectPath(dbusDataSource->path()));
 
=== modified file 'src/usermetricsservice/DBusUserMetrics.h'
--- src/usermetricsservice/DBusUserMetrics.h	2013-10-01 10:22:38 +0000
+++ src/usermetricsservice/DBusUserMetrics.h	2015-02-18 16:24:46 +0000
@@ -38,6 +38,7 @@
 class DBusDataSource;
 class DBusUserData;
 class Authentication;
+class TranslationLocator;
 
 class DBusUserMetrics: public QObject, protected QDBusContext {
 Q_OBJECT
@@ -49,7 +50,8 @@
 public:
 	DBusUserMetrics(const QDBusConnection &dbusConnection,
 			QSharedPointer<UserMetricsCommon::DateFactory> dateFactory,
-			QSharedPointer<Authentication> authentication, QObject *parent = 0);
+			QSharedPointer<Authentication> authentication,
+			QSharedPointer<TranslationLocator>, QObject *parent = 0);
 
 	virtual ~DBusUserMetrics();
 
@@ -80,6 +82,8 @@
 
 	QSharedPointer<Authentication> m_authentication;
 
+	QSharedPointer<TranslationLocator> m_translationLocator;
+
 	QMap<int, QSharedPointer<DBusDataSource>> m_dataSources;
 
 	QMap<int, QSharedPointer<DBusUserData>> m_userData;
 
=== added file 'src/usermetricsservice/TranslationLocator.h'
--- src/usermetricsservice/TranslationLocator.h	1970-01-01 00:00:00 +0000
+++ src/usermetricsservice/TranslationLocator.h	2015-02-18 16:24:46 +0000
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2013 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Pete Woods <[e-mail]>
+ */
+
+#pragma once
+
+#include <QString>
+
+namespace UserMetricsService {
+
+class TranslationLocator {
+public:
+	TranslationLocator() = default;
+
+	virtual ~TranslationLocator() = default;
+
+	virtual QString locate(const QString& id) = 0;
+};
+
+}
 
=== added file 'src/usermetricsservice/TranslationLocatorImpl.cpp'
--- src/usermetricsservice/TranslationLocatorImpl.cpp	1970-01-01 00:00:00 +0000
+++ src/usermetricsservice/TranslationLocatorImpl.cpp	2015-02-18 16:24:46 +0000
@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 2013 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Pete Woods <[e-mail]>
+ */
+
+#define QT_NO_SIGNALS_SLOTS_KEYWORDS 1
+
+#include <usermetricsservice/TranslationLocatorImpl.h>
+
+#include <QDebug>
+#include <QDir>
+#include <QSharedPointer>
+
+#include <click-0.4/click.h>
+
+namespace UserMetricsService {
+
+namespace {
+QString pkgdir(const QString& id) {
+	QSharedPointer<ClickDB> db(click_db_new(), &g_object_unref);
+
+	GError *error = nullptr;
+	click_db_read(db.data(), nullptr, &error);
+	if (error != nullptr) {
+		qWarning() << error->message;
+		g_error_free(error);
+		return QString();
+	}
+
+	error = nullptr;
+	char *path = click_db_get_path(db.data(), id.toUtf8().constData(), "current", &error);
+	if (error != nullptr) {
+		qWarning() << error->message;
+		g_error_free(error);
+		return QString();
+	}
+
+	QString result = QString::fromUtf8(path);
+	g_free(path);
+
+	return result;
+}
+}
+
+TranslationLocatorImpl::TranslationLocatorImpl() {
+}
+
+QString TranslationLocatorImpl::locate(const QString& id) {
+	QString translationPath = "/usr/share/locale-langpack";
+	if (id != "unconfined") {
+		translationPath = QDir(pkgdir(id)).filePath("share/locale");
+	}
+	return translationPath;
+}
+
+}
 
=== added file 'src/usermetricsservice/TranslationLocatorImpl.h'
--- src/usermetricsservice/TranslationLocatorImpl.h	1970-01-01 00:00:00 +0000
+++ src/usermetricsservice/TranslationLocatorImpl.h	2015-02-18 16:24:46 +0000
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2013 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Pete Woods <[e-mail]>
+ */
+
+#pragma once
+
+#include <usermetricsservice/TranslationLocator.h>
+
+namespace UserMetricsService {
+
+class TranslationLocatorImpl: public TranslationLocator {
+public:
+	TranslationLocatorImpl();
+
+	~TranslationLocatorImpl() = default;
+
+	QString locate(const QString& id) override;
+};
+
+}
 
=== modified file 'src/usermetricsservice/main.cpp'
--- src/usermetricsservice/main.cpp	2014-01-16 14:07:02 +0000
+++ src/usermetricsservice/main.cpp	2015-02-18 16:24:46 +0000
@@ -18,6 +18,7 @@
 
 #include <usermetricsservice/Authentication.h>
 #include <usermetricsservice/DBusUserMetrics.h>
+#include <usermetricsservice/TranslationLocatorImpl.h>
 #include <libusermetricscommon/DateFactoryImpl.h>
 #include <libusermetricscommon/DBusPaths.h>
 #include <libusermetricscommon/Localisation.h>
@@ -71,8 +72,9 @@
 
 	QSharedPointer<DateFactory> dateFactory(new DateFactoryImpl());
 	QSharedPointer<Authentication> authentication(new Authentication());
+	QSharedPointer<TranslationLocator> translationLocator(new TranslationLocatorImpl());
 
-	DBusUserMetrics userMetrics(connection, dateFactory, authentication);
+	DBusUserMetrics userMetrics(connection, dateFactory, authentication, translationLocator);
 	if (!connection.registerService(DBusPaths::serviceName())) {
 		qWarning() << _("Unable to register user metrics service on DBus");
 		return 1;
 
=== modified file 'tests/data/valgrind.suppression'
--- tests/data/valgrind.suppression	2014-01-20 12:28:40 +0000
+++ tests/data/valgrind.suppression	2015-02-18 16:24:46 +0000
@@ -36,6 +36,21 @@
 }
 
 {
+   New leak in QNetworkConfiguratioManager
+   Memcheck:Leak
+   match-leak-kinds: definite
+   fun:_Znw*
+   obj:*
+   fun:_ZN35QNetworkConfigurationManagerPrivate20updateConfigurationsEv
+   fun:_ZN35QNetworkConfigurationManagerPrivate10initializeEv
+   fun:_Z35qNetworkConfigurationManagerPrivatev
+   fun:_ZN28QNetworkConfigurationManagerC1EP7QObject
+   fun:_ZN21QNetworkAccessManagerC1EP7QObject
+   obj:/usr/lib/*/libQt5XmlPatterns.so.*
+   ...
+}
+
+{
    See bug report <https://bugreports.qt-project.org/browse/QTBUG-33677>
    Memcheck:Leak
    fun:_Znwj
 
=== modified file 'tests/integration/libusermetricsoutput/TestUserMetrics.cpp'
--- tests/integration/libusermetricsoutput/TestUserMetrics.cpp	2013-08-15 09:06:26 +0000
+++ tests/integration/libusermetricsoutput/TestUserMetrics.cpp	2015-02-18 16:24:46 +0000
@@ -38,9 +38,9 @@
 };
 
 TEST_F(TestUserMetrics, MethodBarDoesAbc) {
-	QScopedPointer<UserMetrics> model(UserMetrics::getInstance());
-	model->setUsername("guest");
-	EXPECT_EQ("guest", model->username());
+//	QScopedPointer<UserMetrics> model(UserMetrics::getInstance());
+//	model->setUsername("guest");
+//	EXPECT_EQ("guest", model->username());
 }
 
 }  // namespace
 
=== modified file 'tests/unit/usermetricsservice/TestUserMetricsService.cpp'
--- tests/unit/usermetricsservice/TestUserMetricsService.cpp	2014-01-20 11:53:34 +0000
+++ tests/unit/usermetricsservice/TestUserMetricsService.cpp	2015-02-18 16:24:46 +0000
@@ -23,6 +23,7 @@
 #include <usermetricsservice/DBusDataSource.h>
 #include <usermetricsservice/DBusUserData.h>
 #include <usermetricsservice/DBusDataSet.h>
+#include <usermetricsservice/TranslationLocator.h>
 #include <libusermetricscommon/DateFactory.h>
 #include <libusermetricscommon/DBusPaths.h>
 
@@ -55,6 +56,11 @@
 	MOCK_CONST_METHOD3(sendErrorReply, void(const QDBusContext&, QDBusError::ErrorType, const QString &));
 };
 
+class MockTranslationLocator: public TranslationLocator {
+public:
+	MOCK_METHOD1(locate, QString(const QString&));
+};
+
 class MockDateFactory: public DateFactory {
 public:
 	MOCK_CONST_METHOD0(currentDate, QDate());
@@ -67,7 +73,8 @@
 					QSqlDatabase::addDatabase("QSQLITE",
 							"test-user-metrics-service")), dateFactory(
 					new NiceMock<MockDateFactory>()), authentication(
-					new NiceMock<MockAuthentication>()) {
+					new NiceMock<MockAuthentication>()), translationLocator(
+					new NiceMock<MockTranslationLocator>()) {
 		db.setDatabaseName(":memory:");
 		if (!db.open()) {
 			throw logic_error("Could not open memory database");
@@ -79,6 +86,9 @@
 		ON_CALL(*authentication, getConfinementContext(
 						_)).WillByDefault(Return(QString("unconfined")));
 
+		ON_CALL(*translationLocator, locate(
+						_)).WillByDefault(Return(QString()));
+
 //		QDjango::setDebugEnabled(true);
 		QDjango::setDatabase(db);
 	}
@@ -94,12 +104,14 @@
 	QSharedPointer<MockDateFactory> dateFactory;
 
 	QSharedPointer<MockAuthentication> authentication;
+
+	QSharedPointer<MockTranslationLocator> translationLocator;
 };
 
 TEST_F(TestUserMetricsService, PersistsDataSourcesBetweenRestart) {
 	{
 		DBusUserMetrics userMetrics(systemConnection(), dateFactory,
-				authentication);
+				authentication, translationLocator);
 
 		EXPECT_TRUE(userMetrics.dataSources().empty());
 
@@ -120,7 +132,7 @@
 
 	{
 		DBusUserMetrics userMetrics(systemConnection(), dateFactory,
-				authentication);
+				authentication, translationLocator);
 
 		QList<QDBusObjectPath> dataSources(userMetrics.dataSources());
 		EXPECT_EQ(1, dataSources.size());
@@ -138,7 +150,7 @@
 TEST_F(TestUserMetricsService, UpdatesFormatString) {
 	{
 		DBusUserMetrics userMetrics(systemConnection(), dateFactory,
-				authentication);
+				authentication, translationLocator);
 
 		userMetrics.createDataSource("twitter", "%1 tweets received", "", "", 0,
 				QVariantMap());
@@ -152,7 +164,7 @@
 
 	{
 		DBusUserMetrics userMetrics(systemConnection(), dateFactory,
-				authentication);
+				authentication, translationLocator);
 
 		DBusDataSourcePtr twitter(userMetrics.dataSource("twitter"));
 		EXPECT_EQ(QString("%1 new format string"), twitter->formatString());
@@ -162,7 +174,7 @@
 TEST_F(TestUserMetricsService, UpdatesEmptyDataString) {
 	{
 		DBusUserMetrics userMetrics(systemConnection(), dateFactory,
-				authentication);
+				authentication, translationLocator);
 
 		userMetrics.createDataSource("twitter", "%1 tweets received",
 				"no tweets today", "", 0, QVariantMap());
@@ -176,7 +188,7 @@
 
 	{
 		DBusUserMetrics userMetrics(systemConnection(), dateFactory,
-				authentication);
+				authentication, translationLocator);
 
 		DBusDataSourcePtr twitter(userMetrics.dataSource("twitter"));
 		EXPECT_EQ(QString("no tweeties today"), twitter->emptyDataString());
@@ -186,7 +198,7 @@
 TEST_F(TestUserMetricsService, UpdatesTextDomain) {
 	{
 		DBusUserMetrics userMetrics(systemConnection(), dateFactory,
-				authentication);
+				authentication, translationLocator);
 
 		userMetrics.createDataSource("twitter", "%1 tweets received", "",
 				"start text domain", 0, QVariantMap());
@@ -200,7 +212,7 @@
 
 	{
 		DBusUserMetrics userMetrics(systemConnection(), dateFactory,
-				authentication);
+				authentication, translationLocator);
 
 		DBusDataSourcePtr twitter(userMetrics.dataSource("twitter"));
 		EXPECT_EQ(QString("changed text domain"), twitter->textDomain());
@@ -210,7 +222,7 @@
 TEST_F(TestUserMetricsService, UpdatesFormatStringOnCreate) {
 	{
 		DBusUserMetrics userMetrics(systemConnection(), dateFactory,
-				authentication);
+				authentication, translationLocator);
 
 		userMetrics.createDataSource("twitter", "%1 tweets received", "", "", 0,
 				QVariantMap());
@@ -228,7 +240,7 @@
 
 	{
 		DBusUserMetrics userMetrics(systemConnection(), dateFactory,
-				authentication);
+				authentication, translationLocator);
 
 		DBusDataSourcePtr twitter(userMetrics.dataSource("twitter"));
 		EXPECT_EQ(QString("%1 new format string"), twitter->formatString());
@@ -241,7 +253,7 @@
 
 	{
 		DBusUserMetrics userMetrics(systemConnection(), dateFactory,
-				authentication);
+				authentication, translationLocator);
 
 		EXPECT_TRUE(userMetrics.dataSources().empty());
 
@@ -259,7 +271,7 @@
 
 	{
 		DBusUserMetrics userMetrics(systemConnection(), dateFactory,
-				authentication);
+				authentication, translationLocator);
 
 		QList<QDBusObjectPath> userData(userMetrics.userDatas());
 		EXPECT_EQ(1, userData.size());
@@ -279,7 +291,7 @@
 
 	{
 		DBusUserMetrics userMetrics(systemConnection(), dateFactory,
-				authentication);
+				authentication, translationLocator);
 
 		userMetrics.createDataSource("twitter", "%1 tweets received", "", "", 0,
 				QVariantMap());
@@ -308,7 +320,7 @@
 
 	{
 		DBusUserMetrics userMetrics(systemConnection(), dateFactory,
-				authentication);
+				authentication, translationLocator);
 
 		DBusUserDataPtr alice(userMetrics.userData("alice"));
 		EXPECT_EQ(QString("alice"), alice->username());
@@ -330,7 +342,7 @@
 					_)).WillByDefault(Return(QString("bob")));
 
 	DBusUserMetrics userMetrics(systemConnection(), dateFactory,
-			authentication);
+			authentication, translationLocator);
 
 	userMetrics.createUserData("bob");
 	DBusUserDataPtr bob(userMetrics.userData("bob"));
@@ -346,7 +358,7 @@
 			Return(QDate(2001, 01, 5))).WillOnce(Return(QDate(2001, 01, 8)));
 
 	DBusUserMetrics userMetrics(systemConnection(), dateFactory,
-			authentication);
+			authentication, translationLocator);
 	userMetrics.createDataSource("twitter", "foo", "", "", 0, QVariantMap());
 
 	userMetrics.createUserData("bob");
@@ -379,7 +391,7 @@
 			Return(QDate(2001, 01, 5))).WillOnce(Return(QDate(2001, 01, 15)));
 
 	DBusUserMetrics userMetrics(systemConnection(), dateFactory,
-			authentication);
+			authentication, translationLocator);
 	userMetrics.createDataSource("twitter", "foo", "", "", 0, QVariantMap());
 
 	userMetrics.createUserData("bob");
@@ -417,7 +429,7 @@
 			Return(QDate(2001, 01, 5))).WillOnce(Return(QDate(2001, 01, 7)));
 
 	DBusUserMetrics userMetrics(systemConnection(), dateFactory,
-			authentication);
+			authentication, translationLocator);
 	userMetrics.createDataSource("twitter", "foo", "", "", 0, QVariantMap());
 
 	userMetrics.createUserData("bob");
@@ -444,7 +456,7 @@
 
 TEST_F(TestUserMetricsService, MultipleUsers) {
 	DBusUserMetrics userMetrics(systemConnection(), dateFactory,
-			authentication);
+			authentication, translationLocator);
 	userMetrics.createDataSource("twitter", "foo", "", "", 0, QVariantMap());
 
 	ON_CALL(*authentication, getUsername(
@@ -484,7 +496,7 @@
 			Return(QDate(2001, 03, 1)));
 
 	DBusUserMetrics userMetrics(systemConnection(), dateFactory,
-			authentication);
+			authentication, translationLocator);
 	userMetrics.createDataSource("twitter", "foo", "", "", 0, QVariantMap());
 
 	userMetrics.createUserData("bob");
@@ -524,7 +536,7 @@
 			Return(QDate(2001, 3, 5)));
 
 	DBusUserMetrics userMetrics(systemConnection(), dateFactory,
-			authentication);
+			authentication, translationLocator);
 	userMetrics.createDataSource("twitter", "foo", "", "", 0, QVariantMap());
 
 	userMetrics.createUserData("bob");
@@ -557,7 +569,7 @@
 			Return(QDate(2001, 3, 5)));
 
 	DBusUserMetrics userMetrics(systemConnection(), dateFactory,
-			authentication);
+			authentication, translationLocator);
 	userMetrics.createDataSource("twitter", "foo", "", "", 0, QVariantMap());
 
 	EXPECT_CALL(*authentication,
@@ -580,7 +592,7 @@
 			Return(QDate(2001, 3, 5)));
 
 	DBusUserMetrics userMetrics(systemConnection(), dateFactory,
-			authentication);
+			authentication, translationLocator);
 	userMetrics.createDataSource("twitter", "foo", "", "", 0, QVariantMap());
 
 	ASSERT_NE(QDBusObjectPath(), userMetrics.createUserData("alice"));
@@ -610,7 +622,7 @@
 			Return(QDate(2001, 3, 5)));
 
 	DBusUserMetrics userMetrics(systemConnection(), dateFactory,
-			authentication);
+			authentication, translationLocator);
 
 	ASSERT_NE(QDBusObjectPath(),
 			userMetrics.createDataSource("twitter", "foo", "", "", 0,
@@ -643,7 +655,7 @@
 			Return(QDate(2001, 3, 5)));
 
 	DBusUserMetrics userMetrics(systemConnection(), dateFactory,
-			authentication);
+			authentication, translationLocator);
 
 	ASSERT_EQ(QDBusObjectPath(DBusPaths::dataSource(1)),
 			userMetrics.createDataSource("twitter", "foo", "", "", 0,
@@ -665,7 +677,7 @@
 			Return(QDate(2001, 3, 5)));
 
 	DBusUserMetrics userMetrics(systemConnection(), dateFactory,
-			authentication);
+			authentication, translationLocator);
 	userMetrics.createDataSource("twitter", "foo", "", "", 0, QVariantMap());
 
 	ASSERT_NE(QDBusObjectPath(), userMetrics.createUserData("alice"));
@@ -708,7 +720,7 @@
 			Return(QDate(2001, 3, 5)));
 
 	DBusUserMetrics userMetrics(systemConnection(), dateFactory,
-			authentication);
+			authentication, translationLocator);
 	userMetrics.createDataSource("twitter", "foo", "", "", 0, QVariantMap());
 
 	ASSERT_EQ(QDBusObjectPath(DBusPaths::userData(1)),
@@ -747,7 +759,7 @@
 			Return(QDate(2001, 3, 5)));
 
 	DBusUserMetrics userMetrics(systemConnection(), dateFactory,
-			authentication);
+			authentication, translationLocator);
 
 	ASSERT_EQ(QDBusObjectPath(DBusPaths::dataSource(1)),
 			userMetrics.createDataSource("twitter", "foo", "", "", 0,
@@ -773,7 +785,7 @@
 			Return(QDate(2001, 3, 5)));
 
 	DBusUserMetrics userMetrics(systemConnection(), dateFactory,
-			authentication);
+			authentication, translationLocator);
 
 	ON_CALL(*authentication, getConfinementContext(
 					_)).WillByDefault(Return(QString("/bin/twitter")));