has_many_translations 0.4.5 → 0.4.6

data/Gemfile

@@ -1,4 +1,10 @@
 source "http://rubygems.org"
+
+gem 'artforge-rtranslate', '>=1.3.4'
+gem 'to_lang'
+gem 'activequeue'
+gem 'settingslogic'
+
 group :development do
   gem 'activesupport'
   gem 'activerecord'
@@ -7,10 +13,7 @@ group :development do
   gem 'rspec'
   gem 'cucumber'
   gem 'launchy'
-  gem 'pickler'
+  # gem 'pickler'
   gem 'jeweler'
 end
 
-gem 'artforge-rtranslate', '>=1.3.4'
-gem 'activequeue'
-gem 'settingslogic'

data/Gemfile.lock

@@ -27,6 +27,9 @@ GEM
     gherkin (2.3.3)
       json (~> 1.4.6)
     git (1.2.5)
+    httparty (0.8.1)
+      multi_json
+      multi_xml
     i18n (0.5.0)
     jeweler (1.5.2)
       bundler (~> 1.0.0)
@@ -38,9 +41,8 @@ GEM
       rake (>= 0.8.1)
     mocha (0.9.10)
       rake
-    pickler (0.1.5)
-      activesupport (>= 2.0.0)
-      cucumber (>= 0.8.0)
+    multi_json (1.0.3)
+    multi_xml (0.4.1)
     rake (0.8.7)
     rspec (2.4.0)
       rspec-core (~> 2.4.0)
@@ -53,6 +55,8 @@ GEM
     settingslogic (2.0.6)
     shoulda (2.11.3)
     term-ansicolor (1.0.5)
+    to_lang (0.3.1)
+      httparty (~> 0.8.0)
     tzinfo (0.3.23)
 
 PLATFORMS
@@ -67,7 +71,7 @@ DEPENDENCIES
   jeweler
   launchy
   mocha
-  pickler
   rspec
   settingslogic
   shoulda
+  to_lang

data/README.rdoc

@@ -12,5 +12,5 @@ Installing from source
 
 3) rake build
 
-4) sudo gem install pkg/has_many_translations-0.3.x.gem (where x is latest version)
+4) sudo gem install pkg/has_many_translations-0.4.x.gem (where x is latest version)
 

data/VERSION

@@ -1 +1 @@
-0.4.4
+0.4.6

data/has_many_translations.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "has_many_translations"
-  s.version = "0.4.5"
+  s.version = "0.4.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["OpenGotham", "Artforge"]

data/lib/has_many_translations.rb

@@ -1,6 +1,6 @@
 Dir[File.join(File.dirname(__FILE__), 'has_many_translations', '*.rb')].each{|f| require f }
 
-require 'rtranslate'
+require 'to_lang'
 require 'activequeue'
 
 # The base module that gets included in ActiveRecord::Base. See the documentation for

data/lib/has_many_translations/creation.rb

@@ -167,13 +167,18 @@ module HasManyTranslations
         end
         
         def update_translation!(attrib, loc, origin_locale, options = {})
-           @translator ||= Translate::RTranslate.new
-           if defined? HmtSettings
-             @translator.key = HmtSettings.google_api_key
+           @translator ||= ToLang.start(HmtSettings.google_api_key)
+           # if defined? HmtSettings
+           #              @translator.key = HmtSettings.google_api_key
+           #            end
+           # translation_val = @translator.translate(try(attrib), :from => origin_locale.to_s, :to => loc.to_s)
+           unless (loc.to_s ==  origin_locale.to_s)
+             unless try(attrib).nil?
+               translation_val = try(attrib).translate(loc.to_s, :from => origin_locale.to_s)
+               # TODO: Should this be "find_or_create"?
+               translations.create(:model_attribute => attrib, :locale_code => loc.to_s, :value => translation_val, :locale_name => Google::Language::Languages[loc.to_s], :machine_translation => true, :origin_locale_code => origin_locale ) unless translation_val.nil? || translation_val.match('Error: ')
+             end
            end
-           translation_val = @translator.translate(try(attrib), :from => origin_locale.to_s, :to => loc.to_s)
-           # TODO: Should this be "find_or_create"?
-           translations.create(:model_attribute => attrib, :locale_code => loc.to_s, :value => translation_val, :locale_name => Google::Language::Languages[loc.to_s], :machine_translation => true, :origin_locale_code => origin_locale ) unless translation_val.nil? || translation_val.match('Error: ')
         end
         
         

data/lib/has_many_translations/hmt_settings.rb

@@ -2,6 +2,7 @@ class HmtSettings
   @@google_api_key = ""
   @@languages = []
   @@default_languages = []
+  @@queue_type = "resque"
   
   def self.google_api_key=(key)
     @@google_api_key = key
@@ -21,4 +22,10 @@ class HmtSettings
   def self.default_languages
     @@default_languages
   end
+  def self.queue_type=(queue)
+    @@queue_type = queue
+  end
+  def self.queue_type
+    @@queue_type
+  end
 end

data/lib/has_many_translations/options.rb

@@ -32,9 +32,10 @@ module HasManyTranslations
         )
         class_inheritable_accessor :has_many_translations_options
         class_inheritable_accessor :translator
-        self.translator = Translate::RTranslate.new
+        # self.translator = Translate::RTranslate.new
         if defined? HmtSettings
-          self.translator.key = HmtSettings.google_api_key
+          ToLang.start(HmtSettings.google_api_key)
+          # self.translator.key = HmtSettings.google_api_key
           options[:default_languages] = HmtSettings.default_languages ? HmtSettings.default_languages : nil
           options[:languages] = HmtSettings.languages ? HmtSettings.languages : nil
           # options[:force_on_update] = HmtSettings.force_on_update ? HmtSettings.force_on_update : nil

metadata

@@ -2,7 +2,7 @@
 name: has_many_translations
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.4.5
+  version: 0.4.6
 platform: ruby
 authors: 
 - OpenGotham