From 4b1b7591a60ae571bd0f5258796e0aecf292b424 Mon Sep 17 00:00:00 2001
From: Dan Hansen <mokker1234@gmail.com>
Date: Sat, 29 Jan 2011 16:07:12 -0600
Subject: [PATCH] load diaspora.js and widgets right after vendor/*, return
 empty string if the value is not found

---
 config/assets.yml                  | 13 +++++++------
 public/javascripts/widgets/i18n.js |  3 +++
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/config/assets.yml b/config/assets.yml
index f3d936bda..7dae56a14 100644
--- a/config/assets.yml
+++ b/config/assets.yml
@@ -15,27 +15,28 @@ javascripts:
     - public/javascripts/vendor/timeago.js
     - public/javascripts/vendor/fileuploader.js
     - public/javascripts/vendor/Mustache.js
-    - public/javascripts/view.js
-    - public/javascripts/stream.js
-    - public/javascripts/application.js
+
     - public/javascripts/diaspora.js
     - public/javascripts/widgets/alert.js
     - public/javascripts/widgets/embedder.js
     - public/javascripts/widgets/i18n.js
     - public/javascripts/widgets/timeago.js
+    - public/javascripts/view.js
+    - public/javascripts/stream.js
+    - public/javascripts/application.js
   mobile:
     - public/javascripts/vendor/jquery144.min.js
     - public/javascripts/custom-mobile-scripting.js
     - public/javascripts/vendor/jquery-ui-1.8.6.custom.min.js
     - public/javascripts/vendor/jquery_mobile_a2.min.js
     - public/javascripts/vendor/jquery.infinitescroll.min.js
-    - public/javascripts/vendor/timeago.js
-    - public/javascripts/mobile.js
-    - public/javascripts/application.js
+- public/javascripts/vendor/timeago.js
     - public/javascripts/diaspora.js
     - public/javascripts/widgets/alert.js
     - public/javascripts/widgets/i18n.js
     - public/javascripts/widgets/timeago.js
+    - public/javascripts/mobile.js
+    - public/javascripts/application.js
   mailchimp:
     - public/javascripts/vendor/mailchimp/jquery.form.js
     - public/javascripts/vendor/mailchimp/jquery.validate.js
diff --git a/public/javascripts/widgets/i18n.js b/public/javascripts/widgets/i18n.js
index 8914c8bca..bb07a1af3 100644
--- a/public/javascripts/widgets/i18n.js
+++ b/public/javascripts/widgets/i18n.js
@@ -22,6 +22,9 @@ Diaspora.widgets.add("i18n", function() {
     
     while(part = _item.shift()) {
       ret = (ret) ? ret[part] : this.locale[part];
+      if(typeof ret === "undefined") {
+        return "";
+      }
     }
 
     return $.mustache(ret, views || {});