Updated bundle, added .rvmrc and polished code a bit

.rvmrc

@@ -0,0 +1 @@
+rvm 1.8.7-p299

Gemfile.lock

@@ -1,77 +1,49 @@
---- 
-dependencies: 
-  bson_ext: 
-    group: 
-    - :default
-    version: ">= 0"
-  rspec: 
-    group: 
-    - :default
-    version: ">= 2.0.0.beta.8"
-  mocha: 
-    group: 
-    - :default
-    version: ">= 0"
-  bundler: 
-    group: 
-    - :default
-    version: ">= 0"
-  jeweler: 
-    group: 
-    - :default
-    version: ">= 0"
-  mongoid: 
-    group: 
-    - :default
-    version: ">= 2.0.0.beta.9"
-specs: 
-- rake: 
-    version: 0.8.7
-- activesupport: 
-    version: 3.0.0.rc2
-- builder: 
-    version: 2.1.2
-- i18n: 
-    version: 0.4.1
-- activemodel: 
-    version: 3.0.0.rc2
-- bson: 
-    version: 1.0.7
-- bson_ext: 
-    version: 1.0.7
-- bundler: 
-    version: 0.9.26
-- diff-lcs: 
-    version: 1.1.2
-- gemcutter: 
-    version: 0.6.1
-- git: 
-    version: 1.2.5
-- json_pure: 
-    version: 1.4.6
-- rubyforge: 
-    version: 2.0.4
-- jeweler: 
-    version: 1.4.0
-- mocha: 
-    version: 0.9.8
-- mongo: 
-    version: 1.0.8
-- tzinfo: 
-    version: 0.3.23
-- will_paginate: 
-    version: 3.0.pre2
-- mongoid: 
-    version: 2.0.0.beta7
-- rspec-core: 
-    version: 2.0.0.beta.20
-- rspec-expectations: 
-    version: 2.0.0.beta.20
-- rspec-mocks: 
-    version: 2.0.0.beta.20
-- rspec: 
-    version: 2.0.0.beta.20
-hash: 6dfab5e2b924a3176f60464404e1350aed0df898
-sources: 
-- Rubygems: 
-    uri: http://gemcutter.org
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activemodel (3.0.3)
+      activesupport (= 3.0.3)
+      builder (~> 2.1.2)
+      i18n (~> 0.4)
+    activesupport (3.0.3)
+    bson (1.1.2)
+    bson_ext (1.1.2)
+    builder (2.1.2)
+    diff-lcs (1.1.2)
+    git (1.2.5)
+    i18n (0.4.2)
+    jeweler (1.5.1)
+      bundler (~> 1.0.0)
+      git (>= 1.2.5)
+      rake
+    mocha (0.9.9)
+      rake
+    mongo (1.1.2)
+      bson (>= 1.1.1)
+    mongoid (2.0.0.beta.20)
+      activemodel (~> 3.0)
+      mongo (~> 1.1)
+      tzinfo (~> 0.3.22)
+      will_paginate (~> 3.0.pre)
+    rake (0.8.7)
+    rspec (2.1.0)
+      rspec-core (~> 2.1.0)
+      rspec-expectations (~> 2.1.0)
+      rspec-mocks (~> 2.1.0)
+    rspec-core (2.1.0)
+    rspec-expectations (2.1.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.1.0)
+    tzinfo (0.3.23)
+    will_paginate (3.0.pre2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bson_ext
+  bundler
+  jeweler
+  mocha
+  mongoid (>= 2.0.0.beta.9)
+  rspec (>= 2.0.0.beta.8)

lib/mongoid/i18n.rb

@@ -20,12 +20,12 @@ def create_accessors(name, meth, options = {})
         if options[:type] == LocalizedField
           define_method(meth) { read_attribute(name)[::I18n.locale.to_s] rescue '' }
           define_method("#{meth}=") do |value|
-            if value.is_a?(Hash)
-              val = (@attributes[name] || {}).merge(value)
+            value = if value.is_a?(Hash)
+              (@attributes[name] || {}).merge(value)
             else
-              val = (@attributes[name] || {}).merge(::I18n.locale.to_s => value)
+              (@attributes[name] || {}).merge(::I18n.locale.to_s => value)
             end
-            write_attribute(name, val)
+            write_attribute(name, value)
           end
           define_method("#{meth}_translations") { read_attribute(name) }
           define_method("#{meth}_translations=") { |value| write_attribute(name, value) }