spree_mobility 1.0.0

data/app/models/concerns/spree_mobility/translatable.rb

@@ -0,0 +1,63 @@
+module SpreeMobility
+  module Translatable
+    extend ActiveSupport::Concern
+
+    include Spree::RansackableAttributes
+
+    included do |klass|
+      klass.send :extend, Mobility
+      klass.send(:default_scope) { i18n }
+    end
+
+    class_methods do
+      def translation_class
+        const_get('Translation')
+      end
+      
+      def ransack(params = {}, options = {})
+        params ||= {}
+        names = params.keys
+
+        # TODO: this should be used together with search param, only fallback if first is empty
+        # params[:translations_locale_in] ||= fallback_locales.map(&:to_s)
+
+        names.each do |n|
+          mobility_attributes.each do |t|
+            if n.to_s.starts_with? t.to_s
+              params[:"translations_#{n}"] = params[n]
+              params.delete n
+            end
+          end
+        end
+
+        super(params, options)
+      end
+      alias :search :ransack unless respond_to? :search
+
+      module CopyPreloadedActiveTranslationsToTranslations
+        # Although it has :nodoc, preload_associations is a public method of
+        # ActiveRecord::Relation and should be relatively safe to use.
+        # After the active_translations assoc is preloaded, we copy results over
+        # into translations - basically we load translations with results from
+        # active_translations.
+        def preload_associations(records)
+          super.tap do
+            records.each do |record|
+              # We don't want to overwrite translations if already present
+              next if record.association(:translations).target.present?
+              record.association(:translations).target =
+                record.association(:active_translations).target
+            end
+          end
+        end
+      end
+
+      def spree_base_scopes
+        # Only preload translations for current locale and its fallbacks
+        scope = super.preload(:active_translations)
+        scope.singleton_class.prepend CopyPreloadedActiveTranslationsToTranslations
+        return scope
+      end
+    end
+  end
+end

data/app/overrides/spree/admin/option_types/_option_value_fields/add_translation.rb

@@ -0,0 +1,10 @@
+Deface::Override.new(
+  virtual_path:  'spree/admin/option_types/_option_value_fields',
+  name:          'option_value_translation',
+  insert_bottom: 'td.actions',
+  text:           <<-HTML
+                    <% if f.object.persisted? %>
+                      <%= link_to_with_icon 'translate', nil, spree.admin_translations_path('option_values', f.object.id), title: Spree.t(:'i18n.translations'), class: 'btn btn-sm btn-primary' %>
+                    <% end %>
+                  HTML
+)

data/app/overrides/spree/admin/option_types/index/add_translation.rb

@@ -0,0 +1,8 @@
+Deface::Override.new(
+  virtual_path:  'spree/admin/option_types/index',
+  name:          'option_types_index_translation',
+  insert_top:    'td.actions',
+  text:          <<-HTML
+                  <%= link_to_with_icon 'translate', nil, spree.admin_translations_path('option_types', option_type.id), title: Spree.t(:'i18n.translations'), class: 'btn btn-sm btn-primary' %>
+                HTML
+)

data/app/overrides/spree/admin/product_properties/_product_property_fields/add_translation.rb

@@ -0,0 +1,10 @@
+Deface::Override.new(
+  virtual_path:  'spree/admin/product_properties/_product_property_fields',
+  name:          'product_property_translation',
+  insert_bottom: 'td.actions',
+  text:           <<-HTML
+                    <% if f.object.persisted? %>
+                      <%= link_to_with_icon 'translate', nil, spree.admin_translations_path('product_property', f.object.id), title: Spree.t(:'i18n.translations'), class: 'btn btn-sm btn-primary' %>
+                    <% end %>
+                  HTML
+)

data/app/overrides/spree/admin/products/index/search_by_name_or_sku.rb

@@ -0,0 +1,21 @@
+Deface::Override.new(
+  virtual_path:  'spree/admin/products/index',
+  name:          'search_by_name_or_sku',
+  replace: 'div[data-hook=admin_products_index_search] > div:first-child',
+  text: <<-HTML
+
+        <div class="col-12 col-lg-6">
+          <div class="form-group">
+            <%= f.label :search_by_name_or_sku, Spree.t(:name_or_sku) %>
+            <%= f.text_field :search_by_name_or_sku, size: 15, class: "form-control js-quick-search-target js-filterable" %>
+          </div>
+        </div>
+
+        <div class="col-12 col-lg-6">
+          <div class="form-group">
+            <%= f.label :search_by_name, Spree.t(:product_name) %>
+            <%= f.text_field :search_by_name, size: 15, class: "form-control js-filterable" %>
+          </div>
+        </div>
+        HTML
+)

data/app/overrides/spree/admin/promotions/index/add_translation_link.rb

@@ -0,0 +1,8 @@
+Deface::Override.new(
+  virtual_path:  'spree/admin/promotions/index',
+  name:          'promotions_translation',
+  insert_bottom: 'td.actions',
+  text:           <<-HTML
+                    <%= link_to_with_icon 'translate', nil, spree.admin_translations_path('promotions', promotion.id), title: Spree.t(:'i18n.translations'), class: 'btn btn-sm btn-primary' %>
+                  HTML
+)

data/app/overrides/spree/admin/properties/index/add_translation.rb

@@ -0,0 +1,8 @@
+Deface::Override.new(
+  virtual_path:  'spree/admin/properties/index',
+  name:          'properties_translation',
+  insert_bottom: 'td.actions',
+  text:           <<-HTML
+                    <%= link_to_with_icon 'translate', nil, spree.admin_translations_path('properties', property.id), title: Spree.t(:'i18n.translations'), class: 'btn btn-sm btn-primary' %>
+                  HTML
+)

data/app/overrides/spree/admin/shared/_product_tabs/add_translations.rb

@@ -0,0 +1,10 @@
+Deface::Override.new(
+  virtual_path:  'spree/admin/shared/_product_tabs',
+  name:          'product_tabs_translation',
+  insert_bottom: "[data-hook='admin_product_tabs']",
+  text:          <<-HTML
+                  <li>
+                    <%= link_to_with_icon 'translate', Spree.t(:'i18n.translations'), spree.admin_translations_url('products', @product.slug), class: "\#\{'active' if current == 'Translations'\} nav-link" %>
+                  </li>
+                HTML
+)

data/app/overrides/spree/admin/shared/_translations/translation.rb

@@ -0,0 +1,8 @@
+Deface::Override.new(
+  virtual_path:  'spree/admin/shared/_translations',
+  name:          'translations_translation',
+  insert_bottom: 'script',
+  text:           <<-HTML
+                    $.extend(Spree.translations, { translations: "<%= strip_tags(Spree.t(:'i18n.translations')) %>" })
+                  HTML
+)

data/app/overrides/spree/admin/shared/sub_menu/_configuration/store_translations.rb

@@ -0,0 +1,8 @@
+Deface::Override.new(
+  virtual_path:  'spree/admin/shared/sub_menu/_configuration',
+  name:          'sub_menu_configuration_translation',
+  insert_bottom: "[data-hook='admin_configurations_sidebar_menu']",
+  text:           <<-HTML
+                    <%= configurations_sidebar_menu_item Spree.t(:'mobility.store_translations'), spree.admin_translations_path('stores', current_store.id)  if can? :manage, Spree::Store %>
+                  HTML
+)

data/app/overrides/spree/admin/shipping_methods/index/add_translation.rb

@@ -0,0 +1,8 @@
+Deface::Override.new(
+  virtual_path:  'spree/admin/shipping_methods/index',
+  name:          'shipping_methods_translation',
+  insert_bottom: 'td.actions',
+  text:           <<-HTML
+                    <%= link_to_with_icon 'translate', nil, spree.admin_translations_path('shipping_methods', shipping_method.id), title: Spree.t(:'i18n.translations'), class: 'btn btn-sm btn-primary' %>
+                  HTML
+)

data/app/overrides/spree/admin/taxonomies/_list/add_translations.rb

@@ -0,0 +1,8 @@
+Deface::Override.new(
+  virtual_path:  'spree/admin/taxonomies/_list',
+  name:          'taxonomies_translation',
+  insert_bottom: 'td.actions',
+  text:           <<-HTML
+                    <%= link_to_with_icon 'translate', nil, spree.admin_translations_path('taxonomies', taxonomy.id), title: Spree.t(:'i18n.translations'), class: 'btn btn-sm btn-primary' %>
+                  HTML
+)

data/app/views/spree/admin/translations/_fields.html.erb

@@ -0,0 +1,12 @@
+<div class="panel panel-default fields">
+  <div class="panel-heading">
+    <%= Spree.t(:'i18n.fields') %>
+  </div>
+  <div class="list-group" id="attr_list">
+    <% @resource.class.mobility_attributes.each_with_index do |attr, i| %>
+      <a class="list-group-item <%= 'active' if i.zero? %>" data-attr="<%= attr %>" href="#">
+        <%= @resource.class.human_attribute_name(attr) %>
+      </a>
+    <% end %>
+  </div>
+</div>

data/app/views/spree/admin/translations/_form.html.erb

@@ -0,0 +1,13 @@
+<%= render 'settings' %>
+
+<div class="row translations">
+  <div class="col-md-4">
+    <%= render 'fields' %>
+  </div>
+  <div class="col-md-8">
+    <%= form_for [:admin, @resource] do |f| %>
+      <%= render 'form_fields', f: f %>
+      <%= render 'spree/admin/shared/edit_resource_links' %>
+    <% end %>
+  </div>
+</div>

data/app/views/spree/admin/translations/_form_fields.html.erb

@@ -0,0 +1,38 @@
+<div id="attr_fields">
+  <% available_locales.each do |locale| %>
+    <%= f.mobility_fields_for locale.to_sym do |g| %>
+      <% @resource.class.mobility_attributes.each_with_index do |attr, i| %>
+        <div class="panel panel-default <%= attr %> <%= locale %>" style="display:<%= i == 0 ? 'auto' : 'none' %>;">
+          <div class="panel-heading">
+            <% I18n.with_locale(locale) do %>
+              <%= @resource.class.human_attribute_name(attr) %>
+
+              <div class="pull-right text-muted">
+                <small><i><%= Spree.t(:'i18n.this_file_language') %></i></small>
+              </div>
+            <% end %>
+          </div>
+
+          <div class="panel-body">
+            <% field_type = @resource.class.translation_class.columns_hash[attr.to_s].type %>
+            <% if @resource.kind_of?(Spree::Product) && attr.to_sym == :description %>
+              <%= g.text_area :description, { rows: "30", class: "form-control #{"spree-rte" if Spree::Config[:product_wysiwyg_editor_enabled] }" } %>
+            <% elsif @resource.kind_of?(Spree::Taxon) && attr.to_sym == :description %>
+              <%= g.text_area :description, { rows: "30", class: "form-control #{"spree-rte" if Spree::Config[:taxon_wysiwyg_editor_enabled] }" } %>
+            <% elsif field_type == :text %>
+              <%= g.text_area attr, class: 'form-control', rows: 4 %>
+            <% else %>
+              <%= g.text_field attr, class: 'form-control' %>
+            <% end %>
+          </div>
+        </div>
+      <% end %>
+    <% end %>
+  <% end %>
+
+  <p class="no-translations" style="display: none">
+    <%= Spree.t(:'mobility.no_translations_for_criteria') %>
+  </p>
+</div>
+
+<hr/>

data/app/views/spree/admin/translations/_settings.html.erb

@@ -0,0 +1,22 @@
+<div class="well well-sm">
+	<div class="row no-padding-bottom">
+	  <div class="col-md-4">
+	  	<div class="form-group no-margin-bottom">
+		  	<label><%= Spree.t(:show) %></label>
+		    <select class="form-control" name="show-only">
+			    <option value="all"><%= Spree.t(:all) %></option>
+			    <option value="incomplete"><%= Spree.t(:'i18n.only_incomplete') %></option>
+			    <option value="complete"><%= Spree.t(:'i18n.only_complete') %></option>
+		    </select>
+	    </div>
+	  </div>
+
+	  <div class="col-md-8">
+	  	<div class="form-group no-margin-bottom">
+	  		<label><%= Spree.t(:'i18n.select_locale') %></label>
+		  	<%= select_available_locales_fields %>
+				<%= hidden_field_tag 'available_locales', available_locales.join(',') %>
+		  </div>
+	  </div>
+	</div>
+</div>

data/app/views/spree/admin/translations/option_type.html.erb

@@ -0,0 +1,9 @@
+<% content_for :page_title do %>
+  <%= Spree.t(:editing_resource, resource: Spree::OptionType.model_name.human) %> <span class="green">"<%= @option_type.name %>"</span>
+<% end %>
+
+<% content_for :page_actions do %>
+  <%= button_link_to Spree.t(:back_to_resource_list, resource: Spree::OptionType.model_name.human), spree.admin_option_types_path, class: 'btn-primary', icon: 'arrow-left' %>
+<% end %>
+
+<%= render 'form' %>

data/app/views/spree/admin/translations/option_value.html.erb

@@ -0,0 +1,25 @@
+<% content_for :page_title do %>
+  <%= Spree.t(:editing_resource, resource: Spree::OptionValue.model_name.human) %> <span class="green">"<%= @option_value.name %>"</span>
+<% end %>
+
+<% content_for :page_actions do %>
+  <%= button_link_to Spree.t(:back_to_resource_list, resource: Spree::OptionValue.model_name.human), spree.edit_admin_option_type_path(@option_value.option_type), class: 'btn-primary', icon: 'arrow-left' %>
+<% end %>
+
+<%= render 'settings' %>
+
+<div class="row translations">
+  <div class="col-md-4">
+    <%= render 'fields' %>
+  </div>
+  <div class="col-md-8">
+    <%= form_for [:admin, :option_type, @resource] do |f| %>
+      <%= render 'form_fields', f: f %>
+      <div class="form-actions" data-hook="buttons">
+        <%= button Spree.t(:update), 'update' %>
+        <span class="or"><%= Spree.t(:or) %></span>
+        <%= button_link_to Spree.t(:cancel), spree.edit_admin_option_type_path(@option_value.option_type), icon: 'remove' %>
+      </div>
+    <% end %>
+  </div>
+</div>

data/app/views/spree/admin/translations/product.html.erb

@@ -0,0 +1,7 @@
+<%= render 'spree/admin/shared/product_tabs', current: 'Translations' %>
+
+<% content_for :page_actions do %>
+  <%= button_link_to Spree.t(:back_to_resource_list, resource: Spree::Product.model_name.human), spree.admin_products_path, class: 'btn-primary', icon: 'arrow-left' %>
+<% end %>
+
+<%= render 'form' %>

data/app/views/spree/admin/translations/product_property.html.erb

@@ -0,0 +1,23 @@
+<% content_for :page_title do %>
+  <%= Spree.t(:editing_resource, resource: Spree::ProductProperty.model_name.human) %> <span class="green">"<%= @product_property.property.presentation %>"</span>
+<% end %>
+
+<% content_for :page_actions do %>
+  <%= button_link_to Spree.t(:back_to_resource_list, resource: Spree::ProductProperty.model_name.human), spree.admin_product_product_properties_path(@product_property.product), class: 'btn-primary', icon: 'icon-arrow-left' %>
+<% end %>
+
+<div class="row translations">
+  <div class="col-md-4">
+    <%= render 'fields' %>
+  </div>
+  <div class="col-md-8">
+    <%= form_for [:admin, @resource.product, @resource], method: :patch do |f| %>
+      <%= render 'form_fields', f: f %>
+      <div class="form-actions" data-hook="buttons">
+        <%= button Spree.t(:update), 'update' %>
+        <span class="or"><%= Spree.t(:or) %></span>
+        <%= button_link_to Spree.t(:cancel), spree.admin_product_product_properties_path(@product_property.product), icon: 'remove' %>
+      </div>
+    <% end %>
+  </div>
+</div>

data/app/views/spree/admin/translations/promotion.html.erb

@@ -0,0 +1,9 @@
+<% content_for :page_title do %>
+  <%= Spree.t(:editing_resource, resource: Spree::Promotion.model_name.human) %>
+<% end %>
+
+<% content_for :page_actions do %>
+  <%= button_link_to Spree.t(:back_to_resource_list, resource: Spree::Promotion.model_name.human), spree.admin_promotions_path, class: 'btn-primary', icon: 'arrow-left' %>
+<% end %>
+
+<%= render 'form' %>

data/app/views/spree/admin/translations/property.html.erb

@@ -0,0 +1,9 @@
+<% content_for :page_title do %>
+  <%= Spree.t(:editing_resource, resource: Spree::Property.model_name.human) %>
+<% end %>
+
+<% content_for :page_actions do %>
+  <%= button_link_to Spree.t(:back_to_resource_list, resource: Spree::Property.model_name.human), spree.admin_properties_path, class: 'btn-primary', icon: 'arrow-left' %>
+<% end %>
+
+<%= render 'form' %>

data/app/views/spree/admin/translations/shipping_method.html.erb

@@ -0,0 +1,9 @@
+<% content_for :page_title do %>
+  <%= Spree.t(:editing_resource, resource: Spree::ShippingMethod.model_name.human) %>
+<% end %>
+
+<% content_for :page_actions do %>
+    <%= button_link_to Spree.t(:back_to_resource_list, resource: Spree::ShippingMethod.model_name.human), spree.admin_shipping_methods_path, class: 'btn-primary', :icon => 'arrow-left' %>
+<% end %>
+
+<%= render 'form' %>

data/app/views/spree/admin/translations/store.html.erb

@@ -0,0 +1,25 @@
+<% content_for :page_title do %>
+  <%= Spree.t(:editing_resource, resource: Spree::Store.model_name.human) %>
+<% end %>
+
+<% content_for :page_actions do %>
+  <%= button_link_to Spree.t(:back_to_resource_list, resource: Spree::Store.model_name.human), spree.admin_stores_path, class: 'btn-primary', icon: 'arrow-left' %>
+<% end %>
+
+<%= render 'settings' %>
+
+<div class="row translations">
+  <div class="col-md-4">
+    <%= render 'fields' %>
+  </div>
+  <div class="col-md-8">
+    <%= form_for [:admin, @store] do |f| %>
+      <%= render 'form_fields', f: f %>
+      <div class="form-actions" data-hook="buttons">
+        <%= button Spree.t(:update), 'update' %>
+        <span class="or"><%= Spree.t(:or) %></span>
+        <%= button_link_to Spree.t(:cancel), spree.edit_admin_store_url(@store), icon: 'remove' %>
+      </div>
+    <% end %>
+  </div>
+</div>

data/app/views/spree/admin/translations/taxon.html.erb

@@ -0,0 +1,25 @@
+<% content_for :page_title do %>
+  <%= Spree.t(:editing_resource, resource: Spree::Taxon.model_name.human) %>
+<% end %>
+
+<% content_for :page_actions do %>
+  <%= button_link_to Spree.t(:back_to_resource_list, resource: Spree::Taxonomy.model_name.human), spree.admin_taxonomies_path, class: 'btn-primary', icon: 'arrow-left' %>
+<% end %>
+
+<%= render 'settings' %>
+
+<div class="row translations">
+  <div class="col-md-4">
+    <%= render 'fields' %>
+  </div>
+  <div class="col-md-8">
+    <%= form_for [:admin, @resource.taxonomy, @resource], url: spree.admin_taxonomy_taxon_path(@taxon.taxonomy, @taxon.id) do |f| %>
+      <%= render 'form_fields', f: f %>
+      <div class="form-actions" data-hook="buttons">
+        <%= button Spree.t(:update), 'update' %>
+        <span class="or"><%= Spree.t(:or) %></span>
+        <%= button_link_to Spree.t(:cancel), spree.edit_admin_taxonomy_url(@taxon.taxonomy), icon: 'remove' %>
+      </div>
+    <% end %>
+  </div>
+</div>

data/app/views/spree/admin/translations/taxonomy.html.erb

@@ -0,0 +1,9 @@
+<% content_for :page_title do %>
+  <%= Spree.t(:editing_resource, resource: Spree::Taxonomy.model_name.human) %>
+<% end %>
+
+<% content_for :page_actions do %>
+  <%= button_link_to Spree.t(:back_to_resource_list, resource: Spree::Taxonomy.model_name.human), spree.admin_taxonomies_path, class: 'btn-primary', icon: 'arrow-left' %>
+<% end %>
+
+<%= render 'form' %>

data/bin/rails

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+
+ENGINE_ROOT = File.expand_path('../..', __FILE__)
+ENGINE_PATH = File.expand_path('../../lib/spree_mobility/engine', __FILE__)
+
+require 'rails/all'
+require 'rails/engine/commands'

data/config/initializers/enable_extensions.rb

@@ -0,0 +1,27 @@
+require 'mobility'
+require 'mobility/backends/active_record/table'
+
+Dir[Rails.root.join('lib', 'spree_mobility', 'core_ext', '**', '*.rb')].each { |f| require f }
+
+# Extend library classes
+SpreeMobility.prepend_once(::Mobility::Backends::ActiveRecord::Table.singleton_class,
+  SpreeMobility::CoreExt::Mobility::Backends::ActiveRecord::Table::MobilityActsAsParanoidDecorator)
+
+Rails.application.config.to_prepare do
+  # Extend reloadable classes
+  SpreeMobility.prepend_once(::Spree::OptionType, SpreeMobility::CoreExt::Spree::OptionTypeDecorator)
+  SpreeMobility.prepend_once(::Spree::OptionValue, SpreeMobility::CoreExt::Spree::OptionValueDecorator)
+  SpreeMobility.prepend_once(::Spree::Product, SpreeMobility::CoreExt::Spree::ProductDecorator)
+  SpreeMobility.prepend_once(::Spree::Product.singleton_class, SpreeMobility::CoreExt::Spree::ProductDecorator::ClassMethods)
+  SpreeMobility.prepend_once(::Spree::Product.singleton_class, SpreeMobility::CoreExt::Spree::ProductScopesWithMobilityDecorator)
+  SpreeMobility.prepend_once(::Spree::ProductProperty, SpreeMobility::CoreExt::Spree::ProductPropertyDecorator)
+  SpreeMobility.prepend_once(::Spree::Promotion, SpreeMobility::CoreExt::Spree::PromotionDecorator)
+  SpreeMobility.prepend_once(::Spree::Property, SpreeMobility::CoreExt::Spree::PropertyDecorator)
+  SpreeMobility.prepend_once(::Spree::ShippingMethod, SpreeMobility::CoreExt::Spree::ShippingMethodDecorator)
+  SpreeMobility.prepend_once(::Spree::Store, SpreeMobility::CoreExt::Spree::StoreDecorator)
+  SpreeMobility.prepend_once(::Spree::Taxon, SpreeMobility::CoreExt::Spree::TaxonDecorator)
+  SpreeMobility.prepend_once(::Spree::Taxonomy, SpreeMobility::CoreExt::Spree::TaxonomyDecorator)
+  SpreeMobility.prepend_once(::Spree::Variant.singleton_class, SpreeMobility::CoreExt::Spree::VariantDecorator::ClassMethods)
+  SpreeMobility.prepend_once(::Spree::Products::Find, SpreeMobility::CoreExt::Spree::Products::FindWithMobilityDecorator)
+end
+  

data/config/initializers/form_builder_mobility_patch.rb

@@ -0,0 +1,53 @@
+module ActionView
+  module Helpers
+    class FormBuilder
+      #
+      # Helper that renders mobility_translations fields
+      # on a per-locale basis, so you can use them separately
+      # in the same form and still saving them all at once
+      # in the same request.
+      #
+      # Use it like this:
+      #
+      # <h1>Editing post</h1>
+      #
+      # <% form_for(@post) do |f| %>
+      #   <%= f.error_messages %>
+      #
+      #   <h2>English (default locale)</h2>
+      #   <p><%= f.text_field :title %></p>
+      #   <p><%= f.text_field :teaser %></p>
+      #   <p><%= f.text_field :body %></p>
+      #
+      #   <hr/>
+      #
+      #   <h2>Spanish translation</h2>
+      #   <% f.mobility_fields_for :es do |g| %>
+      #     <p><%= g.text_field :title %></p>
+      #     <p><%= g.text_field :teaser %></p>
+      #     <p><%= g.text_field :body %></p>
+      #   <% end %>
+      #
+      #   <hr/>
+      #
+      #   <h2>French translation</h2>
+      #   <% f.mobility_fields_for :fr do |g| %>
+      #     <p><%= g.text_field :title %></p>
+      #     <p><%= g.text_field :teaser %></p>
+      #     <p><%= g.text_field :body %></p>
+      #   <% end %>
+      #
+      # <% end %>
+      #
+      def mobility_fields_for(locale, *args, &proc)
+        raise ArgumentError, "Missing block" unless block_given?
+        @index      = @index ? @index + 1 : 1
+        object_name = "#{@object_name}[translations_attributes][#{@index}]"
+        object      = @object.translations.find_by(locale: locale)
+        @template.concat @template.hidden_field_tag("#{object_name}[id]", object ? object.id : "")
+        @template.concat @template.hidden_field_tag("#{object_name}[locale]", locale)
+        @template.fields_for(object_name, object, *args, &proc)
+      end
+    end
+  end
+end