From 9c9107c4347ef7538debe4aafec4a3dddd9daa64 Mon Sep 17 00:00:00 2001 From: mezz Date: Fri, 29 Apr 2016 12:04:48 -0700 Subject: [PATCH] Close #2780 add CMD localization for Mac key bindings (#2792) --- .../java/net/minecraftforge/client/settings/KeyModifier.java | 3 ++- src/main/resources/assets/forge/lang/en_US.lang | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/minecraftforge/client/settings/KeyModifier.java b/src/main/java/net/minecraftforge/client/settings/KeyModifier.java index b5ff9a875..c2183bd22 100644 --- a/src/main/java/net/minecraftforge/client/settings/KeyModifier.java +++ b/src/main/java/net/minecraftforge/client/settings/KeyModifier.java @@ -31,7 +31,8 @@ public enum KeyModifier { public String getLocalizedComboName(int keyCode) { String keyName = GameSettings.getKeyDisplayString(keyCode); - return I18n.format("forge.controlsgui.control", keyName); + String localizationFormatKey = Minecraft.isRunningOnMac ? "forge.controlsgui.control.mac" : "forge.controlsgui.control"; + return I18n.format(localizationFormatKey, keyName); } }, SHIFT { diff --git a/src/main/resources/assets/forge/lang/en_US.lang b/src/main/resources/assets/forge/lang/en_US.lang index 4155a94a0..7c35d8e56 100644 --- a/src/main/resources/assets/forge/lang/en_US.lang +++ b/src/main/resources/assets/forge/lang/en_US.lang @@ -145,6 +145,7 @@ fml.configgui.tooltip.defaultNumeric=[range: %s ~ %s, default: %s] forge.controlsgui.shift=SHIFT + %s forge.controlsgui.control=CTRL + %s +forge.controlsgui.control.mac=CMD + %s forge.controlsgui.alt=ALT + %s fml.menu.mods=Mods