From c59b16a38f5862125e4decaa65a58c4667206faf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=A9lien=20Georget?= <aurelsicoko@gmail.com>
Date: Tue, 8 Nov 2016 16:56:24 +0100
Subject: [PATCH] Disable locales by default and remove useless configurations

---
 .../files/config/general.json                   | 17 +----------------
 .../strapi-generate-new/files/config/i18n.json  |  1 +
 .../lib/configuration/hooks/core/i18n/index.js  |  2 +-
 3 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/packages/strapi-generate-new/files/config/general.json b/packages/strapi-generate-new/files/config/general.json
index c12f1d035e..c9e8659429 100755
--- a/packages/strapi-generate-new/files/config/general.json
+++ b/packages/strapi-generate-new/files/config/general.json
@@ -6,20 +6,5 @@
     "path": "favicon.ico",
     "maxAge": 86400000
   },
-  "prefix": "",
-  "jsonapi": {
-    "enabled": false,
-    "keyForAttribute": "dash-case",
-    "ignoreRelationshipData": true,
-    "includedRelationshipData": true,
-    "paginate": 10,
-    "showVersion": false
-  },
-  "graphql": {
-    "enabled": false,
-    "graphiql": false,
-    "pretty": true,
-    "usefulQueries": false,
-    "ignoreMutations": true
-  }
+  "prefix": ""
 }
diff --git a/packages/strapi-generate-new/files/config/i18n.json b/packages/strapi-generate-new/files/config/i18n.json
index 94626140b3..63f7552a55 100755
--- a/packages/strapi-generate-new/files/config/i18n.json
+++ b/packages/strapi-generate-new/files/config/i18n.json
@@ -1,5 +1,6 @@
 {
   "i18n": {
+    "enabled": false,
     "defaultLocale": "en_US",
     "modes": [
       "query",
diff --git a/packages/strapi/lib/configuration/hooks/core/i18n/index.js b/packages/strapi/lib/configuration/hooks/core/i18n/index.js
index 122911b700..809d88d5fc 100644
--- a/packages/strapi/lib/configuration/hooks/core/i18n/index.js
+++ b/packages/strapi/lib/configuration/hooks/core/i18n/index.js
@@ -41,7 +41,7 @@ module.exports = strapi => {
      */
 
     initialize: cb => {
-      if (_.isPlainObject(strapi.config.i18n) && !_.isEmpty(strapi.config.i18n)) {
+      if (_.isPlainObject(strapi.config.i18n) && !_.isEmpty(strapi.config.i18n) && _.get(strapi.config, 'i18n.enabled') !== false) {
         strapi.middlewares.locale(strapi.app);
         strapi.app.use(strapi.middlewares.convert(strapi.middlewares.i18n(strapi.app, {
           directory: path.resolve(strapi.config.appPath, strapi.config.paths.config, 'locales'),