diff options
| author | David Cabo <david@calibea.com> | 2011-10-13 00:31:56 +0200 |
|---|---|---|
| committer | David Cabo <david@calibea.com> | 2011-10-13 00:31:56 +0200 |
| commit | 6b19c36f114624d7e53be8edc9ee490ecd20d0b0 (patch) | |
| tree | 7741c3655fe5e3cbc90dd20a4626ac7acc1bf6b0 /vendor | |
| parent | 6800b9ff3fc77aa441afbdb0b0196afbdd87d8b4 (diff) | |
| parent | e13127a8ebc8bf8379d92f778af5a2bb6931d80c (diff) | |
Merge branch 'release/0.4' into develop
Diffstat (limited to 'vendor')
| -rw-r--r-- | vendor/gems/fast_gettext-0.5.10/lib/fast_gettext/mo_file.rb | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/vendor/gems/fast_gettext-0.5.10/lib/fast_gettext/mo_file.rb b/vendor/gems/fast_gettext-0.5.10/lib/fast_gettext/mo_file.rb index a6508b05d..3829e511b 100644 --- a/vendor/gems/fast_gettext-0.5.10/lib/fast_gettext/mo_file.rb +++ b/vendor/gems/fast_gettext-0.5.10/lib/fast_gettext/mo_file.rb @@ -22,8 +22,12 @@ module FastGettext #returns the plural forms or all singular translations that where found def plural(*msgids) translations = plural_translations(msgids) - return translations unless translations.empty? - msgids.map{|msgid| self[msgid] || msgid} #try to translate each id + return translations + # XXX: 20111004 - Temporary patch for release/0.4 until we upgrade the fast_gettext gem + # to 0.60. The code used to say 'unless translations.empty?', but that's wrong: + # we must return [] if not found - otherwise chained repositories won't work. + # Also removed: + # msgids.map{|msgid| self[msgid] || msgid} #try to translate each id end def pluralisation_rule |