Improve i18n to support locale normalization

1 files changed, 6 insertions, 13 deletions

diff --git a/lib/generators/website.js b/lib/generators/website.js
index bedf1af..01df98c 100644
--- a/lib/generators/website.js
+++ b/lib/generators/website.js
@@ -12,6 +12,7 @@ var fs = require("../utils/fs");
 var BaseGenerator = require("../generator");
 var links = require("../utils/links");
 var pageUtil = require("../utils/page");
+var i18n = require("../utils/i18n");
 
 var pkg = require("../../package.json");
 
@@ -74,20 +75,12 @@ Generator.prototype.prepareTemplates = function() {
 Generator.prototype.prepareTemplateEngine = function() {
     var that = this;
 
-    return fs.readdir(path.resolve(__dirname, "../../theme/i18n"))
-    .then(function(locales) {
+    return Q()
+    .then(function() {
         var language = that.book.config.normalizeLanguage();
 
-        locales = _.chain(locales)
-            .map(function(local) {
-                local = path.basename(local, ".json");
-                return [local, require("../../theme/i18n/"+local)];
-            })
-            .object()
-            .value();
-
-        if (!_.contains(_.keys(locales), language) && language != "en") {
-            that.book.log.warn.ln("Language '"+language+"' is not available as a layout locales (en, "+_.keys(locales).join(", ")+")");
+        if (!i18n.getByLanguage(language) && language != "en") {
+            that.book.log.warn.ln("Language '"+language+"' is not available as a layout locales (en, "+i18n.getLanguages().join(", ")+")");
         }
 
         var folders = _.chain(that.templates)
@@ -114,7 +107,7 @@ Generator.prototype.prepareTemplateEngine = function() {
         that.env.addExtension('FilterExtension', new FilterExtension(that.env));
         that.env.addExtension('I18nExtension', new I18nExtension({
             env: that.env,
-            translations: locales,
+            translations: i18n.getLocales(),
             locale: "language"
         }));
     });