Merge lp:~mhr3/unity-scopes-api/merge-trunk into lp:unity-scopes-api/devel

[Michal Hruby]

Merge trunk.

Merge trunk.

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-autolanding/174/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-trusty-amd64-autolanding/174/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-trusty-armhf-autolanding/174/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-trusty-i386-autolanding/174/console

review: Needs Fixing (continuous-integration)

[Michal Hruby (mhr3)]

The CI/automerging bot needs to be transitioned to utopic.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:312
http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-ci/446/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-trusty-amd64-ci/447/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-trusty-armhf-ci/446/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-trusty-i386-ci/446/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-api-devel-ci/446/rebuild

review: Needs Fixing (continuous-integration)

[lp:~mhr3/unity-scopes-api/merge-trunk]

312. By Pete Woods on 2014-04-29

Fix raciness in RegistryObject test.

Approved by PS Jenkins bot, Michal Hruby.

313. By Pete Woods on 2014-04-29

Remove dead ini file option from example click scope.

Approved by Michal Hruby, PS Jenkins bot.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:312
http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-ci/449/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-utopic-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-utopic-armhf-ci/1
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-utopic-armhf-ci/1/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-utopic-i386-ci/1

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-api-devel-ci/449/rebuild

review: Approve (continuous-integration)

[lp:~mhr3/unity-scopes-api/merge-trunk]

314. By Michal Hruby on 2014-04-30

Merge trunk.

Approved by PS Jenkins bot.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-04-28 05:57:11 +0000
+++ CMakeLists.txt	2014-04-29 10:31:01 +0000
@@ -55,7 +55,7 @@
 
 include(FindPkgConfig)
 find_package(Boost COMPONENTS system filesystem regex serialization REQUIRED)
-pkg_check_modules(UNITY_API libunity-api>=0.1.1 REQUIRED)
+pkg_check_modules(UNITY_API libunity-api>=0.1.3 REQUIRED)
 pkg_check_modules(PROCESS_CPP process-cpp>=1.0.0 REQUIRED)
 pkg_check_modules(LTTNG_UST lttng-ust REQUIRED)
 pkg_check_modules(LIBURCU_BP liburcu-bp REQUIRED)
 
=== modified file 'debian/changelog'
--- debian/changelog	2014-04-23 13:11:53 +0000
+++ debian/changelog	2014-04-29 10:31:01 +0000
@@ -1,9 +1,20 @@
-unity-scopes-api (0.4.3-0ubuntu1) UNRELEASED; urgency=low
+unity-scopes-api (0.4.3+14.10.20140428-0ubuntu1) utopic; urgency=low
 
+  [ Pawel Stolowski ]
   * Implemented to_uri() and from_uri() conversions for CannedQuery.
   * Ship scopes-client in libunity-scopes-cli package.
 
- -- Pawel Stolowski <[e-mail]>  Wed, 23 Apr 2014 14:32:03 +0200
+  [ Ubuntu daily release ]
+  * debian/*symbols: auto-update new symbols to released version
+
+ -- Ubuntu daily release <[e-mail]>  Mon, 28 Apr 2014 17:24:08 +0000
+
+unity-scopes-api (0.4.2+14.04.20140408-0ubuntu1) trusty; urgency=low
+
+  [ Michal Hruby ]
+  * Merge r298 from devel branch.
+
+ -- Ubuntu daily release <[e-mail]>  Tue, 08 Apr 2014 13:41:30 +0000
 
 unity-scopes-api (0.4.2+14.04.20140404.2-0ubuntu1) trusty; urgency=low
 
 
=== modified file 'debian/control'
--- debian/control	2014-04-23 15:43:01 +0000
+++ debian/control	2014-04-29 10:31:01 +0000
@@ -12,7 +12,7 @@
                python3,
                capnproto,
                libprocess-cpp-dev (>= 1.0.0),
-               libunity-api-dev (>= 7.80.5~),
+               libunity-api-dev (>= 7.80.7~),
                libboost-filesystem-dev,
                libboost-regex-dev,
                libboost-serialization-dev,
 
=== modified file 'debian/libunity-scopes1.symbols'
--- debian/libunity-scopes1.symbols	2014-04-23 21:53:31 +0000
+++ debian/libunity-scopes1.symbols	2014-04-29 10:31:01 +0000
@@ -32,7 +32,7 @@
  (c++)"unity::scopes::CannedQuery::set_filter_state(unity::scopes::FilterState const&)@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::CannedQuery::set_query_string(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::CannedQuery::set_department_id(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.4.0+14.04.20140312.1
- (c++)"unity::scopes::CannedQuery::from_uri(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0replaceme
+ (c++)"unity::scopes::CannedQuery::from_uri(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.4.3+14.10.20140428
  (c++)"unity::scopes::CannedQuery::CannedQuery(unity::scopes::CannedQuery&&)@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::CannedQuery::CannedQuery(unity::scopes::internal::CannedQueryImpl*)@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::CannedQuery::CannedQuery(unity::scopes::CannedQuery const&)@Base" 0.4.0+14.04.20140312.1
@@ -285,7 +285,7 @@
  (c++)"unity::scopes::Runtime::run_scope(unity::scopes::ScopeBase*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.4.2+14.04.20140404.2
  (c++)"unity::scopes::Runtime::Runtime(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" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::Runtime::~Runtime()@Base" 0.4.0+14.04.20140312.1
- (c++)"unity::scopes::Variant::deserialize_json(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0replaceme
+ (c++)"unity::scopes::Variant::deserialize_json(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.4.3+14.10.20140428
  (c++)"unity::scopes::Variant::null()@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::Variant::swap(unity::scopes::Variant&)@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::Variant::Variant(unity::scopes::Variant&&)@Base" 0.4.0+14.04.20140312.1
@@ -408,7 +408,7 @@
  (c++)"unity::scopes::internal::RegistryObject::ScopeProcess::on_process_death(int)@Base" 0.4.2+14.04.20140404.2
  (c++)"unity::scopes::internal::RegistryObject::ScopeProcess::clear_handle_unlocked()@Base" 0.4.2+14.04.20140404.2
  (c++)"unity::scopes::internal::RegistryObject::ScopeProcess::update_state_unlocked(unity::scopes::internal::RegistryObject::ScopeProcess::ProcessState)@Base" 0.4.2+14.04.20140404.2
- (c++)"unity::scopes::internal::RegistryObject::ScopeProcess::exec(core::posix::ChildProcess::DeathObserver&, std::shared_ptr<unity::scopes::internal::Executor>)@Base" 0replaceme
+ (c++)"unity::scopes::internal::RegistryObject::ScopeProcess::exec(core::posix::ChildProcess::DeathObserver&, std::shared_ptr<unity::scopes::internal::Executor>)@Base" 0.4.3+14.10.20140428
  (c++)"unity::scopes::internal::RegistryObject::ScopeProcess::kill(std::unique_lock<std::mutex>&)@Base" 0.4.2+14.04.20140404.2
  (c++)"unity::scopes::internal::RegistryObject::ScopeProcess::kill()@Base" 0.4.2+14.04.20140404.2
  (c++)"unity::scopes::internal::RegistryObject::ScopeProcess::ScopeProcess(unity::scopes::internal::RegistryObject::ScopeExecData)@Base" 0.4.2+14.04.20140404.2
@@ -425,7 +425,7 @@
  (c++)"unity::scopes::internal::RegistryObject::remove_local_scope(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::RegistryObject::set_remote_registry(std::shared_ptr<unity::scopes::internal::MWRegistry> const&)@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::RegistryObject::locate(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.4.0+14.04.20140312.1
- (c++)"unity::scopes::internal::RegistryObject::RegistryObject(core::posix::ChildProcess::DeathObserver&, std::shared_ptr<unity::scopes::internal::Executor> const&)@Base" 0replaceme
+ (c++)"unity::scopes::internal::RegistryObject::RegistryObject(core::posix::ChildProcess::DeathObserver&, std::shared_ptr<unity::scopes::internal::Executor> const&)@Base" 0.4.3+14.10.20140428
  (c++)"unity::scopes::internal::RegistryObject::~RegistryObject()@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::MiddlewareFactory::MiddlewareData::~MiddlewareData()@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::MiddlewareFactory::to_kind(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.4.0+14.04.20140312.1
@@ -455,11 +455,11 @@
  (c++)"unity::scopes::internal::StateReceiverObject::push_state(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, unity::scopes::internal::StateReceiverObject::State const&)@Base" 0.4.2+14.04.20140404.2
  (c++)"unity::scopes::internal::StateReceiverObject::StateReceiverObject()@Base" 0.4.2+14.04.20140404.2
  (c++)"unity::scopes::internal::StateReceiverObject::~StateReceiverObject()@Base" 0.4.2+14.04.20140404.2
- (c++)"unity::scopes::internal::Executor::exec(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > const&, std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> > const, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > > const&, core::posix::StandardStream const&)@Base" 0replaceme
- (c++)"unity::scopes::internal::Executor::Executor()@Base" 0replaceme
- (c++)"unity::scopes::internal::Executor::~Executor()@Base" 0replaceme
+ (c++)"unity::scopes::internal::Executor::exec(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > const&, std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> > const, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > > const&, core::posix::StandardStream const&)@Base" 0.4.3+14.10.20140428
+ (c++)"unity::scopes::internal::Executor::Executor()@Base" 0.4.3+14.10.20140428
+ (c++)"unity::scopes::internal::Executor::~Executor()@Base" 0.4.3+14.10.20140428
  (c++)"unity::scopes::internal::ScopeImpl::perform_action(unity::scopes::Result const&, unity::scopes::ActionMetadata const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::shared_ptr<unity::scopes::ActivationListenerBase> const&)@Base" 0.4.0+14.04.20140312.1
- (c++)"unity::scopes::internal::ScopeImpl::fwd()@Base" 0replaceme
+ (c++)"unity::scopes::internal::ScopeImpl::fwd()@Base" 0.4.3+14.10.20140428
  (c++)"unity::scopes::internal::ScopeImpl::create(std::shared_ptr<unity::scopes::internal::MWScope> const&, unity::scopes::internal::RuntimeImpl*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::ScopeImpl::search(unity::scopes::CannedQuery const&, unity::scopes::SearchMetadata const&, std::shared_ptr<unity::scopes::SearchListenerBase> const&)@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::ScopeImpl::search(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, unity::scopes::FilterState const&, unity::scopes::SearchMetadata const&, std::shared_ptr<unity::scopes::SearchListenerBase> const&)@Base" 0.4.0+14.04.20140312.1
@@ -499,7 +499,7 @@
  (c++)"unity::scopes::CannedQuery::filter_state() const@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::CannedQuery::query_string() const@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::CannedQuery::department_id() const@Base" 0.4.0+14.04.20140312.1
- (c++)"unity::scopes::CannedQuery::to_uri() const@Base" 0replaceme
+ (c++)"unity::scopes::CannedQuery::to_uri() const@Base" 0.4.3+14.10.20140428
  (c++)"unity::scopes::CannedQuery::scope_id() const@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::CannedQuery::serialize() const@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::FilterState::has_filter(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) const@Base" 0.4.0+14.04.20140312.1
@@ -580,7 +580,7 @@
  (c++)"unity::scopes::Runtime::registry() const@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::Variant::get_double() const@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::Variant::get_string() const@Base" 0.4.0+14.04.20140312.1
- (c++)"unity::scopes::Variant::serialize_json() const@Base" 0replaceme
+ (c++)"unity::scopes::Variant::serialize_json() const@Base" 0.4.3+14.10.20140428
  (c++)"unity::scopes::Variant::which() const@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::Variant::get_int() const@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::Variant::is_null() const@Base" 0.4.0+14.04.20140312.1
@@ -603,11 +603,11 @@
  (c++)"unity::scopes::Category::icon() const@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::Category::title() const@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::Category::serialize() const@Base" 0.4.0+14.04.20140312.1
- (c++)"unity::scopes::internal::RuntimeImpl::async_pool() const@Base" 0replaceme
+ (c++)"unity::scopes::internal::RuntimeImpl::async_pool() const@Base" 0.4.3+14.10.20140428
  (c++)"unity::scopes::internal::RuntimeImpl::configfile() const@Base" 0.4.2+14.04.20140404.2
- (c++)"unity::scopes::internal::RuntimeImpl::future_queue() const@Base" 0replaceme
+ (c++)"unity::scopes::internal::RuntimeImpl::future_queue() const@Base" 0.4.3+14.10.20140428
  (c++)"unity::scopes::internal::RuntimeImpl::reply_reaper() const@Base" 0.4.0+14.04.20140312.1
- (c++)"unity::scopes::internal::RuntimeImpl::waiter_thread(std::shared_ptr<unity::scopes::internal::ThreadSafeQueue<std::future<void> > > const&) const@Base" 0replaceme
+ (c++)"unity::scopes::internal::RuntimeImpl::waiter_thread(std::shared_ptr<unity::scopes::internal::ThreadSafeQueue<std::future<void> > > const&) const@Base" 0.4.3+14.10.20140428
  (c++)"unity::scopes::internal::RuntimeImpl::proxy_to_string(std::shared_ptr<unity::scopes::Object> const&) const@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::RuntimeImpl::string_to_proxy(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) const@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::RuntimeImpl::registry_endpoint() const@Base" 0.4.0+14.04.20140312.1
@@ -644,7 +644,7 @@
  (c++)"unity::scopes::internal::RegistryConfig::endpointdir() const@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::RegistryConfig::mw_configfile() const@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::RegistryConfig::oem_installdir() const@Base" 0.4.0+14.04.20140312.1
- (c++)"unity::scopes::internal::RegistryConfig::click_installdir() const@Base" 0replaceme
+ (c++)"unity::scopes::internal::RegistryConfig::click_installdir() const@Base" 0.4.3+14.10.20140428
  (c++)"unity::scopes::internal::RegistryConfig::scope_installdir() const@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::RegistryConfig::scoperunner_path() const@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::RegistryConfig::ss_registry_endpoint() const@Base" 0.4.0+14.04.20140312.1
@@ -675,7 +675,7 @@
  (c++)"unity::scopes::internal::ScopeMetadataImpl::invisible() const@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::ScopeMetadataImpl::serialize() const@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::StateReceiverObject::state_received() const@Base" 0.4.2+14.04.20140404.2
- (c++)"unity::scopes::QueryBase::valid() const@Base" 0replaceme
+ (c++)"unity::scopes::QueryBase::valid() const@Base" 0.4.3+14.10.20140428
  (c++)"unity::scopes::ScopeBase::scope_directory() const@Base" 0.4.2+14.04.20140404.2
  (c++)"typeinfo for unity::scopes::Annotation@Base" 0.4.0+14.04.20140312.1
  (c++)"typeinfo for unity::scopes::FilterBase@Base" 0.4.0+14.04.20140312.1
 
=== modified file 'src/scopes/internal/ScopeConfig.cpp'
--- src/scopes/internal/ScopeConfig.cpp	2014-04-08 08:26:44 +0000
+++ src/scopes/internal/ScopeConfig.cpp	2014-04-29 10:31:01 +0000
@@ -38,7 +38,7 @@
 namespace
 {
     const string overrideable_str = "Override";
-    const string scope_id_str = "DisplayName";
+    const string scope_name_str = "DisplayName";
     const string description_str = "Description";
     const string author_str = "Author";
     const string art_str = "Art";
@@ -61,8 +61,8 @@
         overrideable_ = false;
     }
 
-    display_name_ = parser()->get_string(SCOPE_CONFIG_GROUP, scope_id_str);
-    description_ = parser()->get_string(SCOPE_CONFIG_GROUP, description_str);
+    display_name_ = parser()->get_locale_string(SCOPE_CONFIG_GROUP, scope_name_str);
+    description_ = parser()->get_locale_string(SCOPE_CONFIG_GROUP, description_str);
     author_ = parser()->get_string(SCOPE_CONFIG_GROUP, author_str);
 
     // For optional values, we store them in a unique_ptr so we can distinguish the "not set at all" case
@@ -86,7 +86,7 @@
     }
     try
     {
-        string hint = parser()->get_string(SCOPE_CONFIG_GROUP, search_hint_str);
+        string hint = parser()->get_locale_string(SCOPE_CONFIG_GROUP, search_hint_str);
         search_hint_.reset(new string(hint));
     }
     catch (LogicException const&)
 
=== modified file 'test/gtest/scopes/internal/ScopeConfig/ScopeConfig_test.cpp'
--- test/gtest/scopes/internal/ScopeConfig/ScopeConfig_test.cpp	2014-03-18 10:25:32 +0000
+++ test/gtest/scopes/internal/ScopeConfig/ScopeConfig_test.cpp	2014-04-29 10:31:01 +0000
@@ -30,10 +30,11 @@
         ScopeConfig cfg("configtest1.ini");
 
         EXPECT_EQ("Scope name", cfg.display_name());
+        EXPECT_EQ("Scope description", cfg.description());
         EXPECT_EQ("scope art", cfg.art());
         EXPECT_EQ("Canonical", cfg.author());
         EXPECT_EQ("an icon", cfg.icon());
-        EXPECT_EQ("a search hint string", cfg.search_hint());
+        EXPECT_EQ("search string", cfg.search_hint());
         EXPECT_EQ("a key", cfg.hot_key());
 
         auto attrs = cfg.appearance_attributes();
@@ -47,6 +48,7 @@
         ScopeConfig cfg("configtest2.ini");
 
         EXPECT_EQ("Scope name", cfg.display_name());
+        EXPECT_EQ("Scope description", cfg.description());
         EXPECT_EQ("scope art", cfg.art());
         EXPECT_EQ("Canonical", cfg.author());
         EXPECT_EQ("an icon", cfg.icon());
@@ -59,6 +61,7 @@
         ScopeConfig cfg("configtest3.ini");
 
         EXPECT_EQ("Scope name", cfg.display_name());
+        EXPECT_EQ("Scope description", cfg.description());
         EXPECT_EQ("scope art", cfg.art());
         EXPECT_EQ("Canonical", cfg.author());
         EXPECT_EQ("an icon", cfg.icon());
@@ -69,3 +72,39 @@
         EXPECT_EQ(0, cfg.appearance_attributes().size());
     }
 }
+
+class ScopeConfigWithIntl: public ::testing::Test
+{
+public:
+    ScopeConfigWithIntl()
+    {
+        setenv("LANGUAGE", "test", 1);
+    }
+
+    ~ScopeConfigWithIntl()
+    {
+        unsetenv("LANGUAGE");
+    }
+};
+
+TEST_F(ScopeConfigWithIntl, localization)
+{
+    {
+        ScopeConfig cfg("configtest1.ini");
+
+        EXPECT_EQ("copesay amenay", cfg.display_name());
+        EXPECT_EQ("copesay criptiondesay", cfg.description());
+        EXPECT_EQ("scope art", cfg.art());
+        EXPECT_EQ("Canonical", cfg.author());
+        EXPECT_EQ("an icon", cfg.icon());
+        EXPECT_EQ("earchsay ringstay", cfg.search_hint());
+        EXPECT_EQ("a key", cfg.hot_key());
+
+        auto attrs = cfg.appearance_attributes();
+        EXPECT_EQ(2, attrs.size());
+        EXPECT_EQ("foo", attrs["arbitrary_key"].get_string());
+        EXPECT_EQ("bar", attrs["another_one"].get_string());
+
+        EXPECT_THROW(cfg.scope_runner(), unity::scopes::NotFoundException);
+    }
+}
 
=== modified file 'test/gtest/scopes/internal/ScopeConfig/configtest1.ini.in'
--- test/gtest/scopes/internal/ScopeConfig/configtest1.ini.in	2014-03-13 12:33:32 +0000
+++ test/gtest/scopes/internal/ScopeConfig/configtest1.ini.in	2014-04-29 10:31:01 +0000
@@ -1,10 +1,13 @@
 [ScopeConfig]
 DisplayName = Scope name
+DisplayName[test] = copesay amenay
 Description = Scope description
+Description[test] = copesay criptiondesay
 Art = scope art
 Author = Canonical
 Icon = an icon
-SearchHint = a search hint string
+SearchHint = search string
+SearchHint[test] = earchsay ringstay
 HotKey = a key
 
 [Appearance]