##// END OF EJS Templates
jro_apps » redmine
RSS
human_attribute_name accepts optional argument....
Jean-Philippe Lang -
r8166:5eed64b8488a
parent child
Show More
Side by Side Unified
Context file:
r8166:5eed64b8488a Loading diff...:
Show file before | Show file after | Hide comments
@@ -51,12 +51,12 class Group < Principal
51 end
51 end
52 end
52 end
53
53
54 def self.human_attribute_name(attribute_key_name)
54 def self.human_attribute_name(attribute_key_name, *args)
55 attr_name = attribute_key_name
55 attr_name = attribute_key_name
56 if attr_name == 'lastname'
56 if attr_name == 'lastname'
57 attr_name = "name"
57 attr_name = "name"
58 end
58 end
59 super(attr_name)
59 super(attr_name, *args)
60 end
60 end
61
61
62 private
62 private
Show file before | Show file after | Hide comments
@@ -40,12 +40,12 class Repository < ActiveRecord::Base
40 end
40 end
41 end
41 end
42
42
43 def self.human_attribute_name(attribute_key_name)
43 def self.human_attribute_name(attribute_key_name, *args)
44 attr_name = attribute_key_name
44 attr_name = attribute_key_name
45 if attr_name == "log_encoding"
45 if attr_name == "log_encoding"
46 attr_name = "commit_logs_encoding"
46 attr_name = "commit_logs_encoding"
47 end
47 end
48 super(attr_name)
48 super(attr_name, *args)
49 end
49 end
50
50
51 # Removes leading and trailing whitespace
51 # Removes leading and trailing whitespace
Show file before | Show file after | Hide comments
@@ -21,12 +21,12 class Repository::Bazaar < Repository
21 attr_protected :root_url
21 attr_protected :root_url
22 validates_presence_of :url, :log_encoding
22 validates_presence_of :url, :log_encoding
23
23
24 def self.human_attribute_name(attribute_key_name)
24 def self.human_attribute_name(attribute_key_name, *args)
25 attr_name = attribute_key_name
25 attr_name = attribute_key_name
26 if attr_name == "url"
26 if attr_name == "url"
27 attr_name = "path_to_repository"
27 attr_name = "path_to_repository"
28 end
28 end
29 super(attr_name)
29 super(attr_name, *args)
30 end
30 end
31
31
32 def self.scm_adapter_class
32 def self.scm_adapter_class
Show file before | Show file after | Hide comments
@@ -21,14 +21,14 require 'digest/sha1'
21 class Repository::Cvs < Repository
21 class Repository::Cvs < Repository
22 validates_presence_of :url, :root_url, :log_encoding
22 validates_presence_of :url, :root_url, :log_encoding
23
23
24 def self.human_attribute_name(attribute_key_name)
24 def self.human_attribute_name(attribute_key_name, *args)
25 attr_name = attribute_key_name
25 attr_name = attribute_key_name
26 if attr_name == "root_url"
26 if attr_name == "root_url"
27 attr_name = "cvsroot"
27 attr_name = "cvsroot"
28 elsif attr_name == "url"
28 elsif attr_name == "url"
29 attr_name = "cvs_module"
29 attr_name = "cvs_module"
30 end
30 end
31 super(attr_name)
31 super(attr_name, *args)
32 end
32 end
33
33
34 def self.scm_adapter_class
34 def self.scm_adapter_class
Show file before | Show file after | Hide comments
@@ -20,12 +20,12 require 'redmine/scm/adapters/darcs_adapter'
20 class Repository::Darcs < Repository
20 class Repository::Darcs < Repository
21 validates_presence_of :url, :log_encoding
21 validates_presence_of :url, :log_encoding
22
22
23 def self.human_attribute_name(attribute_key_name)
23 def self.human_attribute_name(attribute_key_name, *args)
24 attr_name = attribute_key_name
24 attr_name = attribute_key_name
25 if attr_name == "url"
25 if attr_name == "url"
26 attr_name = "path_to_repository"
26 attr_name = "path_to_repository"
27 end
27 end
28 super(attr_name)
28 super(attr_name, *args)
29 end
29 end
30
30
31 def self.scm_adapter_class
31 def self.scm_adapter_class
Show file before | Show file after | Hide comments
@@ -24,12 +24,12 class Repository::Filesystem < Repository
24 attr_protected :root_url
24 attr_protected :root_url
25 validates_presence_of :url
25 validates_presence_of :url
26
26
27 def self.human_attribute_name(attribute_key_name)
27 def self.human_attribute_name(attribute_key_name, *args)
28 attr_name = attribute_key_name
28 attr_name = attribute_key_name
29 if attr_name == "url"
29 if attr_name == "url"
30 attr_name = "root_directory"
30 attr_name = "root_directory"
31 end
31 end
32 super(attr_name)
32 super(attr_name, *args)
33 end
33 end
34
34
35 def self.scm_adapter_class
35 def self.scm_adapter_class
Show file before | Show file after | Hide comments
@@ -22,12 +22,12 class Repository::Git < Repository
22 attr_protected :root_url
22 attr_protected :root_url
23 validates_presence_of :url
23 validates_presence_of :url
24
24
25 def self.human_attribute_name(attribute_key_name)
25 def self.human_attribute_name(attribute_key_name, *args)
26 attr_name = attribute_key_name
26 attr_name = attribute_key_name
27 if attr_name == "url"
27 if attr_name == "url"
28 attr_name = "path_to_repository"
28 attr_name = "path_to_repository"
29 end
29 end
30 super(attr_name)
30 super(attr_name, *args)
31 end
31 end
32
32
33 def self.scm_adapter_class
33 def self.scm_adapter_class
Show file before | Show file after | Hide comments
@@ -29,12 +29,12 class Repository::Mercurial < Repository
29 # number of changesets to fetch at once
29 # number of changesets to fetch at once
30 FETCH_AT_ONCE = 100
30 FETCH_AT_ONCE = 100
31
31
32 def self.human_attribute_name(attribute_key_name)
32 def self.human_attribute_name(attribute_key_name, *args)
33 attr_name = attribute_key_name
33 attr_name = attribute_key_name
34 if attr_name == "url"
34 if attr_name == "url"
35 attr_name = "path_to_repository"
35 attr_name = "path_to_repository"
36 end
36 end
37 super(attr_name)
37 super(attr_name, *args)
38 end
38 end
39
39
40 def self.scm_adapter_class
40 def self.scm_adapter_class
Show file before | Show file after | Hide comments
@@ -10,7 +10,7 module ActiveRecord
10 include Redmine::I18n
10 include Redmine::I18n
11
11
12 # Translate attribute names for validation errors display
12 # Translate attribute names for validation errors display
13 def self.human_attribute_name(attr)
13 def self.human_attribute_name(attr, *args)
14 l("field_#{attr.to_s.gsub(/_id$/, '')}", :default => attr)
14 l("field_#{attr.to_s.gsub(/_id$/, '')}", :default => attr)
15 end
15 end
16 end
16 end
General Comments 0
You need to be logged in to leave comments. Login now