Fix render when i18n hook is disabled

balderdashy · May 24, 2016 · a7f65c7 · a7f65c7
1 parent cee2e64
commit a7f65c7
Showing 1 changed file with 14 additions and 10 deletions.
diff --git a/lib/hooks/views/render.js b/lib/hooks/views/render.js
@@ -91,16 +91,20 @@ module.exports = function render(relPathToView, _options, cb_view) {
     headers: {}
   };
 
-  // Initialize i18n
-  require('i18n').init(req, options, function() {
-
-    // Set the locale if necessary
-    if (options.locale) {
-      req.locale = options.locale;
-    }
-
-    // Render the view
+  // Initialize i18n if hook is enabled
+  if (sails.hooks.i18n) {
+    require('i18n').init(req, options, function() {
+
+      // Set the locale if necessary
+      if (options.locale) {
+        req.locale = options.locale;
+      }
+
+      // Render the view
+      sails.config.views.engine.fn(absPathToView, options, cb_view);
+    });
+  } else {
     sails.config.views.engine.fn(absPathToView, options, cb_view);
-  });
+  }
 
 };