zlocalize 6.0.1.5 → 6.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 341b51637724b4029977922322949963c04922eb358fdf95dfc991d51f462b07
-  data.tar.gz: 0df02afbd17aef66afcc8c5065bdf94f312e7760cf8111a5a5b7caaa32ec67a4
+  metadata.gz: 66b5522b6ea82798fe981eebf7d3dc4194244150004eb86b293db3fd8800978d
+  data.tar.gz: 281562dcdc5ca40e6618c60c4629856d152606b746fbaee0b53be84ef720f666
 SHA512:
-  metadata.gz: e7457f52b3249f1b45aed2114e11520e21652a48713d3e6fa38babc89951b711b320a234ef232afda78b39b0d4e45aa523b314a5df24f7c3ed3dd89771e6fc7d
-  data.tar.gz: 624d7292777dc3fb06bc7f0085067c39795e5f3b466fdc92411c1029b2f4503537aabd4da7d8e88259eaccd0838ca068f37fdca9716d3fc4c7e22e1f0e674344
+  metadata.gz: 6be05d4c717b68ef0b2dd1babfc31e98e44e85f3e019418bc4e58852af9f99b3fe74dfa37d87d65b1a3c4ec66a628e23686e37cb6db1ed6d8cf51c5f5c492c20
+  data.tar.gz: 815138a1bea01dd2695ef521d841615a6e92c398f01bd7712c527ad8cc00a065f045166863ca81b7088f3bef395f5a713abefeb9c7e473e047a8ea4a3300ad07

data/lib/zlocalize/harvester.rb

@@ -15,7 +15,7 @@ module ZLocalize
 
     attr_accessor :rails_root
 
-    DEFAULT_HARVEST_OPTIONS = { :output => 'config/locales/app-strings.yml',
+    DEFAULT_HARVEST_OPTIONS = { :output => 'config/translations/app-strings.yml',
                                 :overwrite_existing => false,
                                 :add_paths   => [],
                                 :silent => false,

data/lib/zlocalize/rails/generators/initializer.rb

@@ -12,6 +12,7 @@ require 'rails/generators/base'
 
         def create_initializer_file
           template "initializer_template.rb", "config/initializers/zlocalize.rb"
+          FileUtils.mkdir_p "config/translations"
         end
 
       end

data/lib/zlocalize/rails/generators/templates/initializer_template.rb

@@ -35,12 +35,12 @@ ZLocalize.config.return_source_on_missing = { development: false, test: false,
 ZLocalize.config.locales = {
   en: {
      plural_select:     -> (n) { n <= 0 ? 0 : (n > 1 ? 2 : 1) },
-     translations:      File.join(Rails.root,'config/locales/en.strings.yml'),
+     translations:      File.join(Rails.root,'config/translations/en.strings.yml'),
      convert_float:     -> (s) { s.to_s.gsub(',','') }
   },
 #  fr: {
 #     plural_select:    -> (n) { n <= 0 ? 0 : (n > 1 ? 2 : 1) },
-#     translations:     File.join(Rails.root,'config/locales/fr.strings.yml'),
+#     translations:     File.join(Rails.root,'config/translations/fr.strings.yml'),
 #     titleize:         -> (s) { s.capitalize.to_s },
 #     convert_float:    -> (s) { s.to_s.gsub(' ','').gsub(',','.') }
 #  }

data/lib/zlocalize/rails/tasks/harvest.rake

@@ -5,7 +5,7 @@ namespace :zlocalize do
   desc "Collect all translatable strings (used in _('...') and n_('...') calls) in your Rails application\n\n" +
        "Usage: rake zlocalize:harvest\n" +
        "Options and their defaults are:\n\n" +
-       "  output=FILE_PATH       Output file, relative to Rails.root (default: \'config/locales/app-strings.yml\')\n" +
+       "  output=FILE_PATH       Output file, relative to Rails.root (default: \'config/translations/app-strings.yml\')\n" +
        "  purge=true|false       Remove unused entries in the existing output file (if it exists). (default: false)\n" +
        "  clear=true|false       Clearing the existing translations in output file (if it exists). (default: false)\n" +
        "  silent=true|false      If true, do not report progress. (default: false)\n" +
@@ -14,7 +14,7 @@ namespace :zlocalize do
   task :harvest => :environment do
     options = { :clear      => ['1','true'].include?(ENV['clear']),
                 :purge      => ['1','true'].include?(ENV['purge']),
-                :output     => ENV['output'].to_s.empty? ? 'config/locales/app-strings.yml' : ENV['output'],
+                :output     => ENV['output'].to_s.empty? ? 'config/translations/app-strings.yml' : ENV['output'],
                 :add_paths  => ENV['add_paths'].to_s.empty? ? [] : ENV['add_paths'].split(','), 
                 :silent     => ['1','true'].include?(ENV['silent']) }
      

data/lib/zlocalize/rails/translation_validator.rb

@@ -27,7 +27,7 @@ class TranslationValidator < ActiveModel::EachValidator
     end
   end
 
-  def validate_each(record,attr_name,value)
+  def validate_each(record, attr_name, value)
     configuration = { :message => :missing_translations,
                       :required_locales => record.respond_to?(:get_required_locales) ? :get_required_locales : [] }
     configuration.update(options)
@@ -44,8 +44,7 @@ class TranslationValidator < ActiveModel::EachValidator
       end
     end
     if missing_locales.size > 0
-      # m = configuration[:message].to_s.gsub()
-      record.errors.add(attr_name, configuration[:message], { :locales => missing_locales.to_sentence })
+      record.errors.add(attr_name, :missing_translation, :message => configuration[:message], :locales => missing_locales.to_sentence)
     end
   end
 

data/lib/zlocalize/source_processor.rb

@@ -18,8 +18,12 @@ module ZLocalize
         content = ActionView::Template::Handlers::ERB::Erubi.new(content, escape: true, trim: true).src
       end
       @parser = create_parser_for_ruby_version
-      @stree = @parser.parse(content)
-      process(@stree)
+      begin
+        @stree = @parser.parse(content)
+        process(@stree)
+      rescue ArgumentError => ae
+        raise ArgumentError.new("In #{filename} #{ae.message}")
+      end
     end
 
     def create_parser_for_ruby_version
@@ -59,14 +63,14 @@ module ZLocalize
 
     def get_string_node_value(node)
       unless node.is_a?(AST::Node) && node.type  == :str
-        raise ArgumentError.new("String Expected but got: #{node.inspect}")
+        raise ArgumentError.new("On line #{node.loc.selector.line} at column #{node.loc.selector.column+1} : String Expected but got: #{node.inspect}")
       end
       return node.children[0]
     end
 
     def get_string_array_node_value(node)
       unless node.is_a?(AST::Node) || node.type != :array
-        raise ArgumentError.new("Array expected but got: #{node.inspect}")
+        raise ArgumentError.new("On line #{node.loc.selector.line} at column #{node.loc.selector.column+1} : Array expected but got: #{node.inspect}")
       end
       a = []
       for i in 0..node.children.size - 1

data/lib/zlocalize/translation_file.rb

@@ -196,10 +196,14 @@ module ZLocalize
     end
 
     def load(filename)
-      if File.exists?(filename)
+      if File.exist?(filename)
         content = File.open(filename,"r") { |f| f.read }
         read_yaml_header(content)
-        entries = YAML::load(content)
+        begin
+          entries = YAML::load(content)
+        rescue StandardError => e
+          raise TranslationFileError.new("Error reading ZLocalize TranslationFile #{filename} : #{e.message}")
+        end
         if entries && !entries.is_a?(Hash)
           raise TranslationFileError.new("Invalid YAML translation file #{filename}\n\n#{entries.inspect}")
         end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: zlocalize
 version: !ruby/object:Gem::Version
-  version: 6.0.1.5
+  version: 6.0.3
 platform: ruby
 authors:
 - Charles Bedard
 - Stephane Volet
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-09 00:00:00.000000000 Z
+date: 2022-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -87,7 +87,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '2.7'
-description: 
+description:
 email:
 - zzeligg@gmail.com
 - steph@zboing.ca
@@ -118,7 +118,7 @@ homepage: https://github.com/zzeligg/zlocalize
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -133,8 +133,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.7
-signing_key: 
+rubygems_version: 3.3.10
+signing_key:
 specification_version: 4
 summary: Translation engine for Rails applications
 test_files: []