--- a/client/js/wikipedia-bin.js	Thu Aug 30 18:11:25 2012 +0200
+++ b/client/js/wikipedia-bin.js	Mon Sep 03 17:21:35 2012 +0200
@@ -1,16 +1,52 @@
-Rkns.Bins.Wikipedia = Rkns.Utils.inherit(Rkns.Bins._Base);
+Rkns.Wikipedia = {
+    i18n: {
+        en: {
+            wiki_fr: "French Wikipedia",
+            wiki_en: "English Wikipedia",
+            wiki_ja: "Japanese Wikipedia",
+            wiki_: "Wikipedia (Other Language)"
+        }
+    }
+}
+
+Rkns.Wikipedia.Search = function(_renkan, _opts) {
+    this.renkan = _renkan;
+    this.lang = _opts.lang || "en";
+}
 
-Rkns.Bins.Wikipedia.prototype.resultTemplate = Rkns._.template(
+Rkns.Wikipedia.Search.prototype.getBgClass = function() {
+    return "Rk-Wikipedia-Search-Icon Rk-Wikipedia-Lang-" + this.lang;
+}
+
+Rkns.Wikipedia.Search.prototype.getSearchTitle = function() {
+    var _lang = Rkns.Wikipedia.i18n[this.renkan.lang] || Rkns.Wikipedia.i18n['en'];
+    return ( _lang["wiki_" + this.lang] || _lang.wiki_) ;
+}
+
+Rkns.Wikipedia.Search.prototype.search = function(_q) {
+    this.renkan.tabs.push(
+        new Rkns.Wikipedia.Bin(this.renkan, {
+            lang: this.lang,
+            search: _q
+        })
+    );
+}
+
+Rkns.Wikipedia.Bin = Rkns.Utils.inherit(Rkns._BaseBin);
+
+Rkns.Wikipedia.Bin.prototype.resultTemplate = Rkns._.template(
     '<li class="Rk-Wikipedia-Result Rk-Bin-Item" data-uri="<%=wpurl%>" '
     + 'data-title="Wikipedia: <%=result.title%>" data-description="<%=wpdesc%>">'
     + '<div class="Rk-Wikipedia-Icon"></div><h4 class="Rk-Wikipedia-Title"><a href="<%=wpurl%>" target="_blank"><%=highlightedtitle%></a></h4>'
     + '<p class="Rk-Wikipedia-Snippet"><%=result.snippet%></p></li>'
 );
 
-Rkns.Bins.Wikipedia.prototype._init = function(_renkan, _opts) {
+Rkns.Wikipedia.Bin.prototype._init = function(_renkan, _opts) {
     this.search = _opts.search;
     this.lang = _opts.lang || "en";
-    this.title_$.html(_opts.title + ': "' + this.search + '"');
+    var _lang = Rkns.Wikipedia.i18n[this.renkan.lang] || Rkns.Wikipedia.i18n['en'];
+    this.title_icon_$.addClass('Rk-Wikipedia-Title-Icon Rk-Wikipedia-Lang-' + this.lang);
+    this.title_$.html(this.search).addClass("Rk-Wikipedia-Title");
     var _this = this;
     Rkns.$.getJSON(
         "http://" + _this.lang + ".wikipedia.org/w/api.php?action=query&list=search&srsearch=" + encodeURIComponent(this.search) + "&format=json&callback=?",