keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Close #2780 add CMD localization for Mac key bindings (#2792)

Browse source
This commit is contained in:
mezz 2016-04-29 12:04:48 -07:00 committed by LexManos
parent 84bfeddc1c
commit 9c9107c434
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/net/minecraftforge/client/settings/KeyModifier.java
View file

@ -31,7 +31,8 @@ public enum KeyModifier {
public String getLocalizedComboName(int keyCode) public String getLocalizedComboName(int keyCode)
{ {
String keyName = GameSettings.getKeyDisplayString(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 { SHIFT {

1
src/main/resources/assets/forge/lang/en_US.lang
View file

@ -145,6 +145,7 @@ fml.configgui.tooltip.defaultNumeric=[range: %s ~ %s, default: %s]
forge.controlsgui.shift=SHIFT + %s forge.controlsgui.shift=SHIFT + %s
forge.controlsgui.control=CTRL + %s forge.controlsgui.control=CTRL + %s
forge.controlsgui.control.mac=CMD + %s
forge.controlsgui.alt=ALT + %s forge.controlsgui.alt=ALT + %s
fml.menu.mods=Mods fml.menu.mods=Mods