From ba18520845605b66c82f88c0e56bf91d319c5be5 Mon Sep 17 00:00:00 2001
From: SaintPeter <rex.schrader@gmail.com>
Date: Tue, 9 Feb 2016 20:57:23 -0800
Subject: [PATCH] Add language detection

---
 client/less/wiki.less                | 5 ++---
 client/main.js                       | 5 ++++-
 common/app/components/Nav/links.json | 2 +-
 server/boot/t-wiki.js                | 1 +
 server/middlewares/csp.js            | 3 +--
 server/views/partials/navbar.jade    | 2 +-
 server/views/wiki/show.jade          | 6 +++++-
 7 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/client/less/wiki.less b/client/less/wiki.less
index 8b41835b5e..ece133a848 100644
--- a/client/less/wiki.less
+++ b/client/less/wiki.less
@@ -6,7 +6,8 @@
 #wikiFrame {
     width: 100%;
     height: 100%;
-    top: 0;
+    padding-top: 30px;
+    top:0;
     bottom: 0;
     position: absolute;
     overflow: hidden;
@@ -129,8 +130,6 @@
     border-color: darkgreen;
 }
 
-wiki
-
 .wiki-aside-action-item {
     display: flex;
     /* main axis */
diff --git a/client/main.js b/client/main.js
index d557ac9a49..480213bbab 100644
--- a/client/main.js
+++ b/client/main.js
@@ -382,8 +382,11 @@ $(document).ready(function() {
 
   function showWiki() {
     if (!main.isWikiAsideLoad) {
+      var lang = window.location.toString().match(/\/\w{2}\//);
+      lang = (lang) ? lang[0] : '/en/';
+      var wikiURL = 'http://freecodecamp.github.io/wiki' + lang;
       var wikiAside = $('<iframe>');
-      wikiAside.attr('src', 'http://freecodecamp.github.io/wiki'); /*  <-----------------------------------------  here */
+      wikiAside.attr('src', wikiURL);
       $('.wiki-aside').append(wikiAside);
       main.isWikiAsideLoad = true;
     }
diff --git a/common/app/components/Nav/links.json b/common/app/components/Nav/links.json
index 63589fe55c..a82774ab68 100644
--- a/common/app/components/Nav/links.json
+++ b/common/app/components/Nav/links.json
@@ -11,7 +11,7 @@
   "target": "_blank"
 },{
   "content": "Wiki",
-  "link": "https://github.com/freecodecamp/freecodecamp/wiki/",
+  "link": "/wiki",
   "target": "_blank"
 },{
   "content": "Jobs",
diff --git a/server/boot/t-wiki.js b/server/boot/t-wiki.js
index a4036ef975..254ee4b619 100644
--- a/server/boot/t-wiki.js
+++ b/server/boot/t-wiki.js
@@ -1,5 +1,6 @@
 module.exports = function(app) {
   var router = app.loopback.Router();
+  router.get('/wiki/*', showWiki);
   router.get('/wiki', showWiki);
 
   app.use(router);
diff --git a/server/middlewares/csp.js b/server/middlewares/csp.js
index e5ee754684..36829f2f14 100644
--- a/server/middlewares/csp.js
+++ b/server/middlewares/csp.js
@@ -66,8 +66,7 @@ export default function csp() {
         '*.twitter.com',
         '*.ghbtns.com',
         '*.freecatphotoapp.com',
-        'freecodecamp.github.io',
-        'localhost:8000'        
+        'freecodecamp.github.io'        
       ].concat(trusted)
     },
     // set to true if you only want to report errors
diff --git a/server/views/partials/navbar.jade b/server/views/partials/navbar.jade
index 78fd43ee65..17b31d242a 100644
--- a/server/views/partials/navbar.jade
+++ b/server/views/partials/navbar.jade
@@ -20,7 +20,7 @@ nav.navbar.navbar-default.navbar-fixed-top.nav-height
             li.hidden-xs
                 a#nav-wiki-btn(href='#' onclick='return false') Wiki
             li.visible-xs
-                a(href='//github.com/FreeCodeCamp/freecodecamp/wiki/Home', target='_blank') Wiki
+                a(href='/wiki', target='_blank') Wiki
             li
                 a(href='/jobs') Jobs
             li
diff --git a/server/views/wiki/show.jade b/server/views/wiki/show.jade
index c81fdc36a6..334c2f424c 100644
--- a/server/views/wiki/show.jade
+++ b/server/views/wiki/show.jade
@@ -1,3 +1,7 @@
 extends ../layout-wide
 block content
-            iframe#wikiFrame(frameborder='no', src='http://freecodecamp.github.io/wiki')
\ No newline at end of file
+    iframe#wikiFrame(frameborder='no')
+    script.
+        var lang = window.location.toString().match(/\/\w{2}\//);
+        lang = (lang) ? lang[0] : '/en/';
+        $('#wikiFrame').attr('src','http://freecodecamp.github.io/wiki' + lang);