summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2012-07-31 17:17:52 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2012-07-31 17:17:52 +0000
commitbc153cb61df37e2097c5bec529cabdb15e6887bf (patch)
tree05be0525dc3258c00349e7cc6b5ab333ca4139c0 /config
parent9554f0133ff634264eb110c91ad317be28e6dd32 (diff)
downloadredmine-bc153cb61df37e2097c5bec529cabdb15e6887bf.tar.gz
redmine-bc153cb61df37e2097c5bec529cabdb15e6887bf.zip
Support for subforums (#3831).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10142 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'config')
-rw-r--r--config/initializers/10-patches.rb4
-rw-r--r--config/locales/en.yml1
-rw-r--r--config/locales/fr.yml1
3 files changed, 5 insertions, 1 deletions
diff --git a/config/initializers/10-patches.rb b/config/initializers/10-patches.rb
index dc847de50..672f1c0a0 100644
--- a/config/initializers/10-patches.rb
+++ b/config/initializers/10-patches.rb
@@ -5,7 +5,9 @@ module ActiveRecord
include Redmine::I18n
# Translate attribute names for validation errors display
def self.human_attribute_name(attr, *args)
- l("field_#{attr.to_s.gsub(/_id$/, '')}", :default => attr)
+ attr = attr.to_s.sub(/_id$/, '')
+
+ l("field_#{name.underscore.gsub('/', '_')}_#{attr}", :default => ["field_#{attr}".to_sym, attr])
end
end
end
diff --git a/config/locales/en.yml b/config/locales/en.yml
index a6bbfa1fd..f35ba5745 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -330,6 +330,7 @@ en:
field_ldap_filter: LDAP filter
field_core_fields: Standard fields
field_timeout: "Timeout (in seconds)"
+ field_board_parent: Parent forum
setting_app_title: Application title
setting_app_subtitle: Application subtitle
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 007aecc7c..9afb86ed3 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -329,6 +329,7 @@ fr:
field_ldap_filter: Filtre LDAP
field_core_fields: Champs standards
field_timeout: "Timeout (en secondes)"
+ field_board_parent: Forum parent
setting_app_title: Titre de l'application
setting_app_subtitle: Sous-titre de l'application