From b2be9373b09102f00d439a86cdf2fb21f0b48552 Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Fri, 16 Jan 2015 16:12:12 -0800 Subject: [PATCH] linux,win: Initalize ICU for node mode --- atom/app/atom_main.cc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/atom/app/atom_main.cc b/atom/app/atom_main.cc index 603f2dc2bcf6..8c7837ed3278 100644 --- a/atom/app/atom_main.cc +++ b/atom/app/atom_main.cc @@ -28,6 +28,8 @@ #include "atom/app/atom_library_main.h" #endif // defined(OS_MACOSX) +#include "base/i18n/icu_util.h" + // Declaration of node::Start. namespace node { int Start(int argc, char *argv[]); @@ -89,6 +91,7 @@ int APIENTRY wWinMain(HINSTANCE instance, HINSTANCE, wchar_t* cmd, int) { } } // Now that conversion is done, we can finally start. + base::i18n::InitializeICU(); return node::Start(argc, argv); } else if (env->GetVar("ATOM_SHELL_INTERNAL_CRASH_SERVICE", &crash_service_indicator) && @@ -113,8 +116,10 @@ int APIENTRY wWinMain(HINSTANCE instance, HINSTANCE, wchar_t* cmd, int) { int main(int argc, const char* argv[]) { char* node_indicator = getenv("ATOM_SHELL_INTERNAL_RUN_AS_NODE"); - if (node_indicator != NULL && strcmp(node_indicator, "1") == 0) + if (node_indicator != NULL && strcmp(node_indicator, "1") == 0) { + base::i18n::InitializeICU(); return node::Start(argc, const_cast(argv)); + } atom::AtomMainDelegate delegate; content::ContentMainParams params(&delegate);