From: Jean-Philippe Lang Date: Sun, 13 Jul 2008 13:25:37 +0000 (+0000) Subject: Prevent blank menu caption. X-Git-Tag: 0.8.0-RC1~354 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=937cee726905330807f1a97807749f1fc474d45d;p=redmine.git Prevent blank menu caption. git-svn-id: http://redmine.rubyforge.org/svn/trunk@1663 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- diff --git a/lib/redmine/menu_manager.rb b/lib/redmine/menu_manager.rb index 11b7a72e8..a3dc3ca25 100644 --- a/lib/redmine/menu_manager.rb +++ b/lib/redmine/menu_manager.rb @@ -167,7 +167,9 @@ module Redmine def caption(project=nil) if @caption.is_a?(Proc) - @caption.call(project) + c = @caption.call(project).to_s + c = @name.to_s.humanize if c.blank? + c else # check if localized string exists on first render (after GLoc strings are loaded) @caption_key ||= (@caption || (l_has_string?("label_#{@name}".to_sym) ? "label_#{@name}".to_sym : @name.to_s.humanize))