Index: lib/redmine.rb =================================================================== --- lib/redmine.rb (revision 1143) +++ lib/redmine.rb (working copy) @@ -89,18 +89,18 @@ end Redmine::MenuManager.map :top_menu do |menu| - menu.push :home, :home_url, :html => { :class => 'home' } - menu.push :my_page, { :controller => 'my', :action => 'page' }, :html => { :class => 'mypage' }, :if => Proc.new { User.current.logged? } + menu.push :home, :home_url, :caption => :label_home, :html => { :class => 'home' } + menu.push :my_page, { :controller => 'my', :action => 'page' }, :caption => :label_my_page, :html => { :class => 'mypage' }, :if => Proc.new { User.current.logged? } menu.push :projects, { :controller => 'projects', :action => 'index' }, :caption => :label_project_plural, :html => { :class => 'projects' } - menu.push :administration, { :controller => 'admin', :action => 'index' }, :html => { :class => 'admin' }, :if => Proc.new { User.current.admin? } - menu.push :help, Redmine::Info.help_url, :html => { :class => 'help' } + menu.push :administration, { :controller => 'admin', :action => 'index' }, :caption => :label_administration, :html => { :class => 'admin' }, :if => Proc.new { User.current.admin? } + menu.push :help, Redmine::Info.help_url, :caption => :label_help, :html => { :class => 'help' } end Redmine::MenuManager.map :account_menu do |menu| - menu.push :login, :signin_url, :html => { :class => 'login' }, :if => Proc.new { !User.current.logged? } - menu.push :register, { :controller => 'account', :action => 'register' }, :html => { :class => 'register' }, :if => Proc.new { !User.current.logged? && Setting.self_registration? } - menu.push :my_account, { :controller => 'my', :action => 'account' }, :html => { :class => 'myaccount' }, :if => Proc.new { User.current.logged? } - menu.push :logout, :signout_url, :html => { :class => 'logout' }, :if => Proc.new { User.current.logged? } + menu.push :login, :signin_url, :caption => :label_login, :html => { :class => 'login' }, :if => Proc.new { !User.current.logged? } + menu.push :register, { :controller => 'account', :action => 'register' }, :caption => :label_register, :html => { :class => 'register' }, :if => Proc.new { !User.current.logged? && Setting.self_registration? } + menu.push :my_account, { :controller => 'my', :action => 'account' }, :caption=> :label_my_account, :html => { :class => 'myaccount' }, :if => Proc.new { User.current.logged? } + menu.push :logout, :signout_url, :caption => :label_logout, :html => { :class => 'logout' }, :if => Proc.new { User.current.logged? } end Redmine::MenuManager.map :application_menu do |menu| @@ -108,21 +108,21 @@ end Redmine::MenuManager.map :project_menu do |menu| - menu.push :overview, { :controller => 'projects', :action => 'show' } - menu.push :activity, { :controller => 'projects', :action => 'activity' } - menu.push :roadmap, { :controller => 'projects', :action => 'roadmap' }, + menu.push :overview, { :controller => 'projects', :action => 'show' }, :caption => :label_overview + menu.push :activity, { :controller => 'projects', :action => 'activity' }, :caption => :label_activity + menu.push :roadmap, { :controller => 'projects', :action => 'roadmap' }, :caption => :label_roadmap, :if => Proc.new { |p| p.versions.any? } menu.push :issues, { :controller => 'issues', :action => 'index' }, :param => :project_id, :caption => :label_issue_plural menu.push :new_issue, { :controller => 'issues', :action => 'new' }, :param => :project_id, :caption => :label_issue_new, :html => { :accesskey => Redmine::AccessKeys.key_for(:new_issue) } menu.push :news, { :controller => 'news', :action => 'index' }, :param => :project_id, :caption => :label_news_plural menu.push :documents, { :controller => 'documents', :action => 'index' }, :param => :project_id, :caption => :label_document_plural - menu.push :wiki, { :controller => 'wiki', :action => 'index', :page => nil }, + menu.push :wiki, { :controller => 'wiki', :action => 'index', :page => nil }, :caption => :label_wiki, :if => Proc.new { |p| p.wiki && !p.wiki.new_record? } menu.push :boards, { :controller => 'boards', :action => 'index', :id => nil }, :param => :project_id, :if => Proc.new { |p| p.boards.any? }, :caption => :label_board_plural menu.push :files, { :controller => 'projects', :action => 'list_files' }, :caption => :label_attachment_plural - menu.push :repository, { :controller => 'repositories', :action => 'show' }, + menu.push :repository, { :controller => 'repositories', :action => 'show' }, :caption => :label_repository, :if => Proc.new { |p| p.repository && !p.repository.new_record? } - menu.push :settings, { :controller => 'projects', :action => 'settings' } + menu.push :settings, { :controller => 'projects', :action => 'settings' }, :caption => :label_settings end