removed overridden method and undefined instance variable warnings

ddnexus · Apr 28, 2019 · ae3e4bc · ae3e4bc
1 parent aa1aad9
commit ae3e4bc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/pagy/extras/i18n.rb b/lib/pagy/extras/i18n.rb
@@ -10,7 +10,7 @@ module Frontend
 
     Pagy::I18n.clear.instance_eval { undef :load; undef :t } # unload the pagy default constant for efficiency
 
-    # no :pagy_without_i18n alias with the i18n gem
+    alias :pagy_without_i18n :pagy_t
     def pagy_t_with_i18n(*args) ::I18n.t(*args) end
     alias :pagy_t :pagy_t_with_i18n
 

diff --git a/lib/pagy/frontend.rb b/lib/pagy/frontend.rb
@@ -67,7 +67,7 @@ def pagy_link_proc(pagy, link_extra='')
     end
 
     # Similar to I18n.t: just ~18x faster using ~10x less memory
-    def pagy_t(path, vars={}) Pagy::I18n.t(@pagy_locale, path, vars) end
+    def pagy_t(path, vars={}) Pagy::I18n.t(@pagy_locale||=nil, path, vars) end
 
   end
 end