Merge pull request #683 from GitbookIO/fix/i18n

Fix i18n in json format

1 files changed, 3 insertions, 8 deletions

diff --git a/lib/generators/website.js b/lib/generators/website.js
index 9405a1c..fbf0a8d 100644
--- a/lib/generators/website.js
+++ b/lib/generators/website.js
@@ -6,7 +6,6 @@ var _ = require("lodash");
 var nunjucks = require("nunjucks");
 var AutoEscapeExtension = require("nunjucks-autoescape");
 var FilterExtension = require("nunjucks-filter");
-var I18nExtension = require("nunjucks-i18n");
 
 var fs = require("../utils/fs");
 var BaseGenerator = require("../generator");
@@ -79,8 +78,8 @@ Generator.prototype.prepareTemplateEngine = function() {
     .then(function() {
         var language = that.book.config.normalizeLanguage();
 
-        if (!i18n.getByLanguage(language) && language != "en") {
-            that.book.log.warn.ln("Language '"+language+"' is not available as a layout locales (en, "+i18n.getLanguages().join(", ")+")");
+        if (!i18n.hasLocale(language)) {
+            that.book.log.warn.ln("Language '"+language+"' is not available as a layout locales (en, "+i18n.getLocales().join(", ")+")");
         }
 
         var folders = _.chain(that.templates)
@@ -101,15 +100,11 @@ Generator.prototype.prepareTemplateEngine = function() {
         that.env.addFilter('lvl', function(lvl) {
             return lvl.split(".").length;
         });
+        that.env.addGlobal('__', that.book.i18n.bind(that.book));
 
         // Add extension
         that.env.addExtension('AutoEscapeExtension', new AutoEscapeExtension(that.env));
         that.env.addExtension('FilterExtension', new FilterExtension(that.env));
-        that.env.addExtension('I18nExtension', new I18nExtension({
-            env: that.env,
-            translations: i18n.getLocales(),
-            locale: "language"
-        }));
     });
 };