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

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

Set a default scope for 'My page' block names translations (#3057).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2659 e93f8b46-1217-0410-a6f0-8f06a7374b81
dea072f5 · Jean-Philippe Lang · 66839c12 · dea072f5 · dea072f5
Commit dea072f5 authored Apr 05, 2009 by Jean-Philippe Lang
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

my_controller.rb app/controllers/my_controller.rb +1 -1

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

No files found.
--- a/app/controllers/my_controller.rb
+++ b/app/controllers/my_controller.rb
@@ -108,7 +108,7 @@ class MyController < ApplicationController
    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

--- a/lib/redmine/views/my_page/block.rb
+++ b/lib/redmine/views/my_page/block.rb
@@ -22,7 +22,7 @@ module Redmine
        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