fast_gettext 0.6.9 → 0.6.10

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fast_gettext (0.6.9)
+    fast_gettext (0.6.10)
 
 GEM
   remote: http://rubygems.org/

data/lib/fast_gettext/translation_repository/db_models/translation_key.rb

@@ -8,8 +8,10 @@ class TranslationKey < ActiveRecord::Base
 
   attr_accessible :key, :translations, :translations_attributes
 
+  before_save :normalize_newlines
+
   def self.translation(key, locale)
-    return unless translation_key = find_by_key(key)
+    return unless translation_key = find_by_key(newline_normalize(key))
     return unless translation_text = translation_key.translations.find_by_locale(locale)
     translation_text.text
   end
@@ -17,4 +19,14 @@ class TranslationKey < ActiveRecord::Base
   def self.available_locales
     @@available_locales ||= TranslationText.count(:group=>:locale).keys.sort
   end
+
+  protected
+
+  def self.newline_normalize(s)
+    s.to_s.gsub("\r\n", "\n")
+  end
+
+  def normalize_newlines
+    self.key = self.class.newline_normalize(key)
+  end
 end

data/lib/fast_gettext/version.rb

@@ -1,3 +1,3 @@
 module FastGettext
-  VERSION = Version = '0.6.9'
+  VERSION = Version = '0.6.10'
 end

data/spec/fast_gettext/po_file_spec.rb

@@ -14,7 +14,7 @@ describe FastGettext::PoFile do
   end
 
   it "stores untranslated values as nil" do
-    de['Car|Model'].should == "Modell"
+    de['Untranslated'].should == nil
   end
 
   it "finds pluralized values" do

data/spec/fast_gettext/translation_repository/db_spec.rb

@@ -70,6 +70,11 @@ describe FastGettext::TranslationRepository::Db do
     @rep.plural('Axis','Axis').should == ['Achse','Achsen']
   end
 
+  it "can ignore newline format" do
+    create_translation "good\r\nmorning", "guten\r\nMorgen"
+    @rep["good\nmorning"].should == "guten\r\nMorgen"
+  end
+
   it "removes texts when key is removed" do
     t = create_translation("a", "b")
     expect{

data/spec/fast_gettext/translation_spec.rb

@@ -27,6 +27,14 @@ describe FastGettext::Translation do
       _('car').should == 'Auto'
     end
 
+    it "returns the original string if its translation is blank" do
+      _('Untranslated').should == 'Untranslated'
+    end
+
+    it "does not return the blank translation if a string's translation is blank" do
+      _('Untranslated').should_not == ''
+    end
+
     it "returns key if not translation was found" do
       _('NOT|FOUND').should == 'NOT|FOUND'
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fast_gettext
 version: !ruby/object:Gem::Version
-  version: 0.6.9
+  version: 0.6.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-31 00:00:00.000000000 Z
+date: 2012-09-18 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: michael@grosser.it
@@ -111,7 +111,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4402652659877715881
+      hash: -1278908847002659361
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -120,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4402652659877715881
+      hash: -1278908847002659361
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24