jro_apps/redmine Commit - r6006:fa6fa2dc1984

Fixed: queries error messages about custom fields output a 'translation missing' error (#8554)....

Jean-Baptiste Barth -

r6006:fa6fa2dc1984

parent child

Context file:

r6006:fa6fa2dc1984

Collapse all files

test/unit/initializers/patches_test.rb created 644 +40 0

@@ -0,0 +1,40
	1	# Redmine - project management software
	2	# Copyright (C) 2006-2011 Jean-Philippe Lang
	3	#
	4	# This program is free software; you can redistribute it and/or
	5	# modify it under the terms of the GNU General Public License
	6	# as published by the Free Software Foundation; either version 2
	7	# of the License, or (at your option) any later version.
	8	#
	9	# This program is distributed in the hope that it will be useful,
	10	# but WITHOUT ANY WARRANTY; without even the implied warranty of
	11	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	12	# GNU General Public License for more details.
	13	#
	14	# You should have received a copy of the GNU General Public License
	15	# along with this program; if not, write to the Free Software
	16	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
	17
	18	require File.expand_path('../../../test_helper', __FILE__)
	19
	20	class PatchesTest < ActiveSupport::TestCase
	21	include Redmine::I18n
	22
	23	context "ActiveRecord::Base.human_attribute_name" do
	24	setup do
	25	Setting.default_language = 'en'
	26	end
	27
	28	should "transform name to field_name" do
	29	assert_equal l('field_last_login_on'), ActiveRecord::Base.human_attribute_name('last_login_on')
	30	end
	31
	32	should "cut extra _id suffix for better validation" do
	33	assert_equal l('field_last_login_on'), ActiveRecord::Base.human_attribute_name('last_login_on_id')
	34	end
	35
	36	should "default to humanized value if no translation has been found (useful for custom fields)" do
	37	assert_equal 'Patch name', ActiveRecord::Base.human_attribute_name('Patch name')
	38	end
	39	end
	40	end

config/initializers/10-patches.rb +1 -1

             require 'active_record'
             module ActiveRecord
               class Base
                 include Redmine::I18n
                 # Translate attribute names for validation errors display
                 def self.human_attribute_name(attr)
-                  l("field_#{attr.to_s.gsub(/_id$/, '')}")
+                  l("field_#{attr.to_s.gsub(/_id$/, '')}", :default => attr)
                 end
               end
             end
             module ActiveRecord
               class Errors
                 def full_messages(options = {})
                   full_messages = []
                   @errors.each_key do |attr|
                     @errors[attr].each do |message|
                       next unless message
                       if attr == "base"
                         full_messages << message
                       elsif attr == "custom_values"
                         # Replace the generic "custom values is invalid"
                         # with the errors on custom values
                         @base.custom_values.each do |value|
                           value.errors.each do |attr, msg|
                             full_messages << value.custom_field.name + ' ' + msg
                           end
                         end
                       else
                         attr_name = @base.class.human_attribute_name(attr)
                         full_messages << attr_name + ' ' + message.to_s
                       end
                     end
                   end
                   full_messages
                 end
               end
             end
             module ActionView
               module Helpers
                 module DateHelper
                   # distance_of_time_in_words breaks when difference is greater than 30 years
                   def distance_of_date_in_words(from_date, to_date = 0, options = {})
                     from_date = from_date.to_date if from_date.respond_to?(:to_date)
                     to_date = to_date.to_date if to_date.respond_to?(:to_date)
                     distance_in_days = (to_date - from_date).abs
                     I18n.with_options :locale => options[:locale], :scope => :'datetime.distance_in_words' do |locale|
                       case distance_in_days
                         when 0..60     then locale.t :x_days,             :count => distance_in_days.round
                         when 61..720   then locale.t :about_x_months,     :count => (distance_in_days / 30).round
                         else                locale.t :over_x_years,       :count => (distance_in_days / 365).floor
                       end
                     end
                   end
                 end
               end
             end
             ActionView::Base.field_error_proc = Proc.new{ |html_tag, instance| "#{html_tag}" }
             # Adds :async_smtp and :async_sendmail delivery methods
             # to perform email deliveries asynchronously
             module AsynchronousMailer
               %w(smtp sendmail).each do |type|
                 define_method("perform_delivery_async_#{type}") do |mail|
                   Thread.start do
                     send "perform_delivery_#{type}", mail
                   end
                 end
               end
             end
             ActionMailer::Base.send :include, AsynchronousMailer
             # TMail::Unquoter.convert_to_with_fallback_on_iso_8859_1 introduced in TMail 1.2.7
             # triggers a test failure in test_add_issue_with_japanese_keywords(MailHandlerTest)
             module TMail
               class Unquoter
                 class << self
                   alias_method :convert_to, :convert_to_without_fallback_on_iso_8859_1
                 end
               end
             end
             module ActionController
               module MimeResponds
                 class Responder
                   def api(&block)
                     any(:xml, :json, &block)
                   end
                 end
               end
             end

General Comments 0

Write
Preview

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

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	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