diff --git a/config/assets.yml b/config/assets.yml
index 5f122ba6f..184cf2e8f 100644
--- a/config/assets.yml
+++ b/config/assets.yml
@@ -16,9 +16,9 @@ javascripts:
     - public/javascripts/vendor/fileuploader.js
     - public/javascripts/vendor/Mustache.js
     - public/javascripts/diaspora.js
+    - public/javascripts/widgets/i18n.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
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index 6c378144e..967ee416d 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -499,4 +499,8 @@ en:
       next: "Next"
       previous: "Previous"
   javascripts:
-    confirm_dialog: "Are you sure?"
+      confirm_dialog: "Are you sure?"
+      videos:
+          watch: "Watch this video on {{provider}}"
+          unknown: "Unknown video type"
+
diff --git a/public/javascripts/widgets/embedder.js b/public/javascripts/widgets/embedder.js
index 44dc1d1b7..81ab4d93d 100644
--- a/public/javascripts/widgets/embedder.js
+++ b/public/javascripts/widgets/embedder.js
@@ -56,15 +56,17 @@
   };
 
   Embedder.prototype.registerServices = function() {
+    var watchVideoOn = Diaspora.widgets.i18n.t("videos.watch");
+    console.log(watchVideoOn);
     this.register("youtube.com",
-        '<a href="//www.youtube.com/watch?v={{video-id}}" target="_blank">Watch this video on Youtube</a><br />' +
+        '<a href="//www.youtube.com/watch?v={{video-id}}" target="_blank">' + $.mustache(watchVideoOn, { provider: "YouTube" }) + 'Youtube</a><br />' +
         '<iframe class="youtube-player" type="text/html" src="http://www.youtube.com/embed/{{video-id}}"></iframe>');
 
     this.register("vimeo.com",
-      '<a href="http://vimeo.com/{{video-id}}">Watch this video on Vimeo</a><br />' +
+      '<a href="http://vimeo.com/{{video-id}}">' + $.mustache(watchVideoOn, { provider: "Vimeo" }) + '</a><br />' +
       '<iframe class="vimeo-player" src="http://player.vimeo.com/video/{{video-id}}"></iframe>');
 
-    this.register("undefined", '<p>Unknown video type - {{host}}</p>');
+    this.register("undefined", '<p>' + Diaspora.widgets.i18n.t("videos.unknown") + ' - {{host}}</p>');
   };
 
   Embedder.prototype.onVideoLinkClicked = function(evt) {
diff --git a/public/javascripts/widgets/i18n.js b/public/javascripts/widgets/i18n.js
index bb07a1af3..ade4fccba 100644
--- a/public/javascripts/widgets/i18n.js
+++ b/public/javascripts/widgets/i18n.js
@@ -27,6 +27,10 @@ Diaspora.widgets.add("i18n", function() {
       }
     }
 
-    return $.mustache(ret, views || {});
+    if(typeof views === "object") {
+      return $.mustache(ret, views || {});
+    }
+    
+    return ret;
   };
 });
\ No newline at end of file