From d585a61049dcd3506a57cfdc7d301fcfe01a3497 Mon Sep 17 00:00:00 2001 From: Rafael Kitover Date: Wed, 3 Jul 2019 02:17:13 +0000 Subject: [PATCH] followup on kbd trans issues fix in 30b92724 Use the table to to replace both the translated string and the English string. Signed-off-by: Rafael Kitover --- src/wx/widgets/keyedit.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/wx/widgets/keyedit.cpp b/src/wx/widgets/keyedit.cpp index aa411e5e..75b72726 100644 --- a/src/wx/widgets/keyedit.cpp +++ b/src/wx/widgets/keyedit.cpp @@ -138,12 +138,17 @@ 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_tr(_(keys_with_display_names[i].name)); + wxString display_name_tr(_(keys_with_display_names[i].display_name)); + name_tr.MakeUpper(); + display_name_tr.MakeUpper(); wxString name(_(keys_with_display_names[i].name)); wxString display_name(_(keys_with_display_names[i].display_name)); name.MakeUpper(); display_name.MakeUpper(); - s.Replace(display_name, name, true); + s.Replace(display_name_tr, name_tr, true); + s.Replace(display_name, name, true); } return s;