Merge lp:~gordallott/unity/fix-hud-translation into lp:unity

[Gord Allott]

Fixes a hud translation issue, can't have const std::strings in an anonymous namespace.

Fixes a hud translation issue, can't have const std::strings in an anonymous namespace. no tests - for obvious reasons

[Michal Hruby (mhr3)]

+1

review: Approve

=== modified file 'plugins/unityshell/src/HudView.cpp'
--- plugins/unityshell/src/HudView.cpp	2012-04-01 00:45:53 +0000
+++ plugins/unityshell/src/HudView.cpp	2012-04-05 09:15:23 +0000
@@ -40,7 +40,6 @@
 {
 nux::logging::Logger logger("unity.hud.view");
 const int icon_size = 46;
-const std::string default_text = _("Type your command");
 const int grow_anim_length = 90 * 1000;
 const int pause_before_grow_length = 32 * 1000;
 
@@ -176,7 +175,7 @@
 void View::ResetToDefault()
 {
   search_bar_->search_string = "";
-  search_bar_->search_hint = default_text;
+  search_bar_->search_hint = _("Type your command");
 }
 
 void View::Relayout()
@@ -361,7 +360,7 @@
       search_bar_ = new unity::SearchBar(true);
       search_bar_->SetMinimumHeight(style.GetSearchBarHeight());
       search_bar_->SetMaximumHeight(style.GetSearchBarHeight());
-      search_bar_->search_hint = default_text;
+      search_bar_->search_hint = _("Type your command");
       search_bar_->search_changed.connect(sigc::mem_fun(this, &View::OnSearchChanged));
       AddChild(search_bar_.GetPointer());
       content_layout_->AddView(search_bar_.GetPointer(), 0, nux::MINOR_POSITION_LEFT);
@@ -385,7 +384,7 @@
   search_changed.emit(search_string);
   if (search_string.empty())
   {
-    search_bar_->search_hint = default_text;
+    search_bar_->search_hint = _("Type your command");
   }
   else
   {
@@ -493,7 +492,7 @@
     else
     {
       search_bar_->search_string = "";
-      search_bar_->search_hint = default_text;
+      search_bar_->search_hint = _("Type your command");
     }
     return true;
   }
@@ -544,13 +543,13 @@
 
     if (search_bar_->search_string == "")
     {
-      search_bar_->search_hint = default_text;
+      search_bar_->search_hint = _("Type your command");
       ubus.SendMessage(UBUS_HUD_CLOSE_REQUEST);
     }
     else
     {
       search_bar_->search_string = "";
-      search_bar_->search_hint = default_text;
+      search_bar_->search_hint = _("Type your command");
       return search_bar_->text_entry();
     }
     return NULL;