From f10f5e291eba196c314e32a3efc5fbdd074224db Mon Sep 17 00:00:00 2001 From: berryzplus Date: Mon, 20 Jul 2020 00:24:39 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=E8=8B=B1=E8=AA=9EOS=E3=81=A7=E3=81=AE?= =?UTF-8?q?=E5=88=9D=E5=9B=9E=E8=B5=B7=E5=8B=95=E6=99=82=E3=81=AB=E8=A8=AD?= =?UTF-8?q?=E5=AE=9A=E5=80=A4=E3=82=92=E5=A4=89=E6=8F=9B=E3=81=99=E3=82=8B?= =?UTF-8?q?=E5=87=A6=E7=90=86=E3=82=92=E6=8C=BF=E5=85=A5=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sakura_core/env/CShareData_IO.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sakura_core/env/CShareData_IO.cpp b/sakura_core/env/CShareData_IO.cpp index 081e238110..38e4686578 100644 --- a/sakura_core/env/CShareData_IO.cpp +++ b/sakura_core/env/CShareData_IO.cpp @@ -101,7 +101,15 @@ bool CShareData_IO::ShareData_IO_2( bool bRead ) DLLSHAREDATA* pShareData = &GetDllShareData(); wcscpy(pShareData->m_Common.m_sWindow.m_szLanguageDll, L"sakura_lang_en_US.dll"); cProfile.IOProfileData( L"Common", L"szLanguageDll", MakeStringBufferW( pShareData->m_Common.m_sWindow.m_szLanguageDll ) ); + constexpr bool bChangeLang = true; + std::vector values; + if( bChangeLang ){ + pcShare->ConvertLangValues( values, true ); + } CSelectLang::ChangeLang( pShareData->m_Common.m_sWindow.m_szLanguageDll ); + if( bChangeLang ){ + pcShare->ConvertLangValues( values, false ); + } pcShare->RefreshString(); } return false; From ceb478f3f719d02659c2bce16f5f3f9f1e9f9390 Mon Sep 17 00:00:00 2001 From: berryzplus Date: Sat, 25 Jul 2020 19:06:30 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=E3=83=AC=E3=83=93=E3=83=A5=E3=83=BC?= =?UTF-8?q?=E6=8C=87=E6=91=98=E5=AF=BE=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sakura_core/env/CShareData_IO.cpp | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/sakura_core/env/CShareData_IO.cpp b/sakura_core/env/CShareData_IO.cpp index 38e4686578..0de2d3c336 100644 --- a/sakura_core/env/CShareData_IO.cpp +++ b/sakura_core/env/CShareData_IO.cpp @@ -101,15 +101,10 @@ bool CShareData_IO::ShareData_IO_2( bool bRead ) DLLSHAREDATA* pShareData = &GetDllShareData(); wcscpy(pShareData->m_Common.m_sWindow.m_szLanguageDll, L"sakura_lang_en_US.dll"); cProfile.IOProfileData( L"Common", L"szLanguageDll", MakeStringBufferW( pShareData->m_Common.m_sWindow.m_szLanguageDll ) ); - constexpr bool bChangeLang = true; std::vector values; - if( bChangeLang ){ - pcShare->ConvertLangValues( values, true ); - } + pcShare->ConvertLangValues( values, true ); CSelectLang::ChangeLang( pShareData->m_Common.m_sWindow.m_szLanguageDll ); - if( bChangeLang ){ - pcShare->ConvertLangValues( values, false ); - } + pcShare->ConvertLangValues( values, false ); pcShare->RefreshString(); } return false;