From 5987766891da87cd15b0e7349445c616b6d90b98 Mon Sep 17 00:00:00 2001 From: Adam Taylor Date: Sat, 20 Feb 2016 17:03:32 -0800 Subject: [PATCH 1/2] Allow updates to developmentLocale to be reflected (1/2) Signed-off-by: Adam Taylor --- DevelopmentModePlugin.js | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/DevelopmentModePlugin.js b/DevelopmentModePlugin.js index c8b9d36..202cb58 100644 --- a/DevelopmentModePlugin.js +++ b/DevelopmentModePlugin.js @@ -14,15 +14,22 @@ function DevelopmentModePlugin(attributes) { var cldr = attributes.cldr || util.cldr; var tmpdir = util.tmpdir(); - messages = attributes.messages && util.readMessages(attributes.messages, attributes.developmentLocale); - + this.messagesPath = path.resolve(attributes.messages.replace("[locale]", attributes.developmentLocale)); + i18nDataTemplate = [ + "var messages = require(\"" + this.messagesPath + "\");", + "", "var Globalize = require(\"globalize\");", "", "Globalize.load(" + JSON.stringify(cldr(attributes.developmentLocale)) + ");", - messages ? "Globalize.loadMessages(" + JSON.stringify(messages) + ");": "", + this.messagesPath ? "Globalize.loadMessages(messages);" : "", "Globalize.locale(" + JSON.stringify(attributes.developmentLocale) + ");", "", + "if (module.hot) {", + " Globalize.loadMessages(messages);", + " module.hot.accept();", + "}", + "", "module.exports = Globalize;" ].join("\n"); From e1b3cc63bbef766f7e90c84f1fa29128db555cda Mon Sep 17 00:00:00 2001 From: Rafael Xavier de Souza Date: Tue, 15 Mar 2016 09:05:43 -0300 Subject: [PATCH 2/2] Allow updates to developmentLocale to be reflected (2/2) --- DevelopmentModePlugin.js | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/DevelopmentModePlugin.js b/DevelopmentModePlugin.js index 202cb58..09a5467 100644 --- a/DevelopmentModePlugin.js +++ b/DevelopmentModePlugin.js @@ -10,26 +10,27 @@ var util = require("./util"); * - Automatically define default locale (i.e., injects `Globalize.locale()`). */ function DevelopmentModePlugin(attributes) { - var i18nDataTemplate, messages; + var i18nDataTemplate; var cldr = attributes.cldr || util.cldr; var tmpdir = util.tmpdir(); - this.messagesPath = path.resolve(attributes.messages.replace("[locale]", attributes.developmentLocale)); + var messagesPath = path.resolve(attributes.messages.replace("[locale]", attributes.developmentLocale)); i18nDataTemplate = [ - "var messages = require(\"" + this.messagesPath + "\");", + "var messages = require(\"" + messagesPath + "\");", "", "var Globalize = require(\"globalize\");", "", "Globalize.load(" + JSON.stringify(cldr(attributes.developmentLocale)) + ");", - this.messagesPath ? "Globalize.loadMessages(messages);" : "", + messagesPath ? [ + "Globalize.loadMessages(messages);", + "if (module.hot) {", + " Globalize.loadMessages(messages);", + " module.hot.accept();", + "}", + ].join("\n") : "", "Globalize.locale(" + JSON.stringify(attributes.developmentLocale) + ");", "", - "if (module.hot) {", - " Globalize.loadMessages(messages);", - " module.hot.accept();", - "}", - "", "module.exports = Globalize;" ].join("\n");