summaryrefslogtreecommitdiff
path: root/Source/Core/InputCommon/ControllerEmu/Control/Control.cpp
diff options
context:
space:
mode:
authorLéo Lam <leolino.lam@gmail.com>2018-04-14 23:20:39 +0200
committerGitHub <noreply@github.com>2018-04-14 23:20:39 +0200
commitee955e37a98dc20b96c9ed948dc6af96e85fdb51 (patch)
tree2bfcd16cc0f34e14cd08d21387f7e13a9bc2f6f5 /Source/Core/InputCommon/ControllerEmu/Control/Control.cpp
parentaafa8a10e10e26b4068b19cdc5b1bb36dfa9fbf2 (diff)
parent7ed28297b237779f0e4b6d7045cd27e10a8cfb0e (diff)
Merge pull request #6564 from JosJuice/translate-certain-button-names
Translate certain button names but not all
Diffstat (limited to 'Source/Core/InputCommon/ControllerEmu/Control/Control.cpp')
-rw-r--r--Source/Core/InputCommon/ControllerEmu/Control/Control.cpp11
1 files changed, 6 insertions, 5 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_)
{
}