diff options
| author | David Cabo <david@calibea.com> | 2011-10-13 00:29:51 +0200 |
|---|---|---|
| committer | David Cabo <david@calibea.com> | 2011-10-13 00:29:51 +0200 |
| commit | c8983b923e4dc7db9ba22156daaddd94d2b5ed4d (patch) | |
| tree | 7741c3655fe5e3cbc90dd20a4626ac7acc1bf6b0 /vendor/gems/fast_gettext-0.5.10 | |
| parent | a29b3aaf0ae77af49d38813b62dddcb6889c1ebe (diff) | |
| parent | e13127a8ebc8bf8379d92f778af5a2bb6931d80c (diff) | |
Merge branch 'release/0.4'0.4
Diffstat (limited to 'vendor/gems/fast_gettext-0.5.10')
| -rw-r--r-- | vendor/gems/fast_gettext-0.5.10/.specification | 4 | ||||
| -rw-r--r-- | vendor/gems/fast_gettext-0.5.10/lib/fast_gettext/mo_file.rb | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/vendor/gems/fast_gettext-0.5.10/.specification b/vendor/gems/fast_gettext-0.5.10/.specification index 7e1bcf3dc..7e241fff7 100644 --- a/vendor/gems/fast_gettext-0.5.10/.specification +++ b/vendor/gems/fast_gettext-0.5.10/.specification @@ -2,7 +2,7 @@ name: fast_gettext version: !ruby/object:Gem::Version hash: 31 - prerelease: false + prerelease: segments: - 0 - 5 @@ -127,7 +127,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement requirements: [] rubyforge_project: -rubygems_version: 1.3.7 +rubygems_version: 1.4.2 signing_key: specification_version: 3 summary: A simple, fast and threadsafe implementation of GetText 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 |