Merge pull request #113418 from Calinou/inputevent-shortcut-physical-unicode-avoid-nested-parentheses

Avoid nested parentheses in physical/Unicode InputEventKey text conversion
This commit is contained in:
Thaddeus Crews 2025-12-03 11:42:22 -06:00
commit 825d0fe94a
No known key found for this signature in database
GPG key ID: 8C6E5FEB5FC03CCC
3 changed files with 18 additions and 18 deletions

View file

@ -405,7 +405,7 @@ String InputEventKey::as_text_physical_keycode() const {
if (physical_keycode != Key::NONE) {
kc = keycode_get_string(physical_keycode);
} else {
kc = "(" + RTR("Unset") + ")";
kc = "(" + RTR("unset") + ")";
}
if (kc.is_empty()) {
@ -422,7 +422,7 @@ String InputEventKey::as_text_keycode() const {
if (keycode != Key::NONE) {
kc = keycode_get_string(keycode);
} else {
kc = "(" + RTR("Unset") + ")";
kc = "(" + RTR("unset") + ")";
}
if (kc.is_empty()) {
@ -439,7 +439,7 @@ String InputEventKey::as_text_key_label() const {
if (key_label != Key::NONE) {
kc = keycode_get_string(key_label);
} else {
kc = "(" + RTR("Unset") + ")";
kc = "(" + RTR("unset") + ")";
}
if (kc.is_empty()) {
@ -471,13 +471,13 @@ String InputEventKey::as_text() const {
String kc;
if (keycode == Key::NONE && physical_keycode == Key::NONE && key_label != Key::NONE) {
kc = keycode_get_string(key_label) + " (Unicode)";
kc = keycode_get_string(key_label) + " - Unicode";
} else if (keycode != Key::NONE) {
kc = keycode_get_string(keycode);
} else if (physical_keycode != Key::NONE) {
kc = keycode_get_string(physical_keycode) + " (" + RTR("Physical") + ")";
kc = keycode_get_string(physical_keycode) + " - " + RTR("Physical");
} else {
kc = "(" + RTR("Unset") + ")";
kc = "(" + RTR("unset") + ")";
}
if (kc.is_empty()) {
@ -508,7 +508,7 @@ String InputEventKey::_to_string() {
kc = itos((int64_t)physical_keycode) + " (" + keycode_get_string(physical_keycode) + ")";
physical = "true";
} else {
kc = "(" + RTR("Unset") + ")";
kc = "(" + RTR("unset") + ")";
}
String mods = InputEventWithModifiers::as_text();