lib/i18n/backend/gettext.rb in i18n-0.6.0 vs lib/i18n/backend/gettext.rb in i18n-0.6.1

@@ -38,10 +38,11 @@
         end
 
         def normalize(locale, data)
           data.inject({}) do |result, (key, value)|
             unless key.nil? || key.empty?
+              key = key.gsub(I18n::Gettext::CONTEXT_SEPARATOR, '|')
               key, value = normalize_pluralization(locale, key, value) if key.index("\000")
 
               parts = key.split('|').reverse
               normalized = parts.inject({}) do |_normalized, part|
                 { part => _normalized.empty? ? value : _normalized }
@@ -57,10 +58,10 @@
           # FIXME po_parser includes \000 chars that can not be turned into Symbols
           key = key.gsub("\000", I18n::Gettext::PLURAL_SEPARATOR).split(I18n::Gettext::PLURAL_SEPARATOR).first
 
           keys = I18n::Gettext.plural_keys(locale)
           values = value.split("\000")
-          raise "invalid number of plurals: #{values.size}, keys: #{keys.inspect}" if values.size != keys.size
+          raise "invalid number of plurals: #{values.size}, keys: #{keys.inspect} on #{locale} locale for msgid #{key.inspect} with values #{values.inspect}" if values.size != keys.size
 
           result = {}
           values.each_with_index { |_value, ix| result[keys[ix]] = _value }
           [key, result]
         end