piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 14:19:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixed translation of strings at runtime.

Browse Source 
Static strings can not be translated until wxLocale is initialised.

This reverts commit 0004b6004b.

Conflicts:
	Source/Core/DolphinWX/VideoConfigDiag.cpp
This commit is contained in:
Matthew Parlane
2015-06-07 15:32:29 +12:00
parent b0afb08170
commit 1aa829c03c
5 changed files with 128 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Source/Core/DolphinWX/ControllerConfigDiag.cpp
View File

@ -38,22 +38,22 @@
#include "DolphinWX/X11Utils.h"
#endif
const std::array<wxString, 8> ControllerConfigDiag::m_gc_pad_type_strs = {{
_("None"),
_("Standard Controller"),
_("Steering Wheel"),
_("Dance Mat"),
_("TaruKonga (Bongos)"),
_("GBA"),
_("Keyboard"),
_("AM-Baseboard")
}};
wxDEFINE_EVENT(wxEVT_ADAPTER_UPDATE, wxCommandEvent);
ControllerConfigDiag::ControllerConfigDiag(wxWindow* const parent)
: wxDialog(parent, wxID_ANY, _("Dolphin Controller Configuration"))
{
m_gc_pad_type_strs = {
_("None"),
_("Standard Controller"),
_("Steering Wheel"),
_("Dance Mat"),
_("TaruKonga (Bongos)"),
_("GBA"),
_("Keyboard"),
_("AM-Baseboard")
};
wxBoxSizer* const main_sizer = new wxBoxSizer(wxVERTICAL);
// Combine all UI controls into their own encompassing sizer.
@ -287,7 +287,7 @@ wxStaticBoxSizer* ControllerConfigDiag::CreateBalanceBoardSizer()
m_wiimote_index_from_ctrl_id.insert(std::pair<wxWindowID, unsigned int>(source_ctrl_id, WIIMOTE_BALANCE_BOARD));
static const std::array<wxString, 2> src_choices = {{
("None"), _("Real Balance Board")
_("None"), _("Real Balance Board")
}};
wxChoice* const bb_source = new wxChoice(this, source_ctrl_id, wxDefaultPosition, wxDefaultSize, src_choices.size(), src_choices.data());