ymdp 1.3.1 → 1.3.2

data/.rvmrc

@@ -1 +1 @@
-rvm ree@gem_ymdp
+rvm ree-1.8.7-2011.03@natural_time

data/VERSION

@@ -1 +1 @@
-1.3.1
+1.3.2

data/lib/ymdp/javascripts/jquery/i18n.js

@@ -55,23 +55,16 @@ I18n.translate_element = function(element) {
 // the returned translated string
 //
 I18n.translate = function(key, args) {
-  Debug.log("I18n.translate", key, args);
-
 	key = key.toUpperCase();
 	key = key.replace(" ", "_");
-
-  Debug.log("key", key);
   
 	if (args) {
 		var m;
 		m = I18n.translate_sentence(key, args);
-    Debug.log("args existed");
 	} else
 	{
 		m = I18n.translate_phrase(key);
-    Debug.log("no args");
 	}
-  Debug.log("Here is m", m);
 	return m;
 };
 I18n.t = I18n.translate;

data/lib/ymdp/javascripts/jquery/user.js.coffee

@@ -65,7 +65,7 @@ window.User =
   #
   confirm: ->
     Debug.log("User.confirm")
-    OIB.get "ymdp/signin", 
+    OIB.get "ymdp/signin",
       "ymail_guid": YMDP.guid
     , User.confirmation
 
@@ -74,7 +74,7 @@ window.User =
   confirmation: (response) ->
     Debug.log("inside ymdp/signin callback", response)
   
-    if response.ymail_wssid      
+    if response.ymail_wssid
       Debug.log("YMDP.response wasn't false", response.ymail_wssid)
       User.storeYmailWssid(response.ymail_wssid)
 
@@ -89,11 +89,11 @@ window.User =
 
   # Store ymail_wssid in permanent store.
   #
-  storeYmailWssid: (ymail_wssid) -> 
+  storeYmailWssid: (ymail_wssid) ->
     raw_wssid = ymail_wssid || ""
     sliced_wssid = raw_wssid.slice(0, 255)
   
-    data = 
+    data =
       "ymail_wssid": sliced_wssid
   
     Debug.log("About to call Data.store", data)

data/lib/ymdp/view/application_view.rb

@@ -25,7 +25,9 @@ module YMDP
       @translations ||= {}
       
       Dir["./config/locales/**/*.yml"].each do |file|
-        @translations.merge!(YAML.load_file(file))
+        @translations.merge!(YAML.load_file(file)) do |key, old, new|
+          old.merge new
+        end
       end
 
       @translations

data/ymdp.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "ymdp"
-  s.version = "1.3.1"
+  s.version = "1.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Isaac Priestley"]
-  s.date = "2012-06-01"
+  s.date = "2012-07-11"
   s.description = "Framework for developing applications in the Yahoo! Mail Development Platform."
   s.email = "progressions@gmail.com"
   s.extra_rdoc_files = [

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ymdp
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: 
   segments: 
   - 1
   - 3
-  - 1
-  version: 1.3.1
+  - 2
+  version: 1.3.2
 platform: ruby
 authors: 
 - Isaac Priestley
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-01 00:00:00 Z
+date: 2012-07-11 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   type: :runtime