Fixes menu translation.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2497 e93f8b46-1217-0410-a6f0-8f06a7374b81

Fixes menu translation.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2497 e93f8b46-1217-0410-a6f0-8f06a7374b81
9819a6bf · Jean-Philippe Lang · 95ba220b · 9819a6bf
Commit 9819a6bf authored Feb 21, 2009 by Jean-Philippe Lang
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 3 deletions

menu_manager.rb lib/redmine/menu_manager.rb +6 -3

No files found.
--- a/lib/redmine/menu_manager.rb
+++ b/lib/redmine/menu_manager.rb
@@ -99,7 +99,6 @@ module Redmine
              item.url
            end
            caption = item.caption(project)
-            caption = l_or_humanize(caption, :prefix => 'label_') if caption.is_a?(Symbol)
            if block_given?
              yield item, caption, url, (current_menu_item == item.name)
            else
@@ -186,7 +185,7 @@ module Redmine
        @url = url
        @condition = options[:if]
        @param = options[:param] || :id
-        @caption = options[:caption] || @name
+        @caption = options[:caption]
        @html_options = options[:html] || {}
        # Adds a unique class to each menu item based on its name
        @html_options[:class] = [@html_options[:class], @name.to_s.dasherize].compact.join(' ')
@@ -198,7 +197,11 @@ module Redmine
          c = @name.to_s.humanize if c.blank?
          c
        else
-          @caption
+          if @caption.nil?
+            l_or_humanize(name, :prefix => 'label_')
+          else
+            @caption.is_a?(Symbol) ? l(@caption) : @caption
+          end
        end
      end