nihilist/VeraCrypt
1
0
Fork 0
mirror of https://github.com/veracrypt/VeraCrypt synced 2024-12-01 07:23:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Linux/MacOSX: remove unecessary XML resource string replacement of %hs, not needed since Unicode rewrite.

Browse Source
This commit is contained in:
Mounir IDRASSI 2016-01-25 01:44:03 +01:00
parent 5a555deb74
commit 84ee7076d9
3 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Main/Forms/VolumeCreationWizard.cpp
View File

@ -920,7 +920,6 @@ namespace VeraCrypt
if (SelectedVolumePath.IsDevice()) if (SelectedVolumePath.IsDevice())
{ {
wxString confirmMsg = LangString["OVERWRITEPROMPT_DEVICE"]; 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)) if (!Gui->AskYesNo (wxString::Format (confirmMsg, wxString (_("DEVICE")).c_str(), wstring (SelectedVolumePath).c_str(), L""), false, true))
return GetCurrentStep(); return GetCurrentStep();
@ -928,7 +927,6 @@ namespace VeraCrypt
else if (FilesystemPath (wstring (SelectedVolumePath)).IsFile()) else if (FilesystemPath (wstring (SelectedVolumePath)).IsFile())
{ {
wxString confirmMsg = LangString["OVERWRITEPROMPT"]; wxString confirmMsg = LangString["OVERWRITEPROMPT"];
confirmMsg.Replace (L"%hs", L"%s");
if (!Gui->AskYesNo (wxString::Format (confirmMsg, wstring (SelectedVolumePath).c_str()), false, true)) if (!Gui->AskYesNo (wxString::Format (confirmMsg, wstring (SelectedVolumePath).c_str()), false, true))
return GetCurrentStep(); return GetCurrentStep();

2
src/Main/GraphicUserInterface.cpp
View File

@ -252,7 +252,6 @@ namespace VeraCrypt
// Ask user to select backup file path // Ask user to select backup file path
wxString confirmMsg = LangString["CONFIRM_VOL_HEADER_BAK"]; wxString confirmMsg = LangString["CONFIRM_VOL_HEADER_BAK"];
confirmMsg.Replace (L"%hs", L"%s");
if (!AskYesNo (wxString::Format (confirmMsg, wstring (*volumePath).c_str()), true)) if (!AskYesNo (wxString::Format (confirmMsg, wstring (*volumePath).c_str()), true))
return; return;
@ -1384,7 +1383,6 @@ namespace VeraCrypt
// Restore header from an external backup // Restore header from an external backup
wxString confirmMsg = LangString["CONFIRM_VOL_HEADER_RESTORE"]; wxString confirmMsg = LangString["CONFIRM_VOL_HEADER_RESTORE"];
confirmMsg.Replace (L"%hs", L"%s");
if (!AskYesNo (wxString::Format (confirmMsg, wstring (*volumePath).c_str()), true, true)) if (!AskYesNo (wxString::Format (confirmMsg, wstring (*volumePath).c_str()), true, true))
return; return;

2
src/Main/TextUserInterface.cpp
View File

@ -341,7 +341,6 @@ namespace VeraCrypt
// Ask user to select backup file path // Ask user to select backup file path
wxString confirmMsg = L"\n" + LangString["CONFIRM_VOL_HEADER_BAK"] + L"\n"; 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)) if (!AskYesNo (wxString::Format (confirmMsg, wstring (*volumePath).c_str()), true))
return; return;
@ -1418,7 +1417,6 @@ namespace VeraCrypt
// Restore header from an external backup // Restore header from an external backup
wxString confirmMsg = L"\n\n" + LangString["CONFIRM_VOL_HEADER_RESTORE"]; 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)) if (!AskYesNo (wxString::Format (confirmMsg, wstring (*volumePath).c_str()), true, true))
return; return;