Merge lp:~alecu/unity-scope-click/fix-static-translations into lp:unity-scope-click/devel

[Alejandro J. Cura]

Do not use static const strings for translations.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:411
http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-ci/277/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-amd64-ci/252
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/251
        deb: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/251/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-i386-ci/251

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-team-unity-scope-click-devel-ci/277/rebuild

review: Approve (continuous-integration)

[Paweł Stołowski (stolowski)]

Makes sense, +1.

review: Approve

[Diego Sarmentero (diegosarmentero)]

+1

review: Approve

=== modified file 'libclickscope/click/preview.cpp'
--- libclickscope/click/preview.cpp	2014-08-13 14:43:32 +0000
+++ libclickscope/click/preview.cpp	2014-08-19 21:47:21 +0000
@@ -55,10 +55,6 @@
 
 namespace click {
 
-const std::string PreviewStrategy::INFO_LABEL = _("Info");
-const std::string PreviewStrategy::UPDATES_LABEL = _("Updates");
-const std::string PreviewStrategy::WHATS_NEW_LABEL = _("What's new");
-
 DepartmentUpdater::DepartmentUpdater(const std::shared_ptr<click::DepartmentsDb>& depts)
     : depts(depts)
 {
@@ -349,7 +345,7 @@
     if (!details.description.empty())
     {
         scopes::PreviewWidget summary("summary", "text");
-        summary.add_attribute_value("title", scopes::Variant(INFO_LABEL));
+        summary.add_attribute_value("title", scopes::Variant(_("Info")));
         summary.add_attribute_value("text", scopes::Variant(details.description));
         widgets.push_back(summary);
     }
@@ -359,12 +355,12 @@
     widgets.push_back(other_metadata);
 
     scopes::PreviewWidget updates("updates", "text");
-    updates.add_attribute_value("title", scopes::Variant(UPDATES_LABEL));
+    updates.add_attribute_value("title", scopes::Variant(_("Updates")));
     updates.add_attribute_value("text", scopes::Variant(build_updates_table(details)));
     widgets.push_back(updates);
 
     scopes::PreviewWidget whats_new("whats_new", "text");
-    whats_new.add_attribute_value("title", scopes::Variant(WHATS_NEW_LABEL));
+    whats_new.add_attribute_value("title", scopes::Variant(_("What's new")));
     whats_new.add_attribute_value("text", scopes::Variant(build_whats_new(details)));
     widgets.push_back(whats_new);
 

=== modified file 'libclickscope/click/preview.h'
--- libclickscope/click/preview.h	2014-08-13 14:43:32 +0000
+++ libclickscope/click/preview.h	2014-08-19 21:47:21 +0000
@@ -126,9 +126,6 @@
 
     virtual void cancelled();
     virtual void run(unity::scopes::PreviewReplyProxy const& reply) = 0;
-    static const std::string INFO_LABEL;
-    static const std::string UPDATES_LABEL;
-    static const std::string WHATS_NEW_LABEL;
 protected:
     virtual void populateDetails(std::function<void(const PackageDetails &)> details_callback,
                                  std::function<void(const click::ReviewList&,

=== modified file 'libclickscope/tests/test_preview.cpp'
--- libclickscope/tests/test_preview.cpp	2014-08-13 14:43:32 +0000
+++ libclickscope/tests/test_preview.cpp	2014-08-19 21:47:21 +0000
@@ -127,15 +127,15 @@
 
 TEST_F(PreviewStrategyDescriptionTest, testDescriptionWidgets)
 {
-    assertWidgetAttribute(0, "title", click::PreviewStrategy::INFO_LABEL);
+    assertWidgetAttribute(0, "title", "Info");
     assertWidgetAttribute(0, "text", details.description);
 
     assertWidgetAttribute(1, "text", preview.build_other_metadata(details));
 
-    assertWidgetAttribute(2, "title", click::PreviewStrategy::UPDATES_LABEL);
+    assertWidgetAttribute(2, "title", "Updates");
     assertWidgetAttribute(2, "text", preview.build_updates_table(details));
 
-    assertWidgetAttribute(3, "title", click::PreviewStrategy::WHATS_NEW_LABEL);
+    assertWidgetAttribute(3, "title", "What's new");
     assertWidgetAttribute(3, "text", preview.build_whats_new(details));
 
 }