batch_translations 0.1.2 → 0.1.3

data/batch_translations.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "batch_translations"
-  s.version = "0.1.2"
+  s.version = "0.1.3"
   s.date = "2011-11-06"
   s.summary = "allow saving multiple globalize2 translations in the same request"
   s.email = "sebcioz@gmail.com"

data/lib/batch_translations.rb

@@ -3,13 +3,23 @@ module ActionView
     class FormBuilder
       def globalize_fields_for(locale, *args, &proc)
         raise ArgumentError, "Missing block" unless block_given?
-        @index = @index ? @index + 1 : 1
+        @locale_index ||= {}
+
+        if @locale_index[locale].nil?
+          @index = @index ? @index + 1 : 1
+          @locale_index[locale] = @index
+        else
+          @index = @locale_index[locale]
+        end
+
         object_name = "#{@object_name}[translations_attributes][#{@index}]"
-        object = @object.translations.find_by_locale locale.to_s
+        object = @object.translations.select{|t| t.locale.to_s == locale.to_s}.first || @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)
         if @template.respond_to? :simple_fields_for
           @template.simple_fields_for(object_name, object, *args, &proc)
+        elsif @template.respond_to? :semantic_fields_for
+          @template.semantic_fields_for(object_name, object, *args, &proc)
         else
           @template.fields_for(object_name, object, *args, &proc)
         end
@@ -21,15 +31,13 @@ end
 module Globalize
   module ActiveRecord
     module InstanceMethods
-      def update_attributes_with_translations(options)
-        options.each do |key, value|
+      def update_attributes_with_translations(attributes)
+        attributes.each do |key, value|
           if key == "translations_attributes"
-            translated_attrs = {}
-            value.each do |rec_id, rec_value|
-              rec_value.delete("id")
-              translated_attrs[rec_value.delete("locale")] = rec_value
+            value.each do |rec_index, rec_value|
+              locale = rec_value.delete("locale")
+              write_attribute(rec_value.keys.first, rec_value.values.first, options = { :locale => locale })
             end
-            self.set_translations(translated_attrs)
           else
             self.update_attribute(key, value)
           end
@@ -50,7 +58,7 @@ module Globalize
           def after_save
             init_translations
           end
-          # Builds an empty translation for each available 
+          # Builds an empty translation for each available
           # locale not in use after creation
           def init_translations
             I18n.translated_locales.reject{|key| key == :root }.each do |locale|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: batch_translations
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-06 00:00:00.000000000 +01:00
-default_executable: 
+date: 2011-11-06 00:00:00.000000000 Z
 dependencies: []
 description: Helper that renders globalize_translations fields on a per-locale basis,
   so you can use them separately in the same form and still saving them all at once
@@ -22,7 +21,6 @@ extra_rdoc_files: []
 files:
 - batch_translations.gemspec
 - lib/batch_translations.rb
-has_rdoc: false
 homepage: https://github.com/sebcioz/batch_translations
 licenses: []
 post_install_message: 
@@ -43,7 +41,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: allow saving multiple globalize2 translations in the same request