From 84ee7076d93b56eefafb9f5e464e2fe5e56b83af Mon Sep 17 00:00:00 2001 From: Mounir IDRASSI Date: Mon, 25 Jan 2016 01:44:03 +0100 Subject: [PATCH] Linux/MacOSX: remove unecessary XML resource string replacement of %hs, not needed since Unicode rewrite. --- src/Main/Forms/VolumeCreationWizard.cpp | 2 -- src/Main/GraphicUserInterface.cpp | 2 -- src/Main/TextUserInterface.cpp | 2 -- 3 files changed, 6 deletions(-) diff --git a/src/Main/Forms/VolumeCreationWizard.cpp b/src/Main/Forms/VolumeCreationWizard.cpp index 201a4379..5605920d 100755 --- a/src/Main/Forms/VolumeCreationWizard.cpp +++ b/src/Main/Forms/VolumeCreationWizard.cpp @@ -920,7 +920,6 @@ namespace VeraCrypt if (SelectedVolumePath.IsDevice()) { wxString confirmMsg = LangString["OVERWRITEPROMPT_DEVICE"]; - confirmMsg.Replace (L"%hs", L"%s"); if (!Gui->AskYesNo (wxString::Format (confirmMsg, wxString (_("DEVICE")).c_str(), wstring (SelectedVolumePath).c_str(), L""), false, true)) return GetCurrentStep(); @@ -928,7 +927,6 @@ namespace VeraCrypt else if (FilesystemPath (wstring (SelectedVolumePath)).IsFile()) { wxString confirmMsg = LangString["OVERWRITEPROMPT"]; - confirmMsg.Replace (L"%hs", L"%s"); if (!Gui->AskYesNo (wxString::Format (confirmMsg, wstring (SelectedVolumePath).c_str()), false, true)) return GetCurrentStep(); diff --git a/src/Main/GraphicUserInterface.cpp b/src/Main/GraphicUserInterface.cpp index 3b8041a9..3526dcad 100644 --- a/src/Main/GraphicUserInterface.cpp +++ b/src/Main/GraphicUserInterface.cpp @@ -252,7 +252,6 @@ namespace VeraCrypt // Ask user to select backup file path wxString confirmMsg = LangString["CONFIRM_VOL_HEADER_BAK"]; - confirmMsg.Replace (L"%hs", L"%s"); if (!AskYesNo (wxString::Format (confirmMsg, wstring (*volumePath).c_str()), true)) return; @@ -1384,7 +1383,6 @@ namespace VeraCrypt // Restore header from an external backup wxString confirmMsg = LangString["CONFIRM_VOL_HEADER_RESTORE"]; - confirmMsg.Replace (L"%hs", L"%s"); if (!AskYesNo (wxString::Format (confirmMsg, wstring (*volumePath).c_str()), true, true)) return; diff --git a/src/Main/TextUserInterface.cpp b/src/Main/TextUserInterface.cpp index 4005c8f1..c5d64d15 100644 --- a/src/Main/TextUserInterface.cpp +++ b/src/Main/TextUserInterface.cpp @@ -341,7 +341,6 @@ namespace VeraCrypt // Ask user to select backup file path wxString confirmMsg = L"\n" + LangString["CONFIRM_VOL_HEADER_BAK"] + L"\n"; - confirmMsg.Replace (L"%hs", L"%s"); if (!AskYesNo (wxString::Format (confirmMsg, wstring (*volumePath).c_str()), true)) return; @@ -1418,7 +1417,6 @@ namespace VeraCrypt // Restore header from an external backup wxString confirmMsg = L"\n\n" + LangString["CONFIRM_VOL_HEADER_RESTORE"]; - confirmMsg.Replace (L"%hs", L"%s"); if (!AskYesNo (wxString::Format (confirmMsg, wstring (*volumePath).c_str()), true, true)) return;