lost_in_translation 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61a6d51289069850654eb0f58df42f8eb798c1cf
-  data.tar.gz: 62d548671c8d3aeb56f1b487758334247a3a506a
+  metadata.gz: a3bad89e7e9d374aea300f0e82e7dd12150a88c1
+  data.tar.gz: b398954b97e65e4d97c281f8c9c1b63a2c41ab02
 SHA512:
-  metadata.gz: 737e460adc20e52a72d82f7aad81ab60ada0cc1780a11d4a323619e7994ba7166615511f32847117d4ea44146444923afe762374343141adbf13de1a1b05a8ab
-  data.tar.gz: 1bc41c6f2a72f905351686aeb8e9942fe640122a28f1a51633033387a5ab0f9dd8979c376d2bfbadc328d45c4592ddcc784e024a85aa05ae6250adb945e5b4aa
+  metadata.gz: f7ea20ba1c81836f792c9cf62e40141fd633e5e3346b2302393eb7f9c95e765fc38f254ffec11a425481f9e45432414bc34fbff612b64c760f3e2eb473d8a0de
+  data.tar.gz: f53813c261b74a4b0f9a8b9d338eec0b50ddc62610b23f241f3af8f9a4bf91d2bfdaac294dac1ba34cda03a82e8acebd4e12843a4b9fa7f1924576b4c4681ed2

data/lib/lost_in_translation/hash.rb

@@ -1,22 +1,9 @@
 module LostInTranslation
   def string_to_hash(string)
-    array = string.split('-')
+    array = string.split('---')
     value = array.pop
-    h = Hash.new
-    anz = array.count - 1
-    puts array.count if array.count > 6
-    (0..anz).each do |key|
-      h[array[0]] = (anz == key ? value : Hash.new) if key == 0
-      h[array[0]][array[1]] = (anz == key ? value : Hash.new) if key == 1
-      h[array[0]][array[1]][array[2]] = (anz == key ? value : Hash.new) if key == 2
-      h[array[0]][array[1]][array[2]][array[3]] = (anz == key ? value : Hash.new) if key == 3
-      h[array[0]][array[1]][array[2]][array[3]][array[4]] = (anz == key ? value : Hash.new) if key == 4
-      h[array[0]][array[1]][array[2]][array[3]][array[4]][array[5]] = (anz == key ? value : Hash.new) if key == 5
-      h[array[0]][array[1]][array[2]][array[3]][array[4]][array[5]][array[6]] = (anz == key ? value : Hash.new) if key == 6
-      h[array[0]][array[1]][array[2]][array[3]][array[4]][array[5]][array[6]][array[7]] = (anz == key ? value : Hash.new) if key == 7
-      ### TO BE IMPROVED ! This is shit and I know it.
-    end
-    h
+    arr = array.reverse
+    arr[1..-1].inject({arr[0] => value}){ |memo, i| {i => memo} }
   end
 
   def merge_hash(merge_from, merge_to)

data/lib/lost_in_translation/version.rb

@@ -1,3 +1,3 @@
 module LostInTranslation
-  VERSION = "0.0.1"
+  VERSION = "0.1.0"
 end

data/lib/lost_in_translation/z_full_automatic.rb

@@ -0,0 +1,32 @@
+module LostInTranslation
+  def full_automatic
+    if defined? Rails
+      app_name = Rails.application.class.parent_name
+      lang_2, lang_1 = Translate.ask_for_languages
+      path_1 = "#{Rails.root}/config/locales/#{lang_1}.yml"
+      path_2 = "#{Rails.root}/config/locales/#{lang_2}.yml"
+    else
+      app_name = nil
+      path_2, path_1 = Translate.ask_for_paths
+
+      lang_1 = Translate.get_locale(path_1)
+      lang_2 = Translate.get_locale(path_2)
+    end
+
+    abort('NOPE') unless File.exist?(path_1) && File.exist?(path_2)
+
+    first = YAML.load_file(path_1)
+    second = YAML.load_file(path_2)
+
+    new_strings_array = Translate.clean(first[lang_1], second[lang_2], [lang_2])
+
+    first = {}
+    new_strings_array.each do |string|
+      string = string.split('---').map { |x| x == lang_2 ? x = lang_1 : x }.join('---')
+      result = Translate.string_to_hash(string)
+      Translate.merge_hash(result, first)
+    end
+
+    File.open(path_1, 'w') { |file| file.write(first.to_yaml) }
+  end
+end

data/lib/lost_in_translation/z_half_automatic.rb

@@ -0,0 +1,32 @@
+module LostInTranslation
+  def half_automatic
+    if defined? Rails
+      app_name = Rails.application.class.parent_name
+      lang_2, lang_1 = Translate.ask_for_languages
+      path_1 = "#{Rails.root}/config/locales/#{lang_1}.yml"
+      path_2 = "#{Rails.root}/config/locales/#{lang_2}.yml"
+    else
+      app_name = nil
+      path_2, path_1 = Translate.ask_for_paths
+
+      lang_1 = Translate.get_locale(path_1)
+      lang_2 = Translate.get_locale(path_2)
+    end
+
+    abort('NOPE') unless File.exist?(path_1) && File.exist?(path_2)
+
+    first = YAML.load_file(path_1)
+    second = YAML.load_file(path_2)
+
+    new_strings_array = Translate.clean(first[lang_1], second[lang_2], [lang_2])
+
+    first = {}
+    new_strings_array.each do |string|
+      string = string.split('---').map { |x| x == lang_2 ? x = lang_1 : x }.join('---')
+      result = Translate.string_to_hash(string)
+      Translate.merge_hash(result, first)
+    end
+
+    File.open(path_1, 'w') { |file| file.write(first.to_yaml) }
+  end
+end

data/lib/lost_in_translation.rb

@@ -2,9 +2,11 @@ require "lost_in_translation/version"
 require "lost_in_translation/difference"
 require "lost_in_translation/hash"
 require "lost_in_translation/user_interface"
-require "lost_in_translation/recent"
-require "lost_in_translation/interactive"
-require "lost_in_translation/cleanup"
+require "lost_in_translation/z_recent"
+require "lost_in_translation/z_interactive"
+require "lost_in_translation/z_cleanup"
+require "lost_in_translation/z_half_automatic"
+require "lost_in_translation/z_full_automatic"
 require 'lost_in_translation/railtie' if defined?(Rails)
 
 module LostInTranslation

data/lib/tasks/translate.rake

@@ -13,6 +13,7 @@ namespace :translate do
   desc "Use Bing-Translator as a suggestion for translation"
   task :half_automatic do
     return 'to_be_done'
+    Translate.half_automatic
   end
 end
 
@@ -20,18 +21,19 @@ namespace :translate do
   desc "Use Bing-Translator to automatically translate everything"
   task :full_automatic do
     return 'to_be_done'
+    Translate.full_automatic
   end
 end
 
 namespace :translate do
-  desc "Cleaning out the Yaml-Closet)"
+  desc "Cleaning out the Yaml-Closet"
   task :cleanup do
     Translate.cleanup
   end
 end
 
 namespace :translate do
-  desc "Tranlate just your recently changed words"
+  desc "Tranlate just your recently changed words(requires git)"
   task :recent do
     abort('Please use this feature inside a Rails-Application') unless defined? Rails
     Translate.recent

data/lost_in_translation.gemspec

@@ -7,10 +7,10 @@ Gem::Specification.new do |spec|
   spec.name          = "lost_in_translation"
   spec.version       = LostInTranslation::VERSION
   spec.authors       = ["Datyv"]
-  spec.email         = ["yves.goizet@hotmail.de"]
+  spec.email         = ["yvesgoizet@gmail.com"]
 
-  spec.summary       = %q{A Gem to Campare different yaml-files}
-  spec.description   = %q{Take two locales and merge them together with different values.}
+  spec.summary       = %q{A Gem to compare two locale yamls}
+  spec.description   = %q{Take two locales yamls and merge them together with different values.}
   spec.homepage      = "https://github.com/Datyv/lost_in_translation"
   spec.license       = "MIT"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lost_in_translation
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Datyv
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-09 00:00:00.000000000 Z
+date: 2016-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,9 +52,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-description: Take two locales and merge them together with different values.
+description: Take two locales yamls and merge them together with different values.
 email:
-- yves.goizet@hotmail.de
+- yvesgoizet@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -70,14 +70,16 @@ files:
 - bin/console
 - bin/setup
 - lib/lost_in_translation.rb
-- lib/lost_in_translation/cleanup.rb
 - lib/lost_in_translation/difference.rb
 - lib/lost_in_translation/hash.rb
-- lib/lost_in_translation/interactive.rb
 - lib/lost_in_translation/railtie.rb
-- lib/lost_in_translation/recent.rb
 - lib/lost_in_translation/user_interface.rb
 - lib/lost_in_translation/version.rb
+- lib/lost_in_translation/z_cleanup.rb
+- lib/lost_in_translation/z_full_automatic.rb
+- lib/lost_in_translation/z_half_automatic.rb
+- lib/lost_in_translation/z_interactive.rb
+- lib/lost_in_translation/z_recent.rb
 - lib/tasks/translate.rake
 - lost_in_translation.gemspec
 homepage: https://github.com/Datyv/lost_in_translation
@@ -100,8 +102,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
-summary: A Gem to Campare different yaml-files
+summary: A Gem to compare two locale yamls
 test_files: []