5 files changed, 32 insertions, 31 deletions

diff --git a/lib/generators/json.js b/lib/generators/json.js
index 446ef0d..37ffa0b 100644
--- a/lib/generators/json.js
+++ b/lib/generators/json.js
@@ -1,11 +1,11 @@
-var util = require("util");
-var path = require("path");
-var Q = require("q");
-var _ = require("lodash");
+var util = require('util');
+var path = require('path');
+var Q = require('q');
+var _ = require('lodash');
 
-var fs = require("../utils/fs");
-var BaseGenerator = require("../generator");
-var links = require("../utils/links");
+var fs = require('../utils/fs');
+var BaseGenerator = require('../generator');
+var links = require('../utils/links');
 
 var Generator = function() {
     BaseGenerator.apply(this, arguments);
@@ -26,7 +26,7 @@ Generator.prototype.convertFile = function(input) {
             sections: page.sections
         };
 
-        var output = links.changeExtension(page.path, ".json");
+        var output = links.changeExtension(page.path, '.json');
         output = path.join(that.options.output, output);
 
         return fs.writeFile(
@@ -51,7 +51,7 @@ Generator.prototype.writeReadme = function() {
         langs = that.book.langs;
         mainLang = langs.length > 0? _.first(langs).lang : null;
 
-        readme = links.changeExtension(that.book.readmeFile, ".json");
+        readme = links.changeExtension(that.book.readmeFile, '.json');
 
         // Read readme from main language
         return fs.readFile(
@@ -67,7 +67,7 @@ Generator.prototype.writeReadme = function() {
 
         // Write it as README.json
         return fs.writeFile(
-            path.join(that.options.output, "README.json"),
+            path.join(that.options.output, 'README.json'),
             JSON.stringify(json, null, 4)
         );
     });
diff --git a/lib/generators/website.js b/lib/generators/website.js
index 18ec65d..ecfd98c 100644
--- a/lib/generators/website.js
+++ b/lib/generators/website.js
@@ -208,6 +208,7 @@ Generator.prototype._writeTemplate = function(tpl, options, output, interpolate)
                 title: that.options.title,
                 description: that.options.description,
                 language: that.book.config.normalizeLanguage(),
+                innerlanguage: that.book.isSubBook()? that.book.config.get('language') : null,
 
                 glossary: that.book.glossary,
 
diff --git a/lib/index.js b/lib/index.js
index 5a93a54..a23ec3f 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1,4 +1,4 @@
-/*eslint no-console: 0*/
+/* eslint no-console: 0 */
 
 var Q = require('q');
 var _ = require('lodash');
diff --git a/lib/utils/git.js b/lib/utils/git.js
index e93c8f2..72c8818 100644
--- a/lib/utils/git.js
+++ b/lib/utils/git.js
@@ -1,14 +1,14 @@
-var  Q = require("q");
-var _ = require("lodash");
-var path = require("path");
-var crc = require("crc");
-var exec = Q.denodeify(require("child_process").exec);
-var URI = require("URIjs");
-var pathUtil = require("./path");
+var  Q = require('q');
+var _ = require('lodash');
+var path = require('path');
+var crc = require('crc');
+var exec = Q.denodeify(require('child_process').exec);
+var URI = require('urijs');
+var pathUtil = require('./path');
 
-var fs = require("./fs");
+var fs = require('./fs');
 
-var GIT_PREFIX = "git+";
+var GIT_PREFIX = 'git+';
 var GIT_TMP = null;
 
 
@@ -30,20 +30,20 @@ function parseGitUrl(giturl) {
     giturl = giturl.slice(GIT_PREFIX.length);
 
     uri = new URI(giturl);
-    ref = uri.fragment() || "master";
+    ref = uri.fragment() || 'master';
     uri.fragment(null);
 
     // Extract file inside the repo (after the .git)
-    fileParts =uri.path().split(".git");
-    filepath = fileParts.length > 1? fileParts.slice(1).join(".git") : "";
-    if (filepath[0] == "/") filepath = filepath.slice(1);
+    fileParts =uri.path().split('.git');
+    filepath = fileParts.length > 1? fileParts.slice(1).join('.git') : '';
+    if (filepath[0] == '/') filepath = filepath.slice(1);
 
     // Recreate pathname without the real filename
-    uri.path(_.first(fileParts)+".git");
+    uri.path(_.first(fileParts)+'.git');
 
     return {
         host: uri.toString(),
-        ref: ref || "master",
+        ref: ref || 'master',
         filepath: filepath
     };
 }
@@ -52,7 +52,7 @@ function parseGitUrl(giturl) {
 function cloneGitRepo(host, ref) {
     var isBranch = false;
 
-    ref = ref || "master";
+    ref = ref || 'master';
     if (!validateSha(ref)) isBranch = true;
 
     return Q()
@@ -69,7 +69,7 @@ function cloneGitRepo(host, ref) {
     // Return or clone the git repo
     .then(function() {
         // Unique ID for repo/ref combinaison
-        var repoId = crc.crc32(host+"#"+ref).toString(16);
+        var repoId = crc.crc32(host+'#'+ref).toString(16);
 
         // Absolute path to the folder
         var repoPath = path.resolve(GIT_TMP, repoId);
@@ -79,9 +79,9 @@ function cloneGitRepo(host, ref) {
                 if (doExists) return;
 
                 // Clone repo
-                return exec("git clone "+host+" "+repoPath)
+                return exec('git clone '+host+' '+repoPath)
                 .then(function() {
-                    return exec("git checkout "+ref, { cwd: repoPath });
+                    return exec('git checkout '+ref, { cwd: repoPath });
                 });
             })
             .thenResolve(repoPath);
diff --git a/lib/utils/progress.js b/lib/utils/progress.js
index 78821ad..8dda892 100644
--- a/lib/utils/progress.js
+++ b/lib/utils/progress.js
@@ -1,4 +1,4 @@
-var _ = require("lodash");
+var _ = require('lodash');
 
 // Returns from a navigation and a current file, a snapshot of current detailed state
 function calculProgress(navigation, current) {