tolk 1.9.3 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a68491dc91c4792169da0679d7f1012611a7b82
-  data.tar.gz: d3e08f6d4c002218f23fa9a9cd885f44ca0a2805
+  metadata.gz: 90462539c407ff422fdf13f5fbac68457c8c2807
+  data.tar.gz: cb5c5bc05f5a99a785c7d75261de04aceddf4d80
 SHA512:
-  metadata.gz: 6465ecbd40a7753dcc54e98db489605934846f2426b75904ac4dce556300d1dad66e24ec9c6acd3f70ed3c6c686962f10a29367dd380a24163e2f1fef70b7ce2
-  data.tar.gz: b1f2d096f85f3b0e1a0cb6eaeefebc811f067f8a6e5ef13f86253db3bd7f19c71dfb6203f91dd777c131a67033c24f3a08988641070acee97128ce6ee30e885b
+  metadata.gz: ab4f1e9ad6b85a8baef406004c20814397eaf725c6271970043929a08c24a10c8de6dcf1d265673db61d1ea5a97f9c6ba0fe61eb110465ea1a3d94fc43fb7545
+  data.tar.gz: 43907b282e5a3eda7f190b9eb7d0bab377ebb3b6bf166fcddcfbdd66b1d1eb38a50271b0475035eebe4fc76101c03232392898901b62d001e44793961a94ae17

data/app/controllers/tolk/application_controller.rb

@@ -6,7 +6,7 @@ module Tolk
     protect_from_forgery
 
     cattr_accessor :authenticator
-    before_filter :authenticate
+    before_action :authenticate
 
     def authenticate
 #      self.authenticator.bind(self).call if self.authenticator && self.authenticator.respond_to?(:call)

data/app/controllers/tolk/locales_controller.rb

@@ -1,7 +1,7 @@
 module Tolk
   class LocalesController < Tolk::ApplicationController
-    before_filter :find_locale, :only => [:show, :all, :update, :updated]
-    before_filter :ensure_no_primary_locale, :only => [:all, :update, :show, :updated]
+    before_action :find_locale, :only => [:show, :all, :update, :updated]
+    before_action :ensure_no_primary_locale, :only => [:all, :update, :show, :updated]
 
     def index
       @locales = Tolk::Locale.secondary_locales.sort_by(&:language_name)
@@ -46,6 +46,7 @@ module Tolk
     def dump_all
       Tolk::Locale.dump_all
       I18n.reload!
+      I18n::JS.export if defined? I18n::JS
       redirect_to request.referrer
     end
 

data/app/controllers/tolk/searches_controller.rb

@@ -1,6 +1,6 @@
 module Tolk
   class SearchesController < Tolk::ApplicationController
-    before_filter :find_locale
+    before_action :find_locale
   
     def show
       @phrases = @locale.search_phrases(params[:q], params[:scope].to_sym, params[:k], params[pagination_param])

data/app/models/tolk/translation.rb

@@ -59,7 +59,7 @@ module Tolk
         end
         super unless value == text
       else
-        value = value.strip if value.is_a?(String)
+        value = value.strip if value.is_a?(String) && Tolk.config.strip_texts
         super unless value.to_s == text
       end
     end

data/lib/tolk/config.rb

@@ -20,9 +20,14 @@ module Tolk
       # reject files of type xxx.en.yml when syncing locales
       attr_accessor :block_xxx_en_yml_locale_files
 
+      # strip translation texts automatically
+      attr_accessor :strip_texts
+
       def reset
         @exclude_gems_token = false
 
+        @strip_texts = true
+
         @block_xxx_en_yml_locale_files = true # keep compat with older versions
 
         @dump_path = Proc.new { "#{Rails.application.root}/config/locales" }

data/lib/tolk/version.rb

@@ -1,3 +1,3 @@
 module Tolk
-  VERSION = "1.9.3"
+  VERSION = "2.0.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tolk
 version: !ruby/object:Gem::Version
-  version: 1.9.3
+  version: 2.0.0
 platform: ruby
 authors:
 - David Heinemeier Hansson
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-21 00:00:00.000000000 Z
+date: 2016-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -21,9 +21,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -31,9 +28,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4.3'
 - !ruby/object:Gem::Dependency
   name: safe_yaml
   requirement: !ruby/object:Gem::Requirement
@@ -177,7 +171,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -185,7 +179,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Rails engine providing web interface for managing i18n yaml files