From 30b927241205161728d7030b58d48a2f624b1e8b Mon Sep 17 00:00:00 2001 From: Rafael Kitover Date: Mon, 1 Jul 2019 07:53:23 +0000 Subject: [PATCH] hopefully fix kbd control translation issues Add missing gettext calls for the game controls code. Seems to work correctly in the Russian locale with special keys. Also add CLion files to `.gitignore`. Signed-off-by: Rafael Kitover --- .gitignore | 2 ++ src/wx/widgets/keyedit.cpp | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 6b001a19..f2a8f061 100644 --- a/.gitignore +++ b/.gitignore @@ -7,9 +7,11 @@ src/wx/wxvbam.xrs build/* build32/* vsbuild/* +cmake-build* dependencies/* vcpkg/* .vs/* +.idea *.o *.so *.dll diff --git a/src/wx/widgets/keyedit.cpp b/src/wx/widgets/keyedit.cpp index 517eb787..aa411e5e 100644 --- a/src/wx/widgets/keyedit.cpp +++ b/src/wx/widgets/keyedit.cpp @@ -124,8 +124,8 @@ wxString wxKeyTextCtrl::ToString(int mod, int key) #endif - if (s.empty() || (key != wxT('-') && s[s.size() - 1] == wxT('-') && s != wxT("Num -")) - || (key != wxT('+') && s[s.size() - 1] == wxT('+') && s != wxT("Num +"))) + if (s.empty() || (key != wxT('-') && s[s.size() - 1] == wxT('-') && s != _("Num") + wxT(" -")) + || (key != wxT('+') && s[s.size() - 1] == wxT('+') && s != _("Num") + wxT(" +"))) { // bad key combo; probably also generates an assertion in wx return wxEmptyString; @@ -138,8 +138,8 @@ wxString wxKeyTextCtrl::ToString(int mod, int key) int keys_el_size = sizeof(keys_with_display_names)/sizeof(keys_with_display_names[0]); for (int i = 0; i < keys_el_size; i++) { - wxString name(keys_with_display_names[i].name); - wxString display_name(keys_with_display_names[i].display_name); + wxString name(_(keys_with_display_names[i].name)); + wxString display_name(_(keys_with_display_names[i].display_name)); name.MakeUpper(); display_name.MakeUpper();