Merge pull request #6564 from JosJuice/translate-certain-button-names

Translate certain button names but not all

6 files changed, 25 insertions, 14 deletions

diff --git a/Source/Core/InputCommon/ControllerEmu/Control/Control.cpp b/Source/Core/InputCommon/ControllerEmu/Control/Control.cpp
index 3f5d00d822..20ae3a3cda 100644
--- a/Source/Core/InputCommon/ControllerEmu/Control/Control.cpp
+++ b/Source/Core/InputCommon/ControllerEmu/Control/Control.cpp
@@ -9,14 +9,15 @@
 
 namespace ControllerEmu
 {
-Control::Control(std::unique_ptr<ControlReference> ref, const std::string& name_,
-                 const std::string& ui_name_)
-    : control_ref(std::move(ref)), name(name_), ui_name(ui_name_)
+Control::Control(std::unique_ptr<ControlReference> ref, Translatability translate_,
+                 const std::string& name_, const std::string& ui_name_)
+    : control_ref(std::move(ref)), translate(translate_), name(name_), ui_name(ui_name_)
 {
 }
 
-Control::Control(std::unique_ptr<ControlReference> ref, const std::string& name_)
-    : Control(std::move(ref), name_, name_)
+Control::Control(std::unique_ptr<ControlReference> ref, Translatability translate_,
+                 const std::string& name_)
+    : Control(std::move(ref), translate_, name_, name_)
 {
 }
 
diff --git a/Source/Core/InputCommon/ControllerEmu/Control/Control.h b/Source/Core/InputCommon/ControllerEmu/Control/Control.h
index b34c843c5d..e005431873 100644
--- a/Source/Core/InputCommon/ControllerEmu/Control/Control.h
+++ b/Source/Core/InputCommon/ControllerEmu/Control/Control.h
@@ -11,18 +11,26 @@ class ControlReference;
 
 namespace ControllerEmu
 {
+enum Translatability
+{
+  DoNotTranslate,
+  Translate
+};
+
 class Control
 {
 public:
   virtual ~Control();
 
   std::unique_ptr<ControlReference> const control_ref;
+  const Translatability translate;
   const std::string name;
   const std::string ui_name;
 
 protected:
-  Control(std::unique_ptr<ControlReference> ref, const std::string& name,
+  Control(std::unique_ptr<ControlReference> ref, Translatability translate, const std::string& name,
           const std::string& ui_name);
-  Control(std::unique_ptr<ControlReference> ref, const std::string& name);
+  Control(std::unique_ptr<ControlReference> ref, Translatability translate,
+          const std::string& name);
 };
 }  // namespace ControllerEmu
diff --git a/Source/Core/InputCommon/ControllerEmu/Control/Input.cpp b/Source/Core/InputCommon/ControllerEmu/Control/Input.cpp
index a213916a83..69f817705e 100644
--- a/Source/Core/InputCommon/ControllerEmu/Control/Input.cpp
+++ b/Source/Core/InputCommon/ControllerEmu/Control/Input.cpp
@@ -10,12 +10,13 @@
 
 namespace ControllerEmu
 {
-Input::Input(const std::string& name_, const std::string& ui_name_)
-    : Control(std::make_unique<InputReference>(), name_, ui_name_)
+Input::Input(Translatability translate_, const std::string& name_, const std::string& ui_name_)
+    : Control(std::make_unique<InputReference>(), translate_, name_, ui_name_)
 {
 }
 
-Input::Input(const std::string& name_) : Control(std::make_unique<InputReference>(), name_)
+Input::Input(Translatability translate_, const std::string& name_)
+    : Control(std::make_unique<InputReference>(), translate_, name_)
 {
 }
 }  // namespace ControllerEmu
diff --git a/Source/Core/InputCommon/ControllerEmu/Control/Input.h b/Source/Core/InputCommon/ControllerEmu/Control/Input.h
index dad90ed12e..3fd301ae65 100644
--- a/Source/Core/InputCommon/ControllerEmu/Control/Input.h
+++ b/Source/Core/InputCommon/ControllerEmu/Control/Input.h
@@ -12,7 +12,7 @@ namespace ControllerEmu
 class Input : public Control
 {
 public:
-  Input(const std::string& name, const std::string& ui_name);
-  explicit Input(const std::string& name);
+  Input(Translatability translate, const std::string& name, const std::string& ui_name);
+  Input(Translatability translate, const std::string& name);
 };
 }  // namespace ControllerEmu
diff --git a/Source/Core/InputCommon/ControllerEmu/Control/Output.cpp b/Source/Core/InputCommon/ControllerEmu/Control/Output.cpp
index a031893410..568035d106 100644
--- a/Source/Core/InputCommon/ControllerEmu/Control/Output.cpp
+++ b/Source/Core/InputCommon/ControllerEmu/Control/Output.cpp
@@ -10,7 +10,8 @@
 
 namespace ControllerEmu
 {
-Output::Output(const std::string& name_) : Control(std::make_unique<OutputReference>(), name_)
+Output::Output(Translatability translate_, const std::string& name_)
+    : Control(std::make_unique<OutputReference>(), translate_, name_)
 {
 }
 }  // namespace ControllerEmu
diff --git a/Source/Core/InputCommon/ControllerEmu/Control/Output.h b/Source/Core/InputCommon/ControllerEmu/Control/Output.h
index 415c67f7d9..7970c26ad0 100644
--- a/Source/Core/InputCommon/ControllerEmu/Control/Output.h
+++ b/Source/Core/InputCommon/ControllerEmu/Control/Output.h
@@ -12,6 +12,6 @@ namespace ControllerEmu
 class Output : public Control
 {
 public:
-  explicit Output(const std::string& name);
+  Output(Translatability translate, const std::string& name);
 };
 }  // namespace ControllerEmu