diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb index 444d70b..08d78fa 100644 Binary files a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb and b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb differ diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.suo b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.suo index 531ab83..93983af 100644 Binary files a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.suo and b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.suo differ diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm index a913c8c..9bf126a 100644 Binary files a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm and b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm differ diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.h b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.h index 2aec1d9..26f91a8 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.h +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.h @@ -69,6 +69,9 @@ namespace MasterEditorTWL { // ミドルウェア名称リスト RCMiddlewareNameList ^hMiddlewareNameList; + // デフォルト(起動時)のロケール名 + System::String ^hDefaultCultureName; + ///////////////////////////////////////////// // VC自動追加フィールド ///////////////////////////////////////////// @@ -4927,7 +4930,8 @@ private: System::Windows::Forms::RadioButton^ rPurposeZone; System::String^ makeMsg( System::String ^tag, ... cli::array ^args ) { System::String ^lang; - if( this->isJapanese() ) + //if( this->isJapanese() ) + if( this->hDefaultCultureName && this->hDefaultCultureName->StartsWith("ja") ) // 日本版Windowsのみ日本語メッセージにする { lang = "J"; } diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_constructor.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_constructor.cpp index b421b39..b289d93 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_constructor.cpp +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_constructor.cpp @@ -27,6 +27,10 @@ using namespace MasterEditorTWL; // ---------------------------------------------- void Form1::construct(void) { + // 言語切り替えで一時的にカルチャを変更するのでデフォルトのカルチャを取得して戻せるようにしておく + // これを取得しておかないとエラーメッセージを出せないので一番最初に取得しておく + this->hDefaultCultureName = System::Threading::Thread::CurrentThread->CurrentUICulture->Name; + // フィールド初期化 this->hSrl = gcnew RCSrl( this->getMrcMessageFileJ(), this->getMrcMessageFileE() ); this->hDeliv = gcnew RCDeliverable; @@ -87,7 +91,7 @@ void Form1::construct(void) this->tboxGuideErrorInfo->Text = this->tboxGuideErrorInfo->Text->Replace( "", "\r\n" ); // システムの言語バージョンにあわせて言語切り替え - if( System::Threading::Thread::CurrentThread->CurrentUICulture->Name->StartsWith( "ja" ) ) + if( this->hDefaultCultureName->StartsWith( "ja" ) ) { this->stripItemJapanese->Checked = true; this->stripItemEnglish->Checked = false; diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_lang.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_lang.cpp index 8bf76e6..5e4e7e2 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_lang.cpp +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_lang.cpp @@ -108,6 +108,7 @@ void MasterEditorTWL::Form1::changeLanguage( System::String ^langname ) { //int index; + // リソース切り替えのために一時的にカルチャを切り替え System::Threading::Thread::CurrentThread->CurrentUICulture = gcnew System::Globalization::CultureInfo(langname,true); System::ComponentModel::ComponentResourceManager^ resources = (gcnew System::ComponentModel::ComponentResourceManager(Form1::typeid)); @@ -538,6 +539,9 @@ void MasterEditorTWL::Form1::changeLanguage( System::String ^langname ) { this->Text += " [ Supported App: " + appstr + "User ]"; } + + // カルチャを戻す + System::Threading::Thread::CurrentThread->CurrentUICulture = gcnew System::Globalization::CultureInfo(this->hDefaultCultureName,true); } // end of file \ No newline at end of file diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Release/BuildLog.htm b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Release/BuildLog.htm index 9be2c7b..acf946b 100644 Binary files a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Release/BuildLog.htm and b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Release/BuildLog.htm differ