jro_apps/redmine Commit - r2570:dea072f50619

Set a default scope for 'My page' block names translations (#3057)....

Jean-Philippe Lang -

r2570:dea072f50619

parent child

Context file:

r2570:dea072f50619

app/controllers/my_controller.rb +1 -1

                 session[:page_layout] = @blocks
                 %w(top left right).each {|f| session[:page_layout][f] ||= [] }
                 @block_options = []
-                BLOCKS.each {|k, v| @block_options << [l_or_humanize(v), k.dasherize]}
+                BLOCKS.each {|k, v| @block_options << [l("my.blocks.#{v}", :default => [v, v.to_s.humanize]), k.dasherize]}
               end
               # Add a block to user's page

lib/redmine/views/my_page/block.rb +1 -1

                     def self.additional_blocks
                       @@additional_blocks ||= Dir.glob("#{RAILS_ROOT}/vendor/plugins/*/app/views/my/blocks/_*.{rhtml,erb}").inject({}) do |h,file|
                         name = File.basename(file).split('.').first.gsub(/^_/, '')
-                        h[name] = name
+                        h[name] = name.to_sym
                         h
                       end
                     end

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages