From 8cd9942be6d7deb2f9254d3a173f51c31a4056ba Mon Sep 17 00:00:00 2001
From: GJ <gjmcferrin@gmail.com>
Date: Tue, 12 Feb 2013 11:37:37 -0500
Subject: [PATCH] Prevent accidental overtranslation of our commands.

---
 .../nossr50/party/commands/PartyCommand.java  | 20 +++++++++----------
 .../resources/locale/locale_en_US.properties  | 18 ++++++++---------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/main/java/com/gmail/nossr50/party/commands/PartyCommand.java b/src/main/java/com/gmail/nossr50/party/commands/PartyCommand.java
index 5cb144dff..6a83d1434 100644
--- a/src/main/java/com/gmail/nossr50/party/commands/PartyCommand.java
+++ b/src/main/java/com/gmail/nossr50/party/commands/PartyCommand.java
@@ -121,20 +121,20 @@ public class PartyCommand implements CommandExecutor {
     }
 
     private boolean printUsage() {
-        player.sendMessage(LocaleLoader.getString("Party.Help.0", "<" + LocaleLoader.getString("Commands.Usage.Player") + ">", "[" + LocaleLoader.getString("Commands.Usage.Password") + "]"));
-        player.sendMessage(LocaleLoader.getString("Party.Help.1", "<" + LocaleLoader.getString("Commands.Usage.PartyName") + ">", "[" + LocaleLoader.getString("Commands.Usage.Password") + "]"));
-        player.sendMessage(LocaleLoader.getString("Party.Help.2"));
+        player.sendMessage(LocaleLoader.getString("Party.Help.0", "/party join"));
+        player.sendMessage(LocaleLoader.getString("Party.Help.1", "/party create"));
+        player.sendMessage(LocaleLoader.getString("Party.Help.2", "/party ?"));
         return true;
     }
 
     private boolean printHelp() {
-        player.sendMessage(LocaleLoader.getString("Party.Help.3"));
-        player.sendMessage(LocaleLoader.getString("Party.Help.1"));
-        player.sendMessage(LocaleLoader.getString("Party.Help.4"));
-        player.sendMessage(LocaleLoader.getString("Party.Help.5"));
-        player.sendMessage(LocaleLoader.getString("Party.Help.6"));
-        player.sendMessage(LocaleLoader.getString("Party.Help.7"));
-        player.sendMessage(LocaleLoader.getString("Party.Help.8"));
+        player.sendMessage(LocaleLoader.getString("Party.Help.3", "/party join", "/party quit"));
+        player.sendMessage(LocaleLoader.getString("Party.Help.1", "/party create")); 
+        player.sendMessage(LocaleLoader.getString("Party.Help.4", "/party <lock|unlock>"));
+        player.sendMessage(LocaleLoader.getString("Party.Help.5", "/party password"));
+        player.sendMessage(LocaleLoader.getString("Party.Help.6", "/party kick"));
+        player.sendMessage(LocaleLoader.getString("Party.Help.7", "/party owner"));
+        player.sendMessage(LocaleLoader.getString("Party.Help.8", "/party disband"));
         return true;
     }
 }
diff --git a/src/main/resources/locale/locale_en_US.properties b/src/main/resources/locale/locale_en_US.properties
index 6c41eabbb..a60ce237b 100644
--- a/src/main/resources/locale/locale_en_US.properties
+++ b/src/main/resources/locale/locale_en_US.properties
@@ -507,15 +507,15 @@ mcMMO.NoSkillNote=[[DARK_GRAY]]If you don't have access to a skill it will not b
 
 ##party
 Party.Forbidden=[mcMMO] Parties not permitted on this world (See Permissions)
-Party.Help.0=[[RED]]Proper usage is [[DARK_AQUA]]/party join {0} {1}.
-Party.Help.1=[[RED]]To create a party, use [[DARK_AQUA]]/party create <name> [password]
-Party.Help.2=[[RED]]Consult [[DARK_AQUA]]/party ? [[RED]]for more information
-Party.Help.3=[[RED]]Use [[DARK_AQUA]]/party join <player> [[RED]]to join or [[DARK_AQUA]]/party quit [[RED]]to quit
-Party.Help.4=[[RED]]To lock or unlock your party, use [[DARK_AQUA]]/party <lock>
-Party.Help.5=[[RED]]To password protect your party, use [[DARK_AQUA]]/party password <password>
-Party.Help.6=[[RED]]To kick a player from your party, use [[DARK_AQUA]]/party kick <player>
-Party.Help.7=[[RED]]To transfer ownership of your party, use [[DARK_AQUA]]/party owner <player>
-Party.Help.8=[[RED]]To disband your party, use [[DARK_AQUA]]/party disband
+Party.Help.0=[[RED]]Proper usage is [[DARK_AQUA]]{0} <player> [password].
+Party.Help.1=[[RED]]To create a party, use [[DARK_AQUA]]{0} <name> [password].
+Party.Help.2=[[RED]]Consult [[DARK_AQUA]]{0} [[RED]]for more information
+Party.Help.3=[[RED]]Use [[DARK_AQUA]]{0} <player> [password] [[RED]]to join or [[DARK_AQUA]]{1} [[RED]]to quit
+Party.Help.4=[[RED]]To lock or unlock your party, use [[DARK_AQUA]]{0}
+Party.Help.5=[[RED]]To password protect your party, use [[DARK_AQUA]]{0} <password>
+Party.Help.6=[[RED]]To kick a player from your party, use [[DARK_AQUA]]{0} <player>
+Party.Help.7=[[RED]]To transfer ownership of your party, use [[DARK_AQUA]]{0} <player>
+Party.Help.8=[[RED]]To disband your party, use [[DARK_AQUA]]{0}
 Party.InformedOnJoin={0} [[GREEN]]has joined your party
 Party.InformedOnQuit={0} [[GREEN]]has left your party
 Party.InformedOnNameChange=[[GOLD]]{0} [[GREEN]]has set the party name to [[WHITE]]{1}