From 8ea607e1c7f3a86f857b2be299aa6f8e1939651a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ed=C3=AAnis=20Freindorfer=20Azevedo?=
 <denisfa@users.noreply.github.com>
Date: Thu, 4 Jul 2019 01:26:48 -0300
Subject: [PATCH] remove translation from joystick keys

Avoid issues with translation, at least for now,
by not translating joystick button/axis names.
---
 src/wx/widgets/joyedit.cpp | 54 ++++++++++++++++++++++++--------------
 1 file changed, 34 insertions(+), 20 deletions(-)

diff --git a/src/wx/widgets/joyedit.cpp b/src/wx/widgets/joyedit.cpp
index 00eaea3f..437dbb8a 100644
--- a/src/wx/widgets/joyedit.cpp
+++ b/src/wx/widgets/joyedit.cpp
@@ -101,52 +101,52 @@ wxString wxJoyKeyTextCtrl::ToString(int mod, int key, int joy)
     wxString s;
     // Note: wx translates unconditionally (2.8.12, 2.9.1)!
     // So any strings added below must also be translated unconditionally
-    s.Printf(_("Joy%d-"), joy);
+    s.Printf(("Joy%d-"), joy);
     wxString mk;
 
     switch (mod) {
     case WXJB_AXIS_PLUS:
-        mk.Printf(_("Axis%d+"), key);
+        mk.Printf(("Axis%d+"), key);
         break;
 
     case WXJB_AXIS_MINUS:
-        mk.Printf(_("Axis%d-"), key);
+        mk.Printf(("Axis%d-"), key);
         break;
 
     case WXJB_BUTTON:
-        mk.Printf(_("Button%d"), key);
+        mk.Printf(("Button%d"), key);
         break;
 
     case WXJB_HAT_N:
-        mk.Printf(_("Hat%dN"), key);
+        mk.Printf(("Hat%dN"), key);
         break;
 
     case WXJB_HAT_S:
-        mk.Printf(_("Hat%dS"), key);
+        mk.Printf(("Hat%dS"), key);
         break;
 
     case WXJB_HAT_W:
-        mk.Printf(_("Hat%dW"), key);
+        mk.Printf(("Hat%dW"), key);
         break;
 
     case WXJB_HAT_E:
-        mk.Printf(_("Hat%dE"), key);
+        mk.Printf(("Hat%dE"), key);
         break;
 
     case WXJB_HAT_NW:
-        mk.Printf(_("Hat%dNW"), key);
+        mk.Printf(("Hat%dNW"), key);
         break;
 
     case WXJB_HAT_NE:
-        mk.Printf(_("Hat%dNE"), key);
+        mk.Printf(("Hat%dNE"), key);
         break;
 
     case WXJB_HAT_SW:
-        mk.Printf(_("Hat%dSW"), key);
+        mk.Printf(("Hat%dSW"), key);
         break;
 
     case WXJB_HAT_SE:
-        mk.Printf(_("Hat%dSE"), key);
+        mk.Printf(("Hat%dSE"), key);
         break;
     }
 
@@ -179,18 +179,14 @@ wxString wxJoyKeyTextCtrl::ToString(wxJoyKeyBinding_v keys, wxChar sep)
 // Note: wx translates unconditionally (2.8.12, 2.9.1)!
 // So any strings added below must also be translated unconditionally
 // \1 is joy #
-static wxRegEx joyre(_("^Joy([0-9]+)[-+]"), wxRE_EXTENDED | wxRE_ICASE);
+static wxRegEx joyre;
 // \1 is axis# and \2 is + or -
-static wxRegEx axre(_("Axis([0-9]+)([+-])"), wxRE_EXTENDED | wxRE_ICASE);
+static wxRegEx axre;
 // \1 is button#
-static wxRegEx butre(_("Button([0-9]+)"), wxRE_EXTENDED | wxRE_ICASE);
+static wxRegEx butre;
 // \1 is hat#, \3 is N, \4 is S, \5 is E, \6 is W, \7 is NE, \8 is SE,
 // \9 is SW, \10 is NW
-static wxRegEx hatre(_("Hat([0-9]+)((N|North|U|Up)|(S|South|D|Down)|"
-                       "(E|East|R|Right)|(W|West|L|Left)|"
-                       "(NE|NorthEast|UR|UpRight)|(SE|SouthEast|DR|DownRight)|"
-                       "(SW|SouthWest|DL|DownLeft)|(NW|NorthWest|UL|UpLeft))"),
-    wxRE_EXTENDED | wxRE_ICASE);
+static wxRegEx hatre;
 // use of static wxRegeEx is not thread-safe
 static wxCriticalSection recs;
 
@@ -206,6 +202,23 @@ static int simple_atoi(const wxString& s, int len)
     return ret;
 }
 
+static void CompileRegex()
+{
+    // \1 is joy #
+    joyre.Compile(("^Joy([0-9]+)[-+]"), wxRE_EXTENDED | wxRE_ICASE);
+    // \1 is axis# and \2 is + or -
+    axre.Compile(("Axis([0-9]+)([+-])"), wxRE_EXTENDED | wxRE_ICASE);
+    // \1 is button#
+    butre.Compile(("Button([0-9]+)"), wxRE_EXTENDED | wxRE_ICASE);
+    // \1 is hat#, \3 is N, \4 is S, \5 is E, \6 is W, \7 is NE,
+    // \8 is SE, \9 is SW, \10 is NW
+    hatre.Compile(("Hat([0-9]+)((N|North|U|Up)|(S|South|D|Down)|"
+                    "(E|East|R|Right)|(W|West|L|Left)|"
+                    "(NE|NorthEast|UR|UpRight)|(SE|SouthEast|DR|DownRight)|"
+                    "(SW|SouthWest|DL|DownLeft)|(NW|NorthWest|UL|UpLeft))"),
+                  wxRE_EXTENDED | wxRE_ICASE);
+}
+
 static bool ParseJoy(const wxString& s, int len, int& mod, int& key, int& joy)
 {
     mod = key = joy = 0;
@@ -216,6 +229,7 @@ static bool ParseJoy(const wxString& s, int len, int& mod, int& key, int& joy)
     wxCriticalSectionLocker lk(recs);
     size_t b, l;
 
+    CompileRegex();
     if (!joyre.Matches(s) || !joyre.GetMatch(&b, &l) || b)
         return false;