Merge lp:~bregma/unity/lp-1106849 into lp:unity

[Stephen M. Webb]

Internationalized ‘No Image Available’ in Dash Previews (lp: #1106849).

= Problem description =

Placeholder string in Previews was not internationalized.

= The fix =

Internationalized the placeholder string.

= Test coverage =

Added AP test unity.tests.test_dash.PreviewMavigateTests.test_overlay_text to ensure there is no regression (l10n tests are not yet available in autopilot).

[Brandon Schaefer (brandontschaefer)]

LGTM

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-mbs-autolanding/492/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mbs-autolanding/./build=pbuilder,distribution=raring,flavor=amd64/492/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mbs-autolanding/./build=pbuilder,distribution=raring,flavor=i386/492/console

review: Needs Fixing (continuous-integration)

[Brandon Schaefer (brandontschaefer)]

Pfft no space left? Make some!

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'tests/autopilot/unity/tests/test_dash.py'
--- tests/autopilot/unity/tests/test_dash.py	2013-02-28 11:46:58 +0000
+++ tests/autopilot/unity/tests/test_dash.py	2013-03-14 18:12:26 +0000
@@ -972,6 +972,12 @@
 
         self.assertThat(self.unity.dash.preview_displaying, Eventually(Equals(False)))
 
+    def test_overlay_text(self):
+        """Fallback overlay text is internationalized, should always be valid."""
+        cover_art = self.get_current_preview().cover_art[0]
+        self.assertThat(cover_art.overlay_text,
+                        Eventually(Equals("No Image Available")))
+
 
 class PreviewClickCancelTests(DashTestCase):
     """Tests that the preview closes when left, middle, and right clicking in the preview"""
 
=== modified file 'unity-shared/CoverArt.cpp'
--- unity-shared/CoverArt.cpp	2012-12-17 21:30:27 +0000
+++ unity-shared/CoverArt.cpp	2013-03-14 18:12:26 +0000
@@ -20,6 +20,7 @@
  *              Nick Dedekind <[e-mail]>
  *
  */
+#include "config.h"
 
 #include "CoverArt.h"
 #include "unity-shared/IntrospectableWrappers.h"
@@ -29,6 +30,7 @@
 #include "DashStyle.h"
 #include "IconLoader.h"
 #include "PreviewStyle.h"
+#include <glib/gi18n-lib.h>
 
 namespace unity
 {
@@ -83,7 +85,8 @@
   variant::BuilderWrapper(builder)
     .add(GetAbsoluteGeometry())
     .add("image-hint", image_hint_)
-    .add("waiting", waiting_);
+    .add("waiting", waiting_)
+    .add("overlay-text", overlay_text_->GetText());
 }
 
 void CoverArt::SetImage(std::string const& image_hint)
@@ -446,7 +449,7 @@
   overlay_text_->SetTextAlignment(StaticCairoText::NUX_ALIGN_CENTRE);
   overlay_text_->SetFont("Ubuntu 14");
   overlay_text_->SetLines(-3);
-  overlay_text_->SetText("No Image Available");
+  overlay_text_->SetText(_("No Image Available"));
 
   dash::Style& style = dash::Style::Instance();
   spin_ = style.GetSearchSpinIcon();