1 files changed, 6 insertions, 5 deletions
diff --git a/lib/output/generateBook.js b/lib/output/generateBook.js
index 6e878e8..c5d61f8 100644
--- a/lib/output/generateBook.js
+++ b/lib/output/generateBook.js
@@ -21,7 +21,7 @@ var generatePages = require('./generatePages');
     @return {Promise<Output>}
 */
 function processOutput(generator, startOutput) {
-    return Pormise(startOutput)
+    return Promise(startOutput)
     .then(preparePlugins)
     .then(preparePages)
     .then(prepareAssets)
@@ -81,10 +81,11 @@ function processOutput(generator, startOutput) {
         var outputRoot = output.getRoot();
         var plugins = output.getPlugins();
         var state = output.getState();
+        var options = output.getOptions();
 
-        return Promise.forEach(books, function(langBook, language) {
+        return Promise.forEach(books, function(langBook) {
             // Inherits plugins list, options and state
-            var langOptions = options.set('root', path.join(outputRoot, language));
+            var langOptions = options.set('root', path.join(outputRoot, langBook.getLanguage()));
             var langOutput = new Output({
                 book:       langBook,
                 options:    langOptions,
@@ -155,7 +156,8 @@ function generateBook(generator, book, options) {
     var state = generator.State? generator.State({}) : Immutable.Map();
     var start = Date.now();
 
-    return Promise(
+    return processOutput(
+        generator,
         new Output({
             book: book,
             options: options,
@@ -163,7 +165,6 @@ function generateBook(generator, book, options) {
             generator: generator.name
         })
     )
-    .then(processOutput)
     .then(function(output) {
         var logger = output.getLogger();
         var end = Date.now();