tolk 4.1.1 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa3e3637012d66b5b6cff958c18cda0db63548646e78b9c85c7521d9b6cf376a
-  data.tar.gz: ca4f20139cdd4a9af95fa316f5c1b663afceac4af1a313c493a9dde2ea4e7a26
+  metadata.gz: 0efb83ba668b7ce45dd8416a130ca95005466ca091664aed126905ba70e07031
+  data.tar.gz: 50bd892173a79fcf5f520600308a2726a0c724e89c7c6ec04f8938bbaae5d084
 SHA512:
-  metadata.gz: 44f35db53e0209edfb14a35bbe394df5db895bc0c7131c4a885a7a5d1718c81a8baf33fdda3d3943e04817e9a2009b44ed011da8d266101213aa3f04dd98c39f
-  data.tar.gz: bb7b84a1ee6ee5b9541954efae240e7e2167f326f6ec506e3be7bfd5f0a3b61f2f4bec81c0116775ae9fbc2b9e35f693f22520518ec941a132926fae13787d39
+  metadata.gz: ab3b4d111fc73221f2c8e911e0c5fb7cdfe9a3fdb74d3de4dda3b750761b0e7fc2395358855eb18e76da8911f37351fc5298638a986229835518d436154030cb
+  data.tar.gz: bf73bddbb7e574ef04041cee9375e4db0d460680a891b0fc2b24fbbd3bdf84b643afbadb8dd793543d051c65396ccf5b483f1250fb258aea084d2110d61966d1

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)
@@ -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/version.rb

@@ -1,3 +1,3 @@
 module Tolk
-  VERSION = "4.1.1"
+  VERSION = "4.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tolk
 version: !ruby/object:Gem::Version
-  version: 4.1.1
+  version: 4.2.0
 platform: ruby
 authors:
 - David Heinemeier Hansson
@@ -12,7 +12,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-06 00:00:00.000000000 Z
+date: 2022-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -185,11 +185,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