merb_global 0.0.5 → 0.0.5.1

data/Rakefile

@@ -6,7 +6,7 @@ require 'fileutils'
 
 PLUGIN = "merb_global"
 NAME = "merb_global"
-GEM_VERSION = "0.0.5"
+GEM_VERSION = "0.0.5.1"
 AUTHORS = ["Alex Coles", "Maciej Piechotka"]
 EMAIL = "alex@alexcolesportfolio.com"
 HOMEPAGE = "http://trac.ikonoklastik.com/merb_global/"

data/lib/merb_global/message_providers/active_record.rb

@@ -21,7 +21,13 @@ module Merb
               n = Plural.which_form opts[:n], language.plural
               translation = Translation.find [language.id, singular, n]
             else
-              translation = Translation.find [language.id, singular, nil]
+              # Bug of composite_primary_keys?
+              conditions = {
+                :language_id  => language.id,
+                :msgid => singular,
+                :msgstr_index => nil
+              }
+              translation = Translation.find(:first, conditions)
             end
             return translation.msgstr
           end rescue nil

data/lib/merb_global/message_providers/yaml.rb

@@ -17,18 +17,24 @@ module Merb
         end
 
         def localize(singular, plural, opts)
-          unless @lang.include? opts[:lang]
+          unless Merb.environment == "development"
+            lang = @lang
+          else
+            lang = {}
+          end
+          
+          unless lang.include? opts[:lang]
             file = File.join Merb::Global::MessageProviders.localedir,
                              opts[:lang] + '.yaml'
             if File.exist? file
-              @lang[opts[:lang]] = YAML.load_file file
+              lang[opts[:lang]] = YAML.load_file file
             else
-              @lang[opts[:lang]] = nil
+              lang[opts[:lang]] = nil
             end
           end
 
-          unless @lang[opts[:lang]].nil?
-            lang = @lang[opts[:lang]]
+          unless lang[opts[:lang]].nil?
+            lang = lang[opts[:lang]]
             unless lang[singular].nil?
               unless plural.nil?
                 n = Merb::Global::Plural.which_form opts[:n], lang[:plural]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb_global
 version: !ruby/object:Gem::Version 
-  version: 0.0.5
+  version: 0.0.5.1
 platform: ruby
 authors: 
 - Alex Coles
@@ -10,7 +10,7 @@ autorequire: merb_global
 bindir: bin
 cert_chain: []
 
-date: 2008-07-29 00:00:00 +02:00
+date: 2008-08-21 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency