tolk 1.3.11 → 1.3.12

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZWJlYTQxNjE0NjM2YzM2ZTA0MmQ1ZjYwNTdkNmNhODk5YWQxOTdiZg==
+  data.tar.gz: !binary |-
+    YTUzOTA2NjU4YzcxYzZhNTgwYjI0YTk2NTEyZDU1MjNkOWE2OTJmMQ==
+SHA512:
+  metadata.gz: !binary |-
+    MzJlNzkxN2FlMDllMDczOThmZTBjNzJkNzA5Y2UwNjFhMzIyNjYyZjJlYzcw
+    ZTViMWZkNDJiMTQ1NzhkYmI0NTFkODYyNjM5Nzg3MzQzMjc4ZDIwNzdkNjQ1
+    OGE4MDEwMzg0YTA0YjE1ODA5NmJkNzdkYTc1ZTRkMTdhMjRjMDY=
+  data.tar.gz: !binary |-
+    ZDY4ZDUzNTBhNWE1YjFjYzBiYzc2MTNjMzU2NzQyYTAxOWJhODljNzc1ODFh
+    NDNlMjlhNWU1M2VjMWFmOWE0YmQ4NGRhMWE0NzIwNzM3YmRiYmVhZTg1ODFj
+    OGY2ZGViZGY4NmE2MzZjMWE5ZTYwMmJjMTNkNDlmZDQxYjQ2NTY=

data/app/models/tolk/locale.rb

@@ -20,7 +20,7 @@ module Tolk
     self.locales_config_path = self._dump_path
 
     cattr_accessor :primary_locale_name
-    self.primary_locale_name = I18n.default_locale.to_s
+    self.primary_locale_name = Tolk.config.primary_locale_name || I18n.default_locale.to_s
 
     include Tolk::Sync
     include Tolk::Import

data/app/models/tolk/translation.rb

@@ -6,7 +6,7 @@ module Tolk
 
     serialize :text
     serialize :previous_text
-    validates_presence_of :text, :if => proc {|r| r.primary.blank? && !r.explicit_nil && !r.boolean?}
+    validate :validate_text_not_nil, :if => proc {|r| r.primary.blank? && !r.explicit_nil && !r.boolean?}
     validate :check_matching_variables, :if => proc { |tr| tr.primary_translation.present? }
 
     validates_uniqueness_of :phrase_id, :scope => :locale_id
@@ -156,5 +156,10 @@ module Tolk
         end
       end
     end
+    
+    def validate_text_not_nil
+      return unless text.nil?
+      errors.add :text, :blank
+    end
   end
 end

data/lib/generators/tolk/install_generator.rb

@@ -22,7 +22,7 @@ module Tolk
 
       display "Hello, Tolk installer will help you sets things up!", :black
       unless initializer
-        install_generator = ask_boolean("Do you wan't to install the optional configuration file (to change mappings, locales dump location etc..) ?")
+        install_generator = ask_boolean("Do you want to install the optional configuration file (to change mappings, locales dump location etc..) ?")
         template "initializer.erb", "config/initializers/tolk.rb" if install_generator
       else
         display "You already have a config file. You're updating, heh? I'm generating a new 'tolk.rb.example' that you can review."

data/lib/tolk/config.rb

@@ -11,6 +11,9 @@ module Tolk
       # Dump locale path by default the locales folder (config/locales)
       attr_accessor :dump_path
 
+      # primary locale to not be overriden by default locale in development mode
+      attr_accessor :primary_locale_name
+
       def reset
         @dump_path = Proc.new { "#{Rails.application.root}/config/locales" }
 
@@ -66,4 +69,4 @@ module Tolk
     # Set default values for configuration options on load
     self.reset
   end
-end
+end

data/lib/tolk/engine.rb

@@ -6,5 +6,11 @@ module Tolk
     SafeYAML::OPTIONS[:deserialize_symbols] = true
 
     isolate_namespace Tolk
+
+    if Rails.version >= '3.1'
+      initializer :assets do |app|
+        app.config.assets.precompile += ['tolk/libraries.js']
+      end
+    end
   end
 end

data/lib/tolk/version.rb

@@ -1,3 +1,3 @@
 module Tolk
-  VERSION = "1.3.11"
+  VERSION = "1.3.12"
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tolk
 version: !ruby/object:Gem::Version
-  version: 1.3.11
-  prerelease: 
+  version: 1.3.12
 platform: ruby
 authors:
 - David Heinemeier Hansson
@@ -13,12 +12,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-10 00:00:00.000000000 Z
+date: 2013-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: will_paginate
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -26,7 +24,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -34,7 +31,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: safe_yaml
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -42,7 +38,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -93,27 +88,27 @@ files:
 - app/views/tolk/searches/_form.html.erb
 - app/views/tolk/searches/show.html.erb
 homepage: http://github.com/tolk/tolk
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.1.11
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Rails engine providing web interface for managing i18n yaml files
 test_files: []