Make ComfortableMexicanSofa::FormBuilder translate field labels
Jorge Calás Lozano
committed May 30, 2011
commit 302eed97c536c5c39e53b926d70237b52203570e
Showing 5
changed files with
23 additions
and 23 deletions
app/views/cms_admin/layouts/_form.html.erb
+7
-7
| @@ | @@ -2,18 +2,18 @@ |
| <%= render :partial => 'cms_admin/uploads/index' %> | |
| <% end %> | |
| - | <%= form.text_field :label, :label => t('cms.views.layouts.layout_name'), :id => (@cms_layout.new_record?? 'slugify' : nil)%> |
| - | <%= form.text_field :slug, :id => 'slug', :label => t('cms.forms.slug') %> |
| + | <%= form.text_field :label, :id => (@cms_layout.new_record?? 'slugify' : nil)%> |
| + | <%= form.text_field :slug, :id => 'slug' %> |
| <% if (options = Cms::Layout.options_for_select(@cms_site, @cms_layout)).present? %> | |
| - | <%= form.select :parent_id, [["---- #{t('cms.views.layouts.select_parent_layout')} ----", nil]] + options, :label => t('cms.views.layouts.parent_layout') %> |
| + | <%= form.select :parent_id, [["---- #{t('cms.views.layouts.select_parent_layout')} ----", nil]] + options %> |
| <% end %> | |
| <% if (options = Cms::Layout.app_layouts_for_select).present? %> | |
| - | <%= form.select :app_layout, [["---- #{t('cms.views.layouts.select_application_layout')} ----", nil]] + options, :label => t('cms.views.layouts.app_layout') %> |
| + | <%= form.select :app_layout, [["---- #{t('cms.views.layouts.select_application_layout')} ----", nil]] + options %> |
| <% end %> | |
| - | <%= form.text_area :content, :class => 'code', :label => t('cms.forms.content') %> |
| - | <%= form.text_area :css, :class => 'code_css', :label => "CSS" %> |
| - | <%= form.text_area :js, :class => 'code_js', :label => "Javascript" %> |
| + | <%= form.text_area :content, :class => 'code' %> |
| + | <%= form.text_area :css, :class => 'code_css' %> |
| + | <%= form.text_area :js, :class => 'code_js' %> |
| <%= form.simple_field nil, nil, :class => 'submit_element' do %> | |
| <%= form.submit t("cms.views.layouts.#{@cms_layout.new_record? ? 'create_layout' : 'update_layout'}"), :disable_builder => true %> | |
app/views/cms_admin/pages/_form.html.erb
+7
-7
| @@ | @@ -2,27 +2,27 @@ |
| <div id='page_save' class='box'> | |
| <label> | |
| <input type='checkbox'/> | |
| - | <%= t('cms.views.pages.published') %> |
| + | <%= Cms::Page.human_attribute_name(:is_published) %> |
| </label> | |
| <button></button> | |
| </div> | |
| <%= render :partial => 'cms_admin/uploads/index' %> | |
| <% end %> | |
| - | <%= form.text_field :label, :id => (@cms_page.new_record?? 'slugify' : nil), :label => t('cms.forms.label') %> |
| + | <%= form.text_field :label, :id => (@cms_page.new_record?? 'slugify' : nil) %> |
| <div class='page_form_extras'> | |
| <% unless @cms_site.pages.count == 0 || @cms_site.pages.root == @cms_page%> | |
| - | <%= form.text_field :slug, :id => 'slug', :label => t('cms.forms.slug') %> |
| + | <%= form.text_field :slug, :id => 'slug' %> |
| <% end %> | |
| <% if (options = Cms::Layout.options_for_select(@cms_site)).present? %> | |
| - | <%= form.select :layout_id, options, {}, 'data-page-id' => @cms_page.id.to_i, :label => t('cms.forms.layout') %> |
| + | <%= form.select :layout_id, options, {}, 'data-page-id' => @cms_page.id.to_i %> |
| <% end %> | |
| <% if (options = Cms::Page.options_for_select(@cms_site, @cms_page)).present? %> | |
| - | <%= form.select :parent_id, options, :label => t('cms.forms.parent') %> |
| + | <%= form.select :parent_id, options %> |
| <% end %> | |
| <% if (options = Cms::Page.options_for_select(@cms_site, @cms_page, nil, 0, false)).present? %> | |
| - | <%= form.select :target_page_id, [["---- #{t('cms.views.pages.no_redirect')} ----", nil]] + options, :label => t('cms.views.pages.redirect_to_page') %> |
| + | <%= form.select :target_page_id, [["---- #{t('cms.views.pages.no_redirect')} ----", nil]] + options %> |
| <% end %> | |
| <%= cms_hook :page_form, :object => form %> | |
| </div> | |
| @@ | @@ -31,7 +31,7 @@ |
| <%= form.simple_field nil, nil, :class => 'submit_element' do %> | |
| <%= form.check_box :is_published, :disable_builder => true %> | |
| - | <%= form.label_for :is_published, :label => t('cms.views.pages.published') %> |
| + | <%= form.label_for :is_published %> |
| <%= form.submit t('cms.views.pages.preview'), :name => 'preview', :id => nil, :disable_builder => true %> | |
| <%= form.submit t("cms.views.pages.#{@cms_page.new_record? ? 'create_page' : 'update_page'}"), :disable_builder => true %> | |
| <% end %> | |
app/views/cms_admin/sites/_form.html.erb
+2
-2
| @@ | @@ -1,5 +1,5 @@ |
| - | <%= form.text_field :label, :label => t('cms.forms.label') %> |
| - | <%= form.text_field :hostname, :label => t('cms.forms.hostname') %> |
| + | <%= form.text_field :label %> |
| + | <%= form.text_field :hostname %> |
| <%= form.simple_field nil, nil, :class => 'submit_element' do %> | |
| <%= form.submit t("cms.views.sites.#{@cms_site.new_record? ? 'create_site' : 'update_site'}"), :disable_builder => true %> | |
app/views/cms_admin/snippets/_form.html.erb
+3
-3
| @@ | @@ -2,9 +2,9 @@ |
| <%= render :partial => 'cms_admin/uploads/index' %> | |
| <% end %> | |
| - | <%= form.text_field :label, :id => (@cms_snippet.new_record?? 'slugify' : nil), :label => t('cms.forms.label') %> |
| - | <%= form.text_field :slug, :id => 'slug', :class => 'delimiter-underscore', :label => t('cms.forms.slug') %> |
| - | <%= form.text_area :content, :class => 'code', :label => t('cms.forms.content') %> |
| + | <%= form.text_field :label, :id => (@cms_snippet.new_record?? 'slugify' : nil) %> |
| + | <%= form.text_field :slug, :id => 'slug', :class => 'delimiter-underscore' %> |
| + | <%= form.text_area :content, :class => 'code' %> |
| <%= form.simple_field nil, nil, :class => 'submit_element' do %> | |
| <%= form.submit t("cms.views.snippets.#{@cms_snippet.new_record? ? 'create_snippet' : 'update_snippet'}"), :disable_builder => true %> | |
comfortable_mexican_sofa/form_builder.rb b/lib/comfortable_mexican_sofa/form_builder.rb
+4
-4
| @@ | @@ -41,9 +41,9 @@ class ComfortableMexicanSofa::FormBuilder < ActionView::Helpers::FormBuilder |
| </div> | |
| ).html_safe | |
| end | |
| - | |
| - | def label_for(field, options) |
| - | label = options.delete(:label) || field.to_s.titleize.capitalize_all |
| + | |
| + | def label_for(field, options={}) |
| + | label = options.delete(:label) || object.class.human_attribute_name(field) |
| "<label for=\"#{object_name}_#{field}\">#{label}</label>".html_safe | |
| end | |
| @@ | @@ -117,4 +117,4 @@ class ComfortableMexicanSofa::FormBuilder < ActionView::Helpers::FormBuilder |
| default_tag_field(tag, :content_field_method => :text_area_tag) | |
| end | |
| - | end |
| \ No newline at end of file | |
| + | end |