diff options
| author | Anthony <Helios747@users.noreply.github.com> | 2016-09-16 12:39:11 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-16 12:39:11 -0500 |
| commit | 533ee4ccbe1879ce2277872b657228d8aede7e87 (patch) | |
| tree | d343f1bc9515b83560b7c9035eede7097ce1e188 /Source/Core/DolphinWX/FrameTools.cpp | |
| parent | 4c004b6dc978d7585bf0765e22351ef1edd39a3a (diff) | |
| parent | ccc4e6de023d8aed336c16cdad876b1f34ae6cd5 (diff) | |
Merge pull request #3275 from JosJuice/wiimote-message
DolphinWX: Don't translate OSD messages
Diffstat (limited to 'Source/Core/DolphinWX/FrameTools.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/FrameTools.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/Core/DolphinWX/FrameTools.cpp b/Source/Core/DolphinWX/FrameTools.cpp index 4dc8789796..dcb22c20a7 100644 --- a/Source/Core/DolphinWX/FrameTools.cpp +++ b/Source/Core/DolphinWX/FrameTools.cpp @@ -30,6 +30,7 @@ #include "Common/FileSearch.h" #include "Common/FileUtil.h" #include "Common/NandPaths.h" +#include "Common/StringUtil.h" #include "Core/BootManager.h" #include "Core/ConfigManager.h" @@ -1553,9 +1554,8 @@ void CFrame::ConnectWiimote(int wm_idx, bool connect) { bool was_unpaused = Core::PauseAndLock(true); GetUsbPointer()->AccessWiiMote(wm_idx | 0x100)->Activate(connect); - wxString msg(wxString::Format(_("Wiimote %i %s"), wm_idx + 1, - connect ? _("Connected") : _("Disconnected"))); - Core::DisplayMessage(WxStrToStr(msg), 3000); + const char* message = connect ? "Wiimote %i connected" : "Wiimote %i disconnected"; + Core::DisplayMessage(StringFromFormat(message, wm_idx + 1), 3000); Host_UpdateMainFrame(); Core::PauseAndLock(false, was_unpaused); } @@ -1675,7 +1675,7 @@ void CFrame::OnSelectSlot(wxCommandEvent& event) { m_saveSlot = event.GetId() - IDM_SELECT_SLOT_1 + 1; Core::DisplayMessage(StringFromFormat("Selected slot %d - %s", m_saveSlot, - State::GetInfoStringOfSlot(m_saveSlot).c_str()), + State::GetInfoStringOfSlot(m_saveSlot, false).c_str()), 2500); } |