From 0146456af0d907783d60a61ca75e6abb2fc2bab5 Mon Sep 17 00:00:00 2001 From: JosJuice Date: Sun, 30 Apr 2017 14:53:33 +0200 Subject: Don't translate button names MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Since these button names are printed on all real controllers, we should show them in the same way as they are printed on the controllers, regardless of the user's language. It seems like this was intended all along (except for "Start"), but the _ markers in TASInputDlg.cpp (accidentally?) led to the button names in the controller configs also becoming translatable. I'm making exceptions for "L" and "R" because translators may want to mark them in some way (for instance "L-Digital") to clarify the difference from "L-Analog" and "R-Analog". I'm also making an exception for START/PAUSE because it's referred to as スタート in Japanese games. I'm changing "Home" and "Start" to uppercase for consistency with how Nintendo refers to those buttons, and because someone who isn't familiar with the Latin script might not know the connection between the lowercase and uppercase letters (most users likely do know the connection, but we shouldn't assume it), and because leaving "Start" as "Start" makes it "collide" with unrelated strings, such as the string for the button that starts a netplay session. To rename "Start" and "Home" without breaking INI compatibility, I added a ui_name variable like in f5c82ad. --- Source/Core/InputCommon/ControllerEmu/Control/Input.cpp | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'Source/Core/InputCommon/ControllerEmu/Control/Input.cpp') diff --git a/Source/Core/InputCommon/ControllerEmu/Control/Input.cpp b/Source/Core/InputCommon/ControllerEmu/Control/Input.cpp index 8ff04e68a1..a213916a83 100644 --- a/Source/Core/InputCommon/ControllerEmu/Control/Input.cpp +++ b/Source/Core/InputCommon/ControllerEmu/Control/Input.cpp @@ -10,6 +10,11 @@ namespace ControllerEmu { +Input::Input(const std::string& name_, const std::string& ui_name_) + : Control(std::make_unique(), name_, ui_name_) +{ +} + Input::Input(const std::string& name_) : Control(std::make_unique(), name_) { } -- cgit v1.2.3