tolk 1.8.1 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a621000f302fd01a07574c3110c028601132dbd
-  data.tar.gz: 8fed6ed61584487c090385083fa38f804876fa8a
+  metadata.gz: 652a7535765ad75372d8a594b0d39004d3f92691
+  data.tar.gz: f2745145fe518451579ff1ae55677b46dff21fcf
 SHA512:
-  metadata.gz: fc1db991d2afc7b6cc64d5fcfbfb61032b9d9d1cf4e3179fc9f2ea1c71ec72a65f28b4438716ae5bd330688f062040c332feb04b802fdd136f78cfde18637444
-  data.tar.gz: 0440b91e0dd044fd119d2608c0a8a10d3a5bbb375fbd1e4641b3a48f0ed4bd924c4df381fa8c41300750a1427e5f1ec0f1f74d8a98e401cc4ae32f4f4c6f9676
+  metadata.gz: 401672278375a77cfbad76d816f1e24b9ba827fbcf88a18d8894adc6f3c1066e84530f02a378605d11df6ff34c9130887fd659beb9d3e959e38d70b513975778
+  data.tar.gz: ce3597ae438da2dcc106af94cc56aeb42855fbc16b2f2731de6094f46dd30271a7e8d69e95410d265da2c6f9f5395f0a0d38734d0f7120c91a9296e7afd846f4

data/lib/tolk/config.rb

@@ -17,9 +17,14 @@ module Tolk
       # exclude locales tokens from gems
       attr_accessor :exclude_gems_token
 
+      # reject files of type xxx.en.yml when syncing locales
+      attr_accessor :block_xxx_en_yml_locale_files
+
       def reset
         @exclude_gems_token = false
 
+        @block_xxx_en_yml_locale_files = true # keep compat with older versions
+
         @dump_path = Proc.new { "#{Rails.application.root}/config/locales" }
 
         @mapping = {

data/lib/tolk/sync.rb

@@ -14,9 +14,20 @@ module Tolk
           # bypass default init_translations
           I18n.backend.reload! if I18n.backend.initialized?
           I18n.backend.instance_variable_set(:@initialized, true)
-          I18n.backend.load_translations(Dir[Rails.root.join('config', 'locales', "*.{rb,yml}")])
+          translations_files = Dir[Rails.root.join('config', 'locales', "*.{rb,yml}")]
+
+          if Tolk.config.block_xxx_en_yml_locale_files
+            locale_block_filter = Proc.new {
+              |l| ['.', '..'].include?(l) ||
+                !l.ends_with?('.yml') ||
+                l.match(/(.*\.){2,}/) # reject files of type xxx.en.yml
+            }
+            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 
+          I18n.backend.send :init_translations unless I18n.backend.initialized? # force load
         end
         translations = flat_hash(I18n.backend.send(:translations)[primary_locale.name.to_sym])
         filter_out_i18n_keys(translations.merge(read_primary_locale_file))

data/lib/tolk/version.rb

@@ -1,3 +1,3 @@
 module Tolk
-  VERSION = "1.8.1"
+  VERSION = "1.9.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tolk
 version: !ruby/object:Gem::Version
-  version: 1.8.1
+  version: 1.9.0
 platform: ruby
 authors:
 - David Heinemeier Hansson
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-04 00:00:00.000000000 Z
+date: 2015-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -149,7 +149,6 @@ files:
 - app/views/tolk/locales/show.html.erb
 - app/views/tolk/searches/_form.html.erb
 - app/views/tolk/searches/show.html.erb
-- config/initializers/will_paginate.rb
 - config/routes.rb
 - lib/generators/tolk/install_generator.rb
 - lib/generators/tolk/templates/initializer.erb

data/config/initializers/will_paginate.rb

@@ -1,18 +0,0 @@
-if defined?(WillPaginate)
-  ActiveSupport.on_load :active_record do
-    module WillPaginate
-      module ActiveRecord
-        module RelationMethods
-          def per(value = nil) per_page(value) end
-          def total_count() count end
-        end
-      end
-      module CollectionMethods
-        alias_method :num_pages, :total_pages
-      end
-      module PerPage
-        def paginates_per(value) self.per_page=(value) end
-      end
-    end
-  end
-end