From da0fbf8e88ed21a080a19a374c2b6b190fc715a5 Mon Sep 17 00:00:00 2001
From: Martin Hickey <martin.hickey@ie.ibm.com>
Date: Mon, 12 Dec 2016 23:30:36 +0000
Subject: [PATCH] Update config item locale to defaultLocale

---
 config/kibana.yml           | 6 +++---
 src/server/config/schema.js | 2 +-
 src/ui/index.js             | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/config/kibana.yml b/config/kibana.yml
index d88b30883e9d2af..62077469d4cd862 100644
--- a/config/kibana.yml
+++ b/config/kibana.yml
@@ -98,6 +98,6 @@
 # metrics. Minimum is 100ms. Defaults to 5000.
 #ops.interval: 5000
 
-# The default locale to use for translations if the locale specified by user
-# is not supported
-#i18n.locale: "en"
+# The default locale. This locale can be used in certain circumstances to substitute any missing
+# translations.
+#i18n.defaultLocale: "en"
diff --git a/src/server/config/schema.js b/src/server/config/schema.js
index c347077bf6f4826..957afe2f869ce52 100644
--- a/src/server/config/schema.js
+++ b/src/server/config/schema.js
@@ -156,7 +156,7 @@ module.exports = () => Joi.object({
   }).default(),
 
   i18n: Joi.object({
-    locale: Joi.string().default('en'),
+    defaultLocale: Joi.string().default('en'),
   }).default(),
 
 }).default();
diff --git a/src/ui/index.js b/src/ui/index.js
index 21ffa65f1b811de..a5d6a61a483c039 100644
--- a/src/ui/index.js
+++ b/src/ui/index.js
@@ -15,7 +15,7 @@ export default async (kbnServer, server, config) => {
     urlBasePath: config.get('server.basePath')
   });
 
-  const uiI18n = kbnServer.uiI18n = new UiI18n(config.get('i18n.locale'));
+  const uiI18n = kbnServer.uiI18n = new UiI18n(config.get('i18n.defaultLocale'));
   uiI18n.addUiExportConsumer(uiExports);
 
   const bundlerEnv = new UiBundlerEnv(config.get('optimize.bundleDir'));