From ccc4e6de023d8aed336c16cdad876b1f34ae6cd5 Mon Sep 17 00:00:00 2001 From: JosJuice Date: Sat, 19 Dec 2015 14:36:09 +0100 Subject: DolphinWX: Don't translate OSD messages OSD messages other than these one and a half aren't translated, and OSD only supports ASCII. (Also, that "Wiimote %i %s" uses %s like it does is bad for translation, but that's easy to fix.) --- Source/Core/DolphinWX/FrameTools.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'Source/Core/DolphinWX/FrameTools.cpp') 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); } -- cgit v1.2.3