diff options
| author | José Valim <jose.valim@gmail.com> | 2011-04-28 00:36:32 -0700 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2011-04-28 00:36:32 -0700 |
| commit | be55228bbf7df58d5eff483ae1b105fa7680de71 (patch) | |
| tree | 9dff6730971f28b682062bf7a7b9447480f8e4ff /actionpack/lib/action_view | |
| parent | 2a25c5818b03d7d6cd63aad180bff23479dbd861 (diff) | |
| parent | a07cee62c7d23ec587ef961beb35ce3ac63df340 (diff) | |
| download | rails-be55228bbf7df58d5eff483ae1b105fa7680de71.tar.gz rails-be55228bbf7df58d5eff483ae1b105fa7680de71.tar.bz2 rails-be55228bbf7df58d5eff483ae1b105fa7680de71.zip | |
Merged pull request #333 from jgarber/master.
Specific translations for labels with values
Diffstat (limited to 'actionpack/lib/action_view')
| -rw-r--r-- | actionpack/lib/action_view/helpers/form_helper.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/helpers/form_helper.rb b/actionpack/lib/action_view/helpers/form_helper.rb index 440acafa88..efe30441b1 100644 --- a/actionpack/lib/action_view/helpers/form_helper.rb +++ b/actionpack/lib/action_view/helpers/form_helper.rb @@ -947,7 +947,8 @@ module ActionView label_tag(name_and_id["id"], options, &block) else content = if text.blank? - I18n.t("helpers.label.#{object_name}.#{method_name}", :default => "").presence + method_and_value = tag_value.present? ? "#{method_name}.#{tag_value}" : method_name + I18n.t("helpers.label.#{object_name}.#{method_and_value}", :default => "").presence else text.to_s end |