spree_simple_product_translations 0.0.2 → 0.0.3

data/README.md

@@ -16,7 +16,19 @@ Then copy the assets to your spree application:
     rake spree_product_translations:install
     rake spree_simple_product_translations:install
 
+# Open issues
+In the current version of [Globalize3](https://github.com/svenfuchs/globalize3) there is an issue with fallbacks. When you add new translations in the forms, but leave some of them blank, they won't fall back to the default locale. This is because [Globalize3](https://github.com/svenfuchs/globalize3) only loads fallbacks when the values are nil. Because of the way Rails handles these attributes, they will be stored as blank strings into the database.
+
+If you are using the fallbacks, you might want to use [my fork](https://github.com/jeroenj/globalize3) of [Globalize3](https://github.com/svenfuchs/globalize3) in your Gemfile until it gets merged into [Globalize3](https://github.com/svenfuchs/globalize3)'s [master branch](https://github.com/svenfuchs/globalize3):
+
+    gem 'globalize3', :git => 'git://github.com/jeroenj/globalize3.git'
+
+For those interested, you can follow [the pull request here](https://github.com/svenfuchs/globalize3/pull/32).
+
 # To add in future releases
+* Add form to:
+   + Prototype
+   + Taxonomy
 * Tests
 * Configuration option for which locales te load
 * Better design?

data/app/views/admin/option_types/_form.html.erb

@@ -0,0 +1,29 @@
+<%= f.field_container :name do %>
+  <%= f.label :name, t("name") %><br />
+  <%= f.text_field :name %>
+  <%= f.error_message_on :name %>
+<% end %>
+
+<%= javascript_include_tag 'jquery-ui-1.7.3.custom.min', 'simple_product_translations' %>
+<%= stylesheet_link_tag 'smoothness/jquery-ui-1.7.3.custom' %>
+
+<div id="tabs">
+  <ul>
+    <% I18n.available_locales.each do |l| %>
+      <li><%= link_to t(l), "#tabs-#{l}" %></li>
+    <% end %>
+  </ul>
+  <% I18n.available_locales.each do |l| %>
+    <div id="tabs-<%= l %>">
+      <%= f.globalize_fields_for l do |g| %>
+        <% default_locale = l.to_sym == I18n.default_locale %>
+        <% g = f if default_locale %>
+        <%= f.field_container :presentation do %>
+          <%= g.label :presentation, t("presentation") %> <% if default_locale %><span class="required">*</span><% end %><br />
+          <%= g.text_field :presentation %>
+          <%= f.error_message_on :presentation %>
+        <% end %>
+      <% end %>
+    </div>
+  <% end %>
+</div>

data/app/views/admin/option_types/_option_value_fields.html.erb

@@ -0,0 +1,17 @@
+<tr class="option_value fields" id="<%= dom_id(f.object) %>">
+  <td><%= f.text_field :name %></td>
+  <td>
+    <%# Required js for tabs is loaded in form partial %>
+    <% I18n.available_locales.each do |l| %>
+      <p>
+        <%= f.globalize_fields_for l do |g| %>
+          <% default_locale = l.to_sym == I18n.default_locale %>
+          <% g = f if default_locale %>
+          <%= g.label :presentation, "#{t(l)}: " %>
+          <%= g.text_field :presentation %><% if default_locale %><span class="required">*</span><% end %>
+        <% end %>
+      </p>
+    <% end %>
+  </td>
+  <td class="actions"><%= link_to_remove_fields t("remove"), f %></td>
+</tr>

data/app/views/admin/products/_product_form_left.html.erb

@@ -31,7 +31,6 @@
           <%= g.text_area :description, {:cols => 60, :rows => 4, :class => 'fullwidth'} %>
           <%= f.error_message_on :description %>
         <% end %>
-        </p>
       <% end %>
     </div>
   <% end %>

data/app/views/admin/properties/_form.html.erb

@@ -0,0 +1,29 @@
+<%= f.field_container :name do %>
+  <%= f.label :name, t("name") %> <span class="required">*</span><br />
+  <%= f.text_field :name %>
+  <%= f.error_message_on :name %>
+<% end %>
+
+<%= javascript_include_tag 'jquery-ui-1.7.3.custom.min', 'simple_product_translations' %>
+<%= stylesheet_link_tag 'smoothness/jquery-ui-1.7.3.custom' %>
+
+<div id="tabs">
+  <ul>
+    <% I18n.available_locales.each do |l| %>
+      <li><%= link_to t(l), "#tabs-#{l}" %></li>
+    <% end %>
+  </ul>
+  <% I18n.available_locales.each do |l| %>
+    <div id="tabs-<%= l %>">
+      <%= f.globalize_fields_for l do |g| %>
+        <% default_locale = l.to_sym == I18n.default_locale %>
+        <% g = f if default_locale %>
+        <%= f.field_container :presentation do %>
+          <%= g.label :presentation, t("presentation") %> <% if default_locale %><span class="required">*</span><% end %><br />
+          <%= g.text_field :presentation %>
+          <%= f.error_message_on :presentation %>
+        <% end %>
+      <% end %>
+    </div>
+  <% end %>
+</div>

data/app/views/admin/taxons/_form.html.erb

@@ -0,0 +1,40 @@
+<%= hook :admin_inside_taxon_form do %>
+  <%= javascript_include_tag 'jquery-ui-1.7.3.custom.min', 'simple_product_translations' %>
+  <%= stylesheet_link_tag 'smoothness/jquery-ui-1.7.3.custom' %>
+
+  <div id="tabs">
+    <ul>
+      <% I18n.available_locales.each do |l| %>
+        <li><%= link_to t(l), "#tabs-#{l}" %></li>
+      <% end %>
+    </ul>
+    <% I18n.available_locales.each do |l| %>
+      <div id="tabs-<%= l %>">
+        <%= f.globalize_fields_for l do |g| %>
+          <% default_locale = l.to_sym == I18n.default_locale %>
+          <% g = f if default_locale %>
+          <%= f.field_container :name do %>
+            <%= g.label :name, t("name") %> <% if default_locale %><span class="required">*</span><% end %><br />
+            <%= error_message_on :taxon, :name, :class => 'fullwidth title'  %>
+            <%= g.text_field :name %>
+          <% end %>
+
+          <%= f.field_container :description do %>
+            <%= g.label :description, t(:description) %><br />
+            <%= g.text_area :description %>
+          <% end %>
+        <% end %>
+      </div>
+    <% end %>
+  </div>
+
+  <%= f.field_container :permalink_part do %>
+    <%= f.label :permalink_part, t("permalink") %><span class="required">*</span><br />
+    <%= @taxon.permalink.split("/")[0...-1].join("/") + "/" %><%= text_field_tag :permalink_part, @permalink_part  %>
+  <% end %>
+
+  <%= f.field_container :icon do %>
+    <%= f.label :icon, t('icon') %><br />
+    <%= f.file_field :icon %>
+  <% end %>
+<% end %>

data/lib/batch_translation.rb

@@ -7,7 +7,8 @@ module ActionView
         raise ArgumentError, "Missing block" unless block_given?
         @index = @index ? @index + 1 : 1
         object_name = "#{@object_name}[translations_attributes][#{@index}]"
-        object = @object.translations.select{|t| t.locale.to_s == locale}.first || @object.translations.find_by_locale(locale.to_s)
+        form_object = @object || @object_name.to_s.camelize.constantize.new
+        object = form_object.translations.select{|t| t.locale.to_s == locale}.first || form_object.translations.find_by_locale(locale.to_s)
         @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)

data/lib/spree_simple_product_translations.rb

@@ -14,7 +14,25 @@ module SpreeSimpleProductTranslations
         Rails.env.production? ? require(c) : load(c)
       end
 
-      ::Product.send :include, Models::Product
+      ::Product.class_eval do
+        accepts_nested_attributes_for :translations
+      end
+
+      ::Property.class_eval do
+        accepts_nested_attributes_for :translations
+      end
+
+      ::Taxon.class_eval do
+        accepts_nested_attributes_for :translations
+      end
+
+      ::OptionType.class_eval do
+        accepts_nested_attributes_for :translations
+      end
+
+      ::OptionValue.class_eval do
+        accepts_nested_attributes_for :translations
+      end
     end
 
     config.to_prepare &method(:activate).to_proc

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: spree_simple_product_translations
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Jeroen Jacobs
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-02 00:00:00 +01:00
+date: 2011-03-03 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -42,12 +42,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 29
+        hash: 27
         segments: 
         - 0
         - 0
-        - 1
-        version: 0.0.1
+        - 2
+        version: 0.0.2
   type: :runtime
   version_requirements: *id002
 description: 
@@ -61,12 +61,15 @@ extra_rdoc_files: []
 files: 
 - README.md
 - lib/batch_translation.rb
-- lib/models/product.rb
 - lib/spree_simple_product_translations.rb
 - lib/spree_simple_product_translations_hooks.rb
 - lib/tasks/install.rake
 - lib/tasks/spree_simple_product_translations.rake
+- app/views/admin/option_types/_form.html.erb
+- app/views/admin/option_types/_option_value_fields.html.erb
 - app/views/admin/products/_product_form_left.html.erb
+- app/views/admin/properties/_form.html.erb
+- app/views/admin/taxons/_form.html.erb
 has_rdoc: false
 homepage: https://github.com/jeroenj/spree-simple_product_translations
 licenses: []

data/lib/models/product.rb

@@ -1,7 +0,0 @@
-module Models::Product
-  def self.included(target)
-    target.class_eval do
-      accepts_nested_attributes_for :translations
-    end
-  end
-end