Merge lp:~marcustomlinson/unity-scopes-api/send_locale_in_smartscope into lp:unity-scopes-api/devel

[Marcus Tomlinson]

Send locale to SSS on search and preview requests

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Paweł Stołowski (stolowski)]

+1

review: Approve

[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/154/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-trusty-amd64-autolanding/154/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-trusty-armhf-autolanding/154
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-trusty-armhf-autolanding/154/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-trusty-i386-autolanding/154

review: Needs Fixing (continuous-integration)

[lp:~marcustomlinson/unity-scopes-api/send_locale_in_smartscope]

300. By Marcus Tomlinson on 2014-04-08

Merged devel

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

=== modified file 'include/unity/scopes/internal/smartscopes/SmartScope.h'
--- include/unity/scopes/internal/smartscopes/SmartScope.h	2014-04-08 07:19:17 +0000
+++ include/unity/scopes/internal/smartscopes/SmartScope.h	2014-04-08 12:09:08 +0000
@@ -62,8 +62,8 @@
         SmartScopesClient::SPtr ss_client = reg->get_ssclient();
         std::string base_url = reg->get_base_url(scope_id_);
 
-        ///! TODO: session_id, query_id, locale, country
-        search_handle_ = ss_client->search(base_url, query_.query_string(), query.department_id(), "session_id", 0, hints.form_factor(), "", "", hints.cardinality());
+        ///! TODO: session_id, query_id, country
+        search_handle_ = ss_client->search(base_url, query_.query_string(), query.department_id(), "session_id", 0, hints.form_factor(), hints.locale(), "", hints.cardinality());
     }
 
     ~SmartQuery() noexcept
@@ -144,8 +144,8 @@
         SmartScopesClient::SPtr ss_client = reg->get_ssclient();
         std::string base_url = reg->get_base_url(scope_id_);
 
-        ///! TODO: session_id, widgets_api_version, locale, country
-        preview_handle_ = ss_client->preview(base_url, result_["result_json"].get_string(), "session_id", hints.form_factor(), 0, "", "");
+        ///! TODO: session_id, widgets_api_version, country
+        preview_handle_ = ss_client->preview(base_url, result_["result_json"].get_string(), "session_id", hints.form_factor(), 0, hints.locale(), "");
     }
 
     ~SmartPreview()