air18n 0.1.18 → 0.1.19

data/lib/air18n/phrase_translation.rb

@@ -299,7 +299,7 @@ module Air18n
     end
 
     def check_plural_forms
-      result = SmartCount::valid?(self.value, self.locale)
+      result = SmartCount::valid?(self.phrase.value, self.value, I18n.default_locale, self.locale)
       if !result[:valid]
         self.errors.add(:value, result[:reason])
       end
@@ -310,7 +310,7 @@ module Air18n
         max_length = $1.to_i
         length = value.size
         if length > max_length
-          self.errors.add(:value, "Translation has #{length} characters; maximum length #{max_length} characters.")
+          self.errors.add(:value, "Translation has #{length} characters, maximum length is #{max_length} characters.")
         end
       end
     end
@@ -322,8 +322,8 @@ module Air18n
       if SmartCount::applies?(self.phrase.value) || SmartCount::applies?(self.value)
         our_variables = SmartCount::dedupe_things_like_tags_or_variables(
           self.locale, our_variables)
-          their_variables = SmartCount::dedupe_things_like_tags_or_variables(
-            I18n.default_locale, their_variables)
+        their_variables = SmartCount::dedupe_things_like_tags_or_variables(
+          I18n.default_locale, their_variables)
       end
 
       LoggingHelper.info "our variables: #{our_variables.inspect}"

data/lib/air18n/smart_count.rb

@@ -1,17 +1,28 @@
+# encoding: utf-8
+
 module Air18n
   module SmartCount
     # Class for choosing the right plural form of a phrase based on an
     # interpolation variable with special name "smart_count" (set below in
     # OPTION_NAME constant).
     #
-    # If a phrase uses the smart_count interpolation variable, translators can
-    # specify multiple translations, one per possible pluralization form of the
+    # If a phrase's default text contains '||||', translators can specify
+    # multiple translations, one per possible pluralization form of the
     # language. If there is more than one pluralization form, translations are
-    # separated by ";" (set below in DELIMITER constant).
+    # separated by "||||" (set below in DELIMITER constant). The default text
+    # specifies all the forms for the default locale. (If the default locale is
+    # a single-form locale like Japanese, the default text can look like
+    # "%{smart_count} レビュー||||" where it ends with '||||'.
 
+    # Option to translate() that holds number which controls which plural form
+    # is used.
     INTERPOLATION_VARIABLE_NAME = :smart_count
-    INTERPOLATION_VARIABLE_PLACEHOLDER = "%{#{INTERPOLATION_VARIABLE_NAME}}"
-    DELIMITER = ';'
+
+    # Delimiter between forms of translation.
+    #
+    # This delimiter must be unique and rare because we assume that any phrase
+    # that includes it uses smart counting.
+    DELIMITER = '||||'
 
     # C.F.
     # https://developer.mozilla.org/en-US/docs/Localization_and_Plurals
@@ -74,29 +85,30 @@ module Air18n
     # 'locale'.
     #
     # Examples:
-    #   choose("%{smart_count} bewertung; %{smart_count} bewertungen",
+    #   choose("%{smart_count} bewertung |||| %{smart_count} bewertungen",
     #          :de, 0)
-    #     => %{smart_count} bewertungen
-    #   choose("%{smart_count} bewertung; %{smart_count} bewertungen",
+    #     => "%{smart_count} bewertungen"
+    #   choose("%{smart_count} bewertung |||| %{smart_count} bewertungen",
     #          :de, 1)
-    #     => %{smart_count} bewertung
-    #   choose("%{smart_count} bewertung; %{smart_count} bewertungen",
+    #     => "%{smart_count} bewertung"
+    #   choose("%{smart_count} bewertung |||| %{smart_count} bewertungen",
     #          :de, 2)
-    #     => %{smart_count} bewertungen
+    #     => "%{smart_count} bewertungen"
+    #   choose("%{smart_count} bewertung |||| %{smart_count} bewertungen",
+    #          :de, nil)
+    #     => "%{smart_count} bewertung |||| %{smart_count} bewertungen"
     #
     # If 'count' is nil or 'text' contains too few alternative versions, this
     # method degrades gracefully by returning the first version of text.
     #
     # Returns if nil if text is blank.
     def choose(text, locale, count)
-      return text if text.blank?
-
-      texts = text.split(DELIMITER)
-      if count
+      if count.present? && text.present?
+        texts = text.split(DELIMITER)
         chosen_text = texts[plural_type_index(locale, count)] || texts.first
         chosen_text.strip
       else
-        texts.first.strip
+        text
       end
     end
 
@@ -109,19 +121,21 @@ module Air18n
       PLURAL_TYPES[plural_type_name(locale)][:rule].call(count)
     end
 
-    def hint(text, locale)
-      if applies?(text)
-        doc_array = PLURAL_TYPES[plural_type_name(locale)][:doc]
+    # Returns a hint for translators translating source_text to target_locale,
+    # or nil if there is no smart-count-related hint.
+    def hint(source_text, target_locale)
+      if applies?(source_text)
+        doc_array = PLURAL_TYPES[plural_type_name(target_locale)][:doc]
         if doc_array
-          doc_string = doc_array.join(DELIMITER + ' ')
-          n = num_forms(locale)
+          doc_string = doc_array.join(' ' + DELIMITER + ' ')
+          n = num_forms(target_locale)
           "Must specify #{n} forms separated by \"#{DELIMITER}\": \"#{doc_string}\"" 
         end
       end
     end
 
     def applies?(text)
-      !!text.index(INTERPOLATION_VARIABLE_PLACEHOLDER)
+      !!text.index(DELIMITER)
     end
 
     def num_forms(locale)
@@ -161,10 +175,10 @@ module Air18n
       end
     end
 
-    def valid?(text, locale)
-      if applies?(text)
-        size = text.split(DELIMITER).size
-        num_forms = num_forms(locale)
+    def valid?(source_text, target_text, source_locale, target_locale)
+      if applies?(source_text) || applies?(target_text)
+        size = target_text.split(DELIMITER).size
+        num_forms = num_forms(target_locale)
         if size == num_forms
           { :valid => true }
         else

data/lib/air18n/version.rb

@@ -1,3 +1,3 @@
 module Air18n
-  VERSION = "0.1.18"
+  VERSION = "0.1.19"
 end

data/spec/lib/air18n/air18n_spec.rb

@@ -105,6 +105,40 @@ describe Air18n do
     end
   end
 
+  context 'smart_count' do
+    it 'should work in English' do
+      I18n.t('smart count test',
+             :default => 'review |||| reviews'
+            ).should == 'review |||| reviews'
+      I18n.t('smart count test',
+             :default => 'review |||| reviews',
+             :smart_count => 1
+            ).should == 'review'
+      I18n.t('smart count test',
+             :default => 'review |||| reviews',
+             :smart_count => 2
+            ).should == 'reviews'
+    end
+
+    it 'should work in English with other interpolation' do
+      I18n.t('smart count test with interpolation',
+             :default => 'review in %{location} |||| reviews in %{location}',
+             :smart_count => 2,
+             :location => 'Finland'
+            ).should == 'reviews in Finland'
+
+      # You can't use smart_count without specifying all other interpolation
+      # variables. Otherwise you get a I18n::MissingInterpolationArgument
+      # error.
+      lambda {
+        I18n.t('smart count test with interpolation',
+               :default => 'review in %{location} |||| reviews in %{location}',
+               :smart_count => 2
+              )
+      }.should raise_error
+    end
+  end
+
   context 'pluralize' do
     it 'should work in English' do
       I18n.pluralize(0, 'Review').should == '0 Reviews'
@@ -118,7 +152,7 @@ describe Air18n do
     end
 
     it 'should work in French' do
-      I18n.backend.store_translations(:fr, { 'shared.pluralize.Review' => '%{smart_count} Commentaire;%{smart_count} Commentaires' })
+      I18n.backend.store_translations(:fr, { 'shared.pluralize.Review' => '%{smart_count} Commentaire |||| %{smart_count} Commentaires' })
       old_locale = I18n.full_locale
       I18n.full_locale = :fr
       I18n.pluralize(0, 'Review').should == '0 Commentaire'
@@ -129,7 +163,7 @@ describe Air18n do
     end
 
     it 'should work with explicitly-specified plural' do
-      I18n.backend.store_translations(:fr, { 'shared.pluralize.feis' => '%{smart_count} french singular;%{smart_count} french plural' })
+      I18n.backend.store_translations(:fr, { 'shared.pluralize.feis' => '%{smart_count} french singular |||| %{smart_count} french plural' })
 
       I18n.pluralize(0, 'feis', 'feiseanna').should == '0 feiseanna'
       I18n.pluralize(1, 'feis', 'feiseanna').should == '1 feis'

data/spec/lib/air18n/backend_spec.rb

@@ -153,21 +153,25 @@ describe Air18n::Backend do
       backend = Air18n::Backend.new
       backend.lookup(
         :en, 'smart count reviews', @scope,
-        :default => "%{smart_count} review; %{smart_count} reviews",
+        :default => "%{smart_count} review |||| %{smart_count} reviews",
         :smart_count => 1
       ).should == '%{smart_count} review'
       backend.lookup(
         :en, 'smart count reviews', @scope,
-        :default => "%{smart_count} review; %{smart_count} reviews",
+        :default => "%{smart_count} review |||| %{smart_count} reviews",
         :smart_count => 3
       ).should == '%{smart_count} reviews'
+      backend.lookup(
+        :en, 'smart count reviews', @scope,
+        :default => "%{smart_count} review |||| %{smart_count} reviews",
+      ).should == '%{smart_count} review |||| %{smart_count} reviews'
 
       # If a phrase is untranslated in Chinese, this can turn into "3 review"
       # on the Chinese site if we are not careful and use the Chinese plural
       # rules for this English fallback. This test catches this bug.
       backend.lookup(
         :zh, 'smart count reviews', @scope,
-        :default => "%{smart_count} review; %{smart_count} reviews",
+        :default => "%{smart_count} review |||| %{smart_count} reviews",
         :smart_count => 3
       ).should == '%{smart_count} reviews'
     end

data/spec/lib/air18n/phrase_translation_spec.rb

@@ -41,7 +41,7 @@ describe Air18n::PhraseTranslation do
       translation.value = 'too looooong'
       translation.save.should be_false
       translation.errors.should include :value
-      translation.errors[:value].should include "Translation has 12 characters; maximum length 10 characters."
+      translation.errors[:value].should include "Translation has 12 characters, maximum length is 10 characters."
     end
 
     it 'Should check variables' do
@@ -57,7 +57,7 @@ describe Air18n::PhraseTranslation do
 
     context 'smart_count' do
       before :all do
-        @phrase = FactoryGirl.create(:phrase, :key => 'variables with smart count reviews', :value => "%{smart_count} review in %{location};%{smart_count} reviews in %{location}")
+        @phrase = FactoryGirl.create(:phrase, :key => 'variables with smart count reviews', :value => "%{smart_count} review in %{location} |||| %{smart_count} reviews in %{location}")
       end
 
       it 'Should check variables with smart count in language with one plural form' do
@@ -81,10 +81,10 @@ describe Air18n::PhraseTranslation do
           :phrase => @phrase,
           :locale => :fr,
           :key => 'variables with smart count reviews',
-          :value => 'a %{location} %{smart_count} commentaire; a %{location} %{smart_count} commentaires')
+          :value => 'a %{location} %{smart_count} commentaire |||| a %{location} %{smart_count} commentaires')
           validated = translation.save
           validated.should == true
-          translation.value = 'a %{location} %{smart_count} commentaire; a %{location} %{smart_countz} commentaires'
+          translation.value = 'a %{location} %{smart_count} commentaire |||| a %{location} %{smart_countz} commentaires'
           translation.save.should be_false
           translation.errors.should include :value
           translation.errors[:value].should include "Var %{smart_count} missing from translation"
@@ -96,10 +96,10 @@ describe Air18n::PhraseTranslation do
           :phrase => @phrase,
           :locale => :pl,
           :key => 'variables with smart count reviews',
-          :value => 'a %{location} %{smart_count} ends-in-one-except-eleven; a %{location} %{smart_count} ends-in-two-through-four-except-twelve-through-fourteen; a %{location} %{smart_count} everything-else')
+          :value => 'a %{location} %{smart_count} ends-in-one-except-eleven |||| a %{location} %{smart_count} ends-in-two-through-four-except-twelve-through-fourteen |||| a %{location} %{smart_count} everything-else')
           validated = translation.save
           validated.should == true
-          translation.value = 'a %{location} %{smart_count} ends-in-one-except-eleven; a %{location} %{smart_count} ends-in-two-through-four-except-twelve-through-fourteen; a %{smart_count} everything-else'
+          translation.value = 'a %{location} %{smart_count} ends-in-one-except-eleven |||| a %{location} %{smart_count} ends-in-two-through-four-except-twelve-through-fourteen |||| a %{smart_count} everything-else'
 
           translation.save.should be_false
           translation.errors.should include :value
@@ -112,13 +112,13 @@ describe Air18n::PhraseTranslation do
           :phrase => @phrase,
           :locale => :de,
           :key => 'variables with smart count reviews',
-          :value => 'a %{location} %{smart_count} bewertung; a %{location} %{smart_count} bewertungen')
+          :value => 'a %{location} %{smart_count} bewertung |||| a %{location} %{smart_count} bewertungen')
           validated = translation.save
           validated.should == true
           translation.value = 'a %{location} %{smart_count} bewertung, a %{location} %{smart_count} bewertungen'
           translation.save.should be_false
           translation.errors.should include :value
-          translation.errors[:value].should include "Must specify 2 forms separated by \";\" (1 was specified)"
+          translation.errors[:value].should include "Must specify 2 forms separated by \"||||\" (1 was specified)"
       end
     end
   end

data/spec/lib/air18n/smart_count_spec.rb

@@ -19,7 +19,7 @@ describe Air18n::SmartCount do
     end
 
     it "should work in German" do
-      review_text = "%{smart_count} bewertung; %{smart_count} bewertungen"
+      review_text = "%{smart_count} bewertung |||| %{smart_count} bewertungen"
       answers =
         ["%{smart_count} bewertungen"] * 1 +
         ["%{smart_count} bewertung"] * 1 +
@@ -28,7 +28,7 @@ describe Air18n::SmartCount do
     end
 
     it "should work in French" do
-      review_text = "%{smart_count} commentaire; %{smart_count} commentaires"
+      review_text = "%{smart_count} commentaire |||| %{smart_count} commentaires"
       answers =
         ["%{smart_count} commentaire"] * 2 +
         ["%{smart_count} commentaires"] * 24
@@ -36,7 +36,7 @@ describe Air18n::SmartCount do
     end
 
     it "should work in Russian" do
-      review_text = "%{smart_count} ends-in-one-except-eleven; %{smart_count} ends-in-two-through-four-except-twelve-through-fourteen; %{smart_count} everything-else"
+      review_text = "%{smart_count} ends-in-one-except-eleven |||| %{smart_count} ends-in-two-through-four-except-twelve-through-fourteen |||| %{smart_count} everything-else"
       answers =
         ["%{smart_count} everything-else"] * 1 +
         ["%{smart_count} ends-in-one-except-eleven"] * 1 +
@@ -49,7 +49,7 @@ describe Air18n::SmartCount do
     end
 
     it "should work in Czech" do
-      review_text = "%{smart_count} one; %{smart_count} two-through-four; %{smart_count} everything-else"
+      review_text = "%{smart_count} one |||| %{smart_count} two-through-four |||| %{smart_count} everything-else"
       answers =
         ["%{smart_count} everything-else"] * 1 +
         ["%{smart_count} one"] * 1 +
@@ -59,7 +59,7 @@ describe Air18n::SmartCount do
     end
 
     it "should work in Polish" do
-      review_text = "%{smart_count} one; %{smart_count} ends-in-two-through-four-except-twelve-through-fourteen; %{smart_count} everything-else"
+      review_text = "%{smart_count} one |||| %{smart_count} ends-in-two-through-four-except-twelve-through-fourteen |||| %{smart_count} everything-else"
       answers =
         ["%{smart_count} everything-else"] * 1 +
         ["%{smart_count} one"] * 1 +
@@ -69,13 +69,26 @@ describe Air18n::SmartCount do
         ["%{smart_count} everything-else"] * 1
       test_choose(review_text, :pl, answers)
     end
+
+    it "should work without %{smart_count} being in the phrase" do
+      review_text = "ends-in-one-except-eleven |||| ends-in-two-through-four-except-twelve-through-fourteen |||| everything-else"
+      answers =
+        ["everything-else"] * 1 +
+        ["ends-in-one-except-eleven"] * 1 +
+        ["ends-in-two-through-four-except-twelve-through-fourteen"] * 3 +
+        ["everything-else"] * 16 +
+        ["ends-in-one-except-eleven"] * 1 +
+        ["ends-in-two-through-four-except-twelve-through-fourteen"] * 3 +
+        ["everything-else"] * 1
+      test_choose(review_text, :ru, answers)
+    end
   end
 
   describe "degenerate choose" do
     it "should work if too few translated forms are given" do
       # One of the three Russian forms, the "everything else" form, is missing.
       # The fallback should be the first form, "ends in one except eleven".
-      review_text = "%{smart_count} ends-in-one-except-eleven; %{smart_count} ends-in-two-through-four-except-twelve-through-fourteen"
+      review_text = "%{smart_count} ends-in-one-except-eleven |||| %{smart_count} ends-in-two-through-four-except-twelve-through-fourteen"
       answers =
         ["%{smart_count} ends-in-one-except-eleven"] * 1 +
         ["%{smart_count} ends-in-one-except-eleven"] * 1 +
@@ -88,8 +101,8 @@ describe Air18n::SmartCount do
     end
 
     it "should work with nil count" do
-      review_text = "%{smart_count} ends-in-one-except-eleven; %{smart_count} ends-in-two-through-four-except-twelve-through-fourteen"
-      Air18n::SmartCount::choose(review_text, :ru, nil).should == "%{smart_count} ends-in-one-except-eleven"
+      review_text = "%{smart_count} ends-in-one-except-eleven |||| %{smart_count} ends-in-two-through-four-except-twelve-through-fourteen"
+      Air18n::SmartCount::choose(review_text, :ru, nil).should == "%{smart_count} ends-in-one-except-eleven |||| %{smart_count} ends-in-two-through-four-except-twelve-through-fourteen"
     end
 
     it "should work with nil text" do
@@ -100,8 +113,8 @@ describe Air18n::SmartCount do
   describe 'hint' do
     it 'should work' do
       Air18n::SmartCount::hint('hi there', :pl).should be_nil
-      Air18n::SmartCount::hint('%{smart_count} reviews', :pl).should ==
-        "Must specify 3 forms separated by \";\": \"When count is 1; When count ends in 2-4, excluding 12-14 (2, 3, 4, 22, ...); Everything else (0, 5, 6, ...)\""
+      Air18n::SmartCount::hint('%{smart_count} review||||%{smart_count} reviews', :pl).should ==
+        "Must specify 3 forms separated by \"||||\": \"When count is 1 |||| When count ends in 2-4, excluding 12-14 (2, 3, 4, 22, ...) |||| Everything else (0, 5, 6, ...)\""
       Air18n::SmartCount::hint('%{smart_count} reviews', :ja).should be_nil
     end
   end
@@ -134,13 +147,25 @@ describe Air18n::SmartCount do
 
   describe "valid?" do
     it 'should work' do
-      Air18n::SmartCount::valid?('%{smart_count} レビュー', :ja).should == { :valid => true }
-      Air18n::SmartCount::valid?('%{smart_count} commentaire; %{smart_count} commentaires', :fr).should == { :valid => true }
-      Air18n::SmartCount::valid?('%{smart_count} ends-in-one-except-eleven; %{smart_count} ends-in-two-through-four-except-twelve-through-fourteen; %{smart_count} everything-else', :pl).should == { :valid => true }
-
-      Air18n::SmartCount::valid?('%{smart_count} a; %{smart_count} b; %{smart_count} c', :fr).should == {
+      Air18n::SmartCount::valid?(
+        '%{smart_count} review |||| %{smart_count} reviews',
+        '%{smart_count} レビュー',
+        :en, :ja).should == { :valid => true }
+      Air18n::SmartCount::valid?(
+        '%{smart_count} review |||| %{smart_count} reviews',
+        '%{smart_count} commentaire |||| %{smart_count} commentaires',
+        :en, :fr).should == { :valid => true }
+      Air18n::SmartCount::valid?(
+        '%{smart_count} review |||| %{smart_count} reviews',
+        '%{smart_count} ends-in-one-except-eleven |||| %{smart_count} ends-in-two-through-four-except-twelve-through-fourteen |||| %{smart_count} everything-else',
+        :en, :pl).should == { :valid => true }
+
+      Air18n::SmartCount::valid?(
+        '%{smart_count} a |||| %{smart_count} b',
+        '%{smart_count} a |||| %{smart_count} b |||| %{smart_count} c',
+        :en, :fr).should == {
         :valid => false,
-        :reason => "Must specify 2 forms separated by \";\" (3 were specified)"
+        :reason => "Must specify 2 forms separated by \"||||\" (3 were specified)"
       }
     end
   end

data/spec/lib/air18n/xss_detector_spec.rb

@@ -45,14 +45,14 @@ describe Air18n::XssDetector do
 
     it "should work with smart count with one plural form" do
       Air18n::XssDetector::safe?(
-        "<span class='count'>%{smart_count}</span> <span class='text'>review</span>;<span class='count'>%{smart_count}</span> <span class='text'>reviews</span>",
+        "<span class='count'>%{smart_count}</span> <span class='text'>review</span> |||| <span class='count'>%{smart_count}</span> <span class='text'>reviews</span>",
         "<span class='text'>レビュー</span> <span class='count'>%{smart_count}</span>",
         :en, :ja
       ).should == { :safe => true }
 
       # "spank" instead of "span" in the last tag.
       Air18n::XssDetector::safe?(
-        "<span class='count'>%{smart_count}</span> <span class='text'>review</span>;<span class='count'>%{smart_count}</span> <span class='text'>reviews</span>",
+        "<span class='count'>%{smart_count}</span> <span class='text'>review</span> |||| <span class='count'>%{smart_count}</span> <span class='text'>reviews</span>",
         "<span class='text'>レビュー</span> <span class='count'>%{smart_count}</spank>",
         :en, :ja
       ).should == { :safe => false, :reason => "HTML tags don't match: [\"<span class='count'>\", \"</span>\", \"</span>\", \"<span class='text'>\"] vs. [\"<span class='text'>\", \"</span>\", \"<span class='count'>\", \"</spank>\"]" }
@@ -60,22 +60,22 @@ describe Air18n::XssDetector do
 
     it "should work with smart count with two plural forms" do
       Air18n::XssDetector::safe?(
-        "<span class='count'>%{smart_count}</span> <span class='text'>review</span>;<span class='count'>%{smart_count}</span> <span class='text'>reviews</span>",
-        "<span class='text'>commentaire</span> <span class='count'>%{smart_count}</span>;<span class='text'>commentaires</span> <span class='count'>%{smart_count}</span>",
+        "<span class='count'>%{smart_count}</span> <span class='text'>review</span> |||| <span class='count'>%{smart_count}</span> <span class='text'>reviews</span>",
+        "<span class='text'>commentaire</span> <span class='count'>%{smart_count}</span> |||| <span class='text'>commentaires</span> <span class='count'>%{smart_count}</span>",
         :en, :fr
       ).should == { :safe => true }
 
       # Second form not styled.
       Air18n::LoggingHelper.info "GRRRRR"
       Air18n::XssDetector::safe?(
-        "<span class='count'>%{smart_count}</span> <span class='text'>review</span>;<span class='count'>%{smart_count}</span> <span class='text'>reviews</span>",
-        "<span class='text'>commentaire</span> <span class='count'>%{smart_count}</span>;commentaires %{smart_count}",
+        "<span class='count'>%{smart_count}</span> <span class='text'>review</span> |||| <span class='count'>%{smart_count}</span> <span class='text'>reviews</span>",
+        "<span class='text'>commentaire</span> <span class='count'>%{smart_count}</span> |||| commentaires %{smart_count}",
         :en, :fr
       ).should == { :safe => false, :reason => "HTML tags don't match: [\"<span class='count'>\", \"</span>\", \"</span>\", \"<span class='text'>\"] vs. [\"</span>\"]" }
 
       # Only one form being given leads to the same error.
       Air18n::XssDetector::safe?(
-        "<span class='count'>%{smart_count}</span> <span class='text'>review</span>;<span class='count'>%{smart_count}</span> <span class='text'>reviews</span>",
+        "<span class='count'>%{smart_count}</span> <span class='text'>review</span> |||| <span class='count'>%{smart_count}</span> <span class='text'>reviews</span>",
         "<span class='text'>commentaire</span> <span class='count'>%{smart_count}</span>",
         :en, :fr
       ).should == { :safe => false, :reason => "HTML tags don't match: [\"<span class='count'>\", \"</span>\", \"</span>\", \"<span class='text'>\"] vs. [\"</span>\"]" }
@@ -83,8 +83,8 @@ describe Air18n::XssDetector do
 
     it "should work with smart count with three plural forms" do
       Air18n::XssDetector::safe?(
-        "<span class='count'>%{smart_count}</span> <span class='text'>review</span>;<span class='count'>%{smart_count}</span> <span class='text'>reviews</span>",
-        "<span class='text'>ends-in-one-except-eleven</span> <span class='count'>%{smart_count}</span>;<span class='text'>ends-in-two-through-four-except-twelve-through-fourteen</span> <span class='count'>%{smart_count}</span>;<span class='text'>everything-else</span> <span class='count'>%{smart_count}</span>",
+        "<span class='count'>%{smart_count}</span> <span class='text'>review</span> |||| <span class='count'>%{smart_count}</span> <span class='text'>reviews</span>",
+        "<span class='text'>ends-in-one-except-eleven</span> <span class='count'>%{smart_count}</span> |||| <span class='text'>ends-in-two-through-four-except-twelve-through-fourteen</span> <span class='count'>%{smart_count}</span> |||| <span class='text'>everything-else</span> <span class='count'>%{smart_count}</span>",
         :en, :ru
       ).should == { :safe => true }
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: air18n
 version: !ruby/object:Gem::Version
-  version: 0.1.18
+  version: 0.1.19
   prerelease: 
 platform: ruby
 authors: