tolk 4.1.0 → 4.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5564840ddc80ff7aa53877b92a53d012c1d7da569d66ebc62f0de81b3e048ce9
-  data.tar.gz: 5e341c5940739f53d6d391de924fce6c85894992362b9d3946be674bbc33c0e3
+  metadata.gz: 16e13f007c1439906c3231b8f392450bb0a5537b6ef7b9f04b6ecc33475131b2
+  data.tar.gz: 90014d2dde967571b20d112584ff2bb5b69e4e75f0ba45eff8e24cbe9746e461
 SHA512:
-  metadata.gz: 27468ef20b2250b344ab1f4e2905eee920f504f37d20b8a2293fd327dd409ce309bf1246bab0b4525652b27d35a7558d3db597a9f3adee3431b4358f045949f6
-  data.tar.gz: 4f4ec9c4114d4d9503f3c7339f9f3cb00e2e0db0454bb36b32f9eb737f8add9f5e9e12fd8fb8dc3596502f5ef4316160b79abf9bf2cf3881854a6be3907c1141
+  metadata.gz: f66f126b8023ed812ee3f1a5e8a28a9f7392a77b7cf6af9b5a58b2e1e3e87081a1eef484939833424acdb18e2bf0992d8214be56fbb199f8f536b259cd966704
+  data.tar.gz: 66d9c79259a92f84cdbcea223142ebce7ae445ceb350119c751a6e9070ea1610baf3e5d611b9b8d0d3fcb4207a61975a9553545edda2169edf9f0effd1531aeb

data/app/models/tolk/locale.rb

@@ -107,7 +107,9 @@ module Tolk
       phrases = phrases.where('tolk_phrases.id NOT IN (?)', existing_ids) if existing_ids.present?
 
       result = phrases.public_send(pagination_method, page)
-      if Rails.version =~ /^4\.0/
+      if Gem::Version.new(Rails.version) >= Gem::Version.new('7')
+        ActiveRecord::Associations::Preloader.new(records: result, associations: :translations).call
+      elsif Rails.version =~ /^4\.0/
         ActiveRecord::Associations::Preloader.new result, :translations
       else
         ActiveRecord::Associations::Preloader.new().preload(result, :translations)
@@ -143,7 +145,9 @@ module Tolk
 #      phrases = phrases.scoped(:conditions => ['tolk_phrases.id NOT IN (?) AND tolk_phrases.id IN(?)', existing_ids, found_translations_ids]) if existing_ids.present?
       phrases = phrases.where(['tolk_phrases.id NOT IN (?) AND tolk_phrases.id IN(?)', existing_ids, found_translations_ids]) if existing_ids.present?
       result = phrases.public_send(pagination_method, page)
-      if Rails.version =~ /^4\.0/
+      if Gem::Version.new(Rails.version) >= Gem::Version.new('7')
+        ActiveRecord::Associations::Preloader.new(records: result, associations: :translations).call
+      elsif Rails.version =~ /^4\.0/
         ActiveRecord::Associations::Preloader.new result, :translations
       else
         ActiveRecord::Associations::Preloader.new().preload(result, :translations)
@@ -153,14 +157,14 @@ module Tolk
     end
 
     def to_hash
-      data = translations.joins(:phrase).order("tolk_phrases.key ASC").pluck("tolk_phrases.key, text").
-      each_with_object(Hash.new(0)) do |translation, locale|
-        if translation[0].include?(".")
-          locale.deep_merge!(unsquish(translation[0], translation[1]))
-        else
-          locale[translation[0]] = translation[1]
+      data = translations.includes(:phrase).references(:phrases).order(phrases.arel_table[:key]).
+        each_with_object({}) do |translation, locale|
+          if translation.phrase.key.include?(".")
+            locale.deep_merge!(unsquish(translation.phrase.key, translation.value))
+          else
+            locale[translation.phrase.key] = translation.value
+          end
         end
-      end
       { name => data }
     end
 
@@ -186,7 +190,9 @@ module Tolk
     def translations_with_html
       translations = self.translations.all(:conditions => "tolk_translations.text LIKE '%>%' AND
         tolk_translations.text LIKE '%<%' AND tolk_phrases.key NOT LIKE '%_html'", :joins => :phrase)
-      if Rails.version =~ /^4\.0/
+      if Gem::Version.new(Rails.version) >= Gem::Version.new('7')
+        ActiveRecord::Associations::Preloader.new(records: result, associations: :translations).call
+      elsif Rails.version =~ /^4\.0/
         ActiveRecord::Associations::Preloader.new translations, :phrase
       else
         ActiveRecord::Associations::Preloader.new().preload(translations, :phrase)
@@ -230,7 +236,9 @@ module Tolk
         phrase.translation = phrase.translations.for(self)
       end
 
-      if Rails.version =~ /^4\.0/
+      if Gem::Version.new(Rails.version) >= Gem::Version.new('7')
+        ActiveRecord::Associations::Preloader.new(records: result, associations: :translations).call
+      elsif Rails.version =~ /^4\.0/
         ActiveRecord::Associations::Preloader.new result, :translations
       else
         ActiveRecord::Associations::Preloader.new().preload(result, :translations)

data/app/views/tolk/locales/all.html.erb

@@ -79,7 +79,7 @@
   </div>
 <% else %>
   <div class="empty-state">
-    <%= render 'tolk/blank_canva.svg' %>
+    <%= render 'tolk/blank_canva' %>
     <p class="empty-state__msg">
       There aren't any completed translations for this locale.
     </p>

data/app/views/tolk/locales/index.html.erb

@@ -32,7 +32,7 @@
   </ul>
 <% else %>
   <div class="empty-state">
-    <%= render 'tolk/empty.svg' %>
+    <%= render 'tolk/empty' %>
     <p class="empty-state__msg">
       No locales yet, add one:
     </p>

data/app/views/tolk/locales/show.html.erb

@@ -64,7 +64,7 @@
   </div>
 <% else %>
   <div class="empty-state">
-    <%= render 'tolk/houra.svg' %>
+    <%= render 'tolk/houra' %>
     <p class="empty-state__msg">
       <% if @locale.has_updated_translations? %>
         There aren't any missing phrases that need translation.

data/app/views/tolk/searches/show.html.erb

@@ -60,7 +60,7 @@
   </div>
 <% else %>
   <div class="empty-state">
-    <%= render 'tolk/no_data.svg' %>
+    <%= render 'tolk/no_data' %>
     <p class="empty-state__msg">
       No search results.
     </p>

data/lib/tolk/config.rb

@@ -20,6 +20,9 @@ module Tolk
       # reject files of type xxx.en.yml when syncing locales
       attr_accessor :block_xxx_en_yml_locale_files
 
+      # specify an array of files to skip ["devise"] will skip devise.<locale>.yml when syncing locales.
+      attr_accessor :ignore_locale_files
+
       # strip translation texts automatically
       attr_accessor :strip_texts
 

data/lib/tolk/sync.rb

@@ -25,6 +25,16 @@ module Tolk
             translations_files =  translations_files.reject(&locale_block_filter)
           end
 
+          if Tolk.config.ignore_locale_files.present?
+            locale_block_filter = Proc.new do |file_name|
+              directory_path = Rails.root.join('config', 'locales', 'final_separator').to_s.gsub("final_separator", "")
+              normalized_file_name = file_name.gsub(directory_path, "").split('.').first
+              Tolk.config.ignore_locale_files.include?(normalized_file_name)
+            end
+            translations_files =  translations_files.reject(&locale_block_filter)
+          end
+
+
           I18n.backend.load_translations(translations_files)
         else
           I18n.backend.send :init_translations unless I18n.backend.initialized? # force load

data/lib/tolk/version.rb

@@ -1,3 +1,3 @@
 module Tolk
-  VERSION = "4.1.0"
+  VERSION = "4.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tolk
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.3.0
 platform: ruby
 authors:
 - David Heinemeier Hansson
@@ -9,10 +9,10 @@ authors:
 - Emilio Tagua
 - Thomas Darde
 - Ferran Basora
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-21 00:00:00.000000000 Z
+date: 2022-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -29,47 +29,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: safe_yaml
+  name: sprockets-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.6
+        version: '3.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.6
+        version: '3.4'
 - !ruby/object:Gem::Dependency
-  name: sassc
+  name: safe_yaml
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.6
 - !ruby/object:Gem::Dependency
-  name: capybara
+  name: sassc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.14'
-  type: :development
+        version: '0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -105,7 +105,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: poltergeist
+  name: will_paginate
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -119,7 +119,49 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: will_paginate
+  name: capybara
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.14'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.14'
+- !ruby/object:Gem::Dependency
+  name: cuprite
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: puma
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.5'
+- !ruby/object:Gem::Dependency
+  name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -157,11 +199,11 @@ files:
 - app/models/tolk/phrase.rb
 - app/models/tolk/translation.rb
 - app/views/layouts/tolk/application.html.erb
-- app/views/tolk/_blank_canva.svg
-- app/views/tolk/_empty.svg
-- app/views/tolk/_houra.svg
+- app/views/tolk/_blank_canva.html.erb
+- app/views/tolk/_empty.html.erb
+- app/views/tolk/_houra.html.erb
 - app/views/tolk/_nav.html.erb
-- app/views/tolk/_no_data.svg
+- app/views/tolk/_no_data.html.erb
 - app/views/tolk/locales/all.html.erb
 - app/views/tolk/locales/index.html.erb
 - app/views/tolk/locales/show.atom.builder
@@ -189,7 +231,7 @@ homepage: https://github.com/tolk/tolk
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -204,8 +246,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.20
-signing_key: 
+rubygems_version: 3.3.10
+signing_key:
 specification_version: 4
 summary: Rails engine providing web interface for managing i18n yaml files
 test_files: []