tolk 1.3.3 → 1.3.4

data/app/assets/stylesheets/tolk/screen.css

@@ -3,20 +3,20 @@ Defaults
 -------------------------------------------------*/
 
 acronym, abbr {
-  font-variant: small-caps; 
-  text-transform: lowercase; 
+  font-variant: small-caps;
+  text-transform: lowercase;
   font-weight: bold;
 }
 
-.center {text-align: center;}	
-.large {font-size: larger;}	
+.center {text-align: center;}
+.large {font-size: larger;}
 .small {font-size: smaller;}
 strong {font-weight: bold;}
 em {font-style: italic;}
 
-.clear {clear: both;}				 
-.clearfix:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; }		 
-.clearfix { display: inline-block; }		 
+.clear {clear: both;}
+.clearfix:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; }
+.clearfix { display: inline-block; }
 .clearfix{ display: block; }
 
 a {color: #888;}
@@ -28,8 +28,8 @@ Layout
 
 body {
   font-family: "Lucida Sans", "Lucida Grande", "Lucida Sans Unicode", sans-serif;
-  background: #e5e5e5; 
-  color: #333;   
+  background: #e5e5e5;
+  color: #333;
   margin: 0;
   padding: 0;
   font-size: 14px;
@@ -288,7 +288,7 @@ table.translations .highlight {
   background-color: yellow;
 }
 
-table.translations .phrase .carriage_return {
+table.translations .phrase .carriage_return, table.translations .phrase .boolean {
 	color: #2fadcf;
 	font-weight: bold;
 }

data/app/helpers/tolk/application_helper.rb

@@ -10,14 +10,18 @@ module Tolk
 
     def yaml_value(value)
       if value.present?
-        unless value.is_a?(String)
+        unless value.is_a?(String) || value.is_a?(TrueClass) || value.is_a?(FalseClass)
           value = value.respond_to?(:ya2yaml) ? value.ya2yaml(:syck_compatible => true) : value.to_yaml
         end
       end
-      
+
       value
     end
 
+    def boolean_warning
+      '<span class="boolean">(Do not translate -- Enter true or false)</span>'.html_safe
+    end
+
     def tolk_locale_selection
       existing_locale_names = Tolk::Locale.all.map(&:name)
 

data/app/models/tolk/locale.rb

@@ -64,7 +64,8 @@ module Tolk
         self.special_prefixes.include?(prefix) || self.special_keys.include?(key)
       end
 
-      PLURALIZATION_KEYS = ['none', 'one', 'two', 'few', 'many', 'other']
+      # http://cldr.unicode.org/index/cldr-spec/plural-rules - TODO: usage of 'none' isn't standard-conform
+      PLURALIZATION_KEYS = ['none', 'zero', 'one', 'two', 'few', 'many', 'other']
       def pluralization_data?(data)
         keys = data.keys.map(&:to_s)
         keys.all? {|k| PLURALIZATION_KEYS.include?(k) }

data/app/models/tolk/translation.rb

@@ -5,7 +5,8 @@ module Tolk
     scope :containing_text, lambda {|query| where("tolk_translations.text LIKE ?", "%#{query}%") }
 
     serialize :text
-    validates_presence_of :text, :if => proc {|r| r.primary.blank? && !r.explicit_nil }
+    serialize :previous_text
+    validates_presence_of :text, :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
@@ -27,6 +28,10 @@ module Tolk
     attr_accessor :explicit_nil
     before_validation :set_explicit_nil
 
+    def boolean?
+      text.is_a?(TrueClass) || text.is_a?(FalseClass) || text == 't' || text == 'f'
+    end
+
     def up_to_date?
       not out_of_date?
     end
@@ -45,24 +50,47 @@ module Tolk
 
     def text=(value)
       value = value.to_s if value.kind_of?(Fixnum)
-      super unless value.to_s == text
+      if primary_translation && primary_translation.boolean?
+        value = case value.to_s.downcase.strip
+        when 'true', 't'
+          true
+        when 'false', 'f'
+          false
+        else
+          self.explicit_nil = true
+          nil
+        end
+        super unless value == text
+      else
+        super unless value.to_s == text
+      end
     end
 
     def value
       if text.is_a?(String) && /^\d+$/.match(text)
         text.to_i
+      elsif (primary_translation || self).boolean?
+        %w[true t].member?(text.to_s.downcase.strip)
       else
         text
       end
     end
 
     def self.detect_variables(search_in)
-      case search_in
+      variables = case search_in
         when String then Set.new(search_in.scan(/\{\{(\w+)\}\}/).flatten + search_in.scan(/\%\{(\w+)\}/).flatten)
         when Array then search_in.inject(Set[]) { |carry, item| carry + detect_variables(item) }
         when Hash then search_in.values.inject(Set[]) { |carry, item| carry + detect_variables(item) }
         else Set[]
       end
+
+      # delete special i18n variable used for pluralization itself (might not be used in all values of
+      # the pluralization keys, but is essential to use pluralization at all)
+      if search_in.is_a?(Hash) && Tolk::Locale.pluralization_data?(search_in)
+        variables.delete_if {|v| v == 'count' }
+      else
+        variables
+      end
     end
 
     def variables
@@ -92,7 +120,18 @@ module Tolk
           end
         end
 
-        self.text = nil if primary_translation.text.class != self.text.class
+        if primary_translation.boolean?
+          self.text = case self.text.to_s.strip
+          when 'true'
+            true
+          when 'false'
+            false
+          else
+            nil
+          end
+        elsif primary_translation.text.class != self.text.class
+          self.text = nil
+        end
       end
 
       true
@@ -110,10 +149,10 @@ module Tolk
 
     def check_matching_variables
       unless variables_match?
-        if primary_translation.variables.empty? || primary_translation.variables.class == Set
-          self.errors.add(:text, "The original does not contain variables, so they should not be included.")
+        if primary_translation.variables.empty?
+          self.errors.add(:variables, "The primary translation does not contain substitutions, so this should neither.")
         else
-          self.errors.add(:text, "The translation should contain the variables #{primary_translation.to_a.to_sentence}.")
+          self.errors.add(:variables, "The translation should contain the substitutions of the primary translation: (#{primary_translation.variables.to_a.join(', ')}), found (#{self.variables.to_a.join(', ')}).")
         end
       end
     end

data/app/views/tolk/locales/all.html.erb

@@ -31,6 +31,7 @@
                 <div class="updated">
                   <span class="key">Updated</span>
                   <%= format_i18n_value(phrase.translations.primary.text) -%>
+                  <%= boolean_warning if phrase.translations.primary.boolean? -%>
                 </div>
                 <div class="original">
                   <span class="key">Original</span>
@@ -38,6 +39,7 @@
                 </div>
               <% else %>
                 <%= format_i18n_value(phrase.translations.primary.text) -%>
+                <%= boolean_warning if phrase.translations.primary.boolean? -%>
               <% end %>
 
               <span class="key"><%= phrase.key %></span>

data/app/views/tolk/locales/show.html.erb

@@ -35,6 +35,7 @@
               <% else -%>
                 <%= format_i18n_value(phrase.translations.primary.text) -%>
               <% end -%>
+              <%= boolean_warning if phrase.translations.primary.boolean? -%>
               <span class="key" title="<%= phrase.key %>"><%= truncate(phrase.key, :length => 100) %></span>
             </td>
           </tr>

data/app/views/tolk/searches/show.html.erb

@@ -32,6 +32,7 @@
                 <% else -%>
                   <%= format_i18n_value(phrase.translations.primary.text) -%>
                 <% end -%>
+                <%= boolean_warning if phrase.translations.primary.boolean? -%>
                 <span class="key" title="<%= phrase.key %>"><%= params[:k].present? ?
                   highlight(h(truncate(phrase.key, :length => 100)), params[:k]) :
                   h(truncate(phrase.key, :length => 100)) %></span>

data/lib/tolk/import.rb

@@ -8,13 +8,13 @@ module Tolk
 
       def import_secondary_locales
         locales = Dir.entries(self.locales_config_path)
-        
-        locale_block_filter = Proc.new { 
+
+        locale_block_filter = Proc.new {
           |l| ['.', '..'].include?(l) ||
             !l.ends_with?('.yml') ||
             l.match(/(.*\.){2,}/) # reject files of type xxx.en.yml
         }
-        locales = locales.reject(&locale_block_filter).map {|x| x.split('.').first } 
+        locales = locales.reject(&locale_block_filter).map {|x| x.split('.').first }
         locales = locales - [Tolk::Locale.primary_locale.name]
         locales.each {|l| import_locale(l) }
       end
@@ -32,9 +32,13 @@ module Tolk
 
           if phrase
             translation = locale.translations.new(:text => value, :phrase => phrase)
-            count = count + 1 if translation.save
+            if translation.save
+              count = count + 1
+            elsif translation.errors[:variables].present?
+              puts "[WARN] Key '#{key}' from '#{locale_name}.yml' could not be saved: #{translation.errors[:variables].first}"
+            end
           else
-            puts "[ERROR] Key '#{key}' was found in #{locale_name}.yml but #{Tolk::Locale.primary_language_name} translation is missing"
+            puts "[ERROR] Key '#{key}' was found in '#{locale_name}.yml' but #{Tolk::Locale.primary_language_name} translation is missing"
           end
         end
 

data/lib/tolk/version.rb

@@ -1,3 +1,3 @@
 module Tolk
-  VERSION = "1.3.3"
+  VERSION = "1.3.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tolk
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.3.4
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-05 00:00:00.000000000 Z
+date: 2012-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: will_paginate