GitLab ist wegen Wartungsarbeiten am Montag, den 10. Mai, zwischen 17:00 und 19:00 Uhr nicht erreichbar.

Commit d6e407c1 authored by jplang's avatar jplang

Fixes menu translation.

git-svn-id: https://svn.redmine.org/redmine/trunk@2497 e93f8b46-1217-0410-a6f0-8f06a7374b81
parent a99afb44
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment