human_attribute_name accepts optional argument.

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

diff --git a/app/models/group.rb b/app/models/group.rb
index c79b98111f1de526ec1a14386255355dcca268c9..cd0368a5c7a59876be8ed03fbeb923bbee8c6b77 100644 (file)
--- a/app/models/group.rb
+++ b/app/models/group.rb
@@ -51,12 +51,12 @@ class Group < Principal
     end
   end
 
-  def self.human_attribute_name(attribute_key_name)
+  def self.human_attribute_name(attribute_key_name, *args)
     attr_name = attribute_key_name
     if attr_name == 'lastname'
       attr_name = "name"
     end
-    super(attr_name)
+    super(attr_name, *args)
   end
 
   private

diff --git a/app/models/repository.rb b/app/models/repository.rb
index 2cd5c88205106e324bb3dbd6a3a156437a0009a5..5130cc22077c3e4182eb0072f9ee09ffc557b9a8 100644 (file)
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -40,12 +40,12 @@ class Repository < ActiveRecord::Base
     end
   end
 
-  def self.human_attribute_name(attribute_key_name)
+  def self.human_attribute_name(attribute_key_name, *args)
     attr_name = attribute_key_name
     if attr_name == "log_encoding"
       attr_name = "commit_logs_encoding"
     end
-    super(attr_name)
+    super(attr_name, *args)
   end
 
   # Removes leading and trailing whitespace

diff --git a/app/models/repository/bazaar.rb b/app/models/repository/bazaar.rb
index b290bc8b0d2ba49a914c10dbef776a2a0abee6a0..d18dd6aede5f488977fda155b358e3863053af1a 100644 (file)
--- a/app/models/repository/bazaar.rb
+++ b/app/models/repository/bazaar.rb
@@ -21,12 +21,12 @@ class Repository::Bazaar < Repository
   attr_protected :root_url
   validates_presence_of :url, :log_encoding
 
-  def self.human_attribute_name(attribute_key_name)
+  def self.human_attribute_name(attribute_key_name, *args)
     attr_name = attribute_key_name
     if attr_name == "url"
       attr_name = "path_to_repository"
     end
-    super(attr_name)
+    super(attr_name, *args)
   end
 
   def self.scm_adapter_class

diff --git a/app/models/repository/cvs.rb b/app/models/repository/cvs.rb
index e1bc9e33d6205f4567cfe311d8b847a24ba41b77..f8c10ddff40e17cd3ce4b4e503caf32cdd234982 100644 (file)
--- a/app/models/repository/cvs.rb
+++ b/app/models/repository/cvs.rb
@@ -21,14 +21,14 @@ require 'digest/sha1'
 class Repository::Cvs < Repository
   validates_presence_of :url, :root_url, :log_encoding
 
-  def self.human_attribute_name(attribute_key_name)
+  def self.human_attribute_name(attribute_key_name, *args)
     attr_name = attribute_key_name
     if attr_name == "root_url"
       attr_name = "cvsroot"
     elsif attr_name == "url"
       attr_name = "cvs_module"
     end
-    super(attr_name)
+    super(attr_name, *args)
   end
 
   def self.scm_adapter_class

diff --git a/app/models/repository/darcs.rb b/app/models/repository/darcs.rb
index 8003583a54447b47ddc8cfabd418027995036c39..187e4783e11aaad8370a5472c3b5d3c89831e392 100644 (file)
--- a/app/models/repository/darcs.rb
+++ b/app/models/repository/darcs.rb
@@ -20,12 +20,12 @@ require 'redmine/scm/adapters/darcs_adapter'
 class Repository::Darcs < Repository
   validates_presence_of :url, :log_encoding
 
-  def self.human_attribute_name(attribute_key_name)
+  def self.human_attribute_name(attribute_key_name, *args)
     attr_name = attribute_key_name
     if attr_name == "url"
       attr_name = "path_to_repository"
     end
-    super(attr_name)
+    super(attr_name, *args)
   end
 
   def self.scm_adapter_class

diff --git a/app/models/repository/filesystem.rb b/app/models/repository/filesystem.rb
index a107a2f641fefbd13f65c6c4968800ae73a38263..ca8a67284a3e99c1919284c99a581ce08e58bc04 100644 (file)
--- a/app/models/repository/filesystem.rb
+++ b/app/models/repository/filesystem.rb
@@ -24,12 +24,12 @@ class Repository::Filesystem < Repository
   attr_protected :root_url
   validates_presence_of :url
 
-  def self.human_attribute_name(attribute_key_name)
+  def self.human_attribute_name(attribute_key_name, *args)
     attr_name = attribute_key_name
     if attr_name == "url"
       attr_name = "root_directory"
     end
-    super(attr_name)
+    super(attr_name, *args)
   end
 
   def self.scm_adapter_class

diff --git a/app/models/repository/git.rb b/app/models/repository/git.rb
index 586a6e5ef5834b1d581c698553d66f77fc443468..86507acbc90c97f3ebc4e2a8bfb4eb55a4ea38b7 100644 (file)
--- a/app/models/repository/git.rb
+++ b/app/models/repository/git.rb
@@ -22,12 +22,12 @@ class Repository::Git < Repository
   attr_protected :root_url
   validates_presence_of :url
 
-  def self.human_attribute_name(attribute_key_name)
+  def self.human_attribute_name(attribute_key_name, *args)
     attr_name = attribute_key_name
     if attr_name == "url"
       attr_name = "path_to_repository"
     end
-    super(attr_name)
+    super(attr_name, *args)
   end
 
   def self.scm_adapter_class

diff --git a/app/models/repository/mercurial.rb b/app/models/repository/mercurial.rb
index 58332e803c9faaf1ca3644118d99b2fd5f481ca4..e40841f203cd9a7dd7df399330817b4e3ec1bbeb 100644 (file)
--- a/app/models/repository/mercurial.rb
+++ b/app/models/repository/mercurial.rb
@@ -29,12 +29,12 @@ class Repository::Mercurial < Repository
   # number of changesets to fetch at once
   FETCH_AT_ONCE = 100
 
-  def self.human_attribute_name(attribute_key_name)
+  def self.human_attribute_name(attribute_key_name, *args)
     attr_name = attribute_key_name
     if attr_name == "url"
       attr_name = "path_to_repository"
     end
-    super(attr_name)
+    super(attr_name, *args)
   end
 
   def self.scm_adapter_class

diff --git a/config/initializers/10-patches.rb b/config/initializers/10-patches.rb
index ad301d8879516c79bccd2f9d2f6ecc4c083b6c36..b4810f0fa58ee2d25b42232e659d0a6dbbc555aa 100644 (file)
--- a/config/initializers/10-patches.rb
+++ b/config/initializers/10-patches.rb
@@ -10,7 +10,7 @@ module ActiveRecord
     include Redmine::I18n
 
     # Translate attribute names for validation errors display
-    def self.human_attribute_name(attr)
+    def self.human_attribute_name(attr, *args)
       l("field_#{attr.to_s.gsub(/_id$/, '')}", :default => attr)
     end
   end