From f0adfb2b4c364810c91b8c87799adfe7ba224d83 Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Mon, 11 Feb 2008 23:52:21 +0000
Subject: [PATCH] Fix for issue 2130 (i18n CLI usage placeholders)
---
opendj-sdk/opends/src/server/org/opends/server/tools/dsconfig/SubCommandHandler.java | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/dsconfig/SubCommandHandler.java b/opendj-sdk/opends/src/server/org/opends/server/tools/dsconfig/SubCommandHandler.java
index e93717a..0458732 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/dsconfig/SubCommandHandler.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/dsconfig/SubCommandHandler.java
@@ -22,13 +22,14 @@
* CDDL HEADER END
*
*
- * Portions Copyright 2007 Sun Microsystems, Inc.
+ * Copyright 2007-2008 Sun Microsystems, Inc.
*/
package org.opends.server.tools.dsconfig;
import static org.opends.messages.DSConfigMessages.*;
+import static org.opends.messages.ToolMessages.*;
import java.io.PrintStream;
import java.util.ArrayList;
@@ -468,19 +469,20 @@
// Use syntax and description from naming property.
PropertyDefinitionUsageBuilder b =
new PropertyDefinitionUsageBuilder(false);
- String usage = "{" + b.getUsage(pd) + "}";
+ Message usage = Message.raw("{" + b.getUsage(pd) + "}");
arg = new StringArgument(argName, null, argName, false, true,
usage, INFO_DSCFG_DESCRIPTION_NAME_CREATE_EXT.get(d
.getUserFriendlyName(), pd.getName(), pd.getSynopsis()));
} else {
arg = new StringArgument(argName, null, argName, false, true,
- "{NAME}", INFO_DSCFG_DESCRIPTION_NAME_CREATE.get(d
- .getUserFriendlyName()));
+ INFO_NAME_PLACEHOLDER.get(),
+ INFO_DSCFG_DESCRIPTION_NAME_CREATE.get(
+ d.getUserFriendlyName()));
}
} else {
// A normal naming argument.
arg = new StringArgument(argName, null, argName, false, true,
- "{NAME}", INFO_DSCFG_DESCRIPTION_NAME.get(
+ INFO_NAME_PLACEHOLDER.get(), INFO_DSCFG_DESCRIPTION_NAME.get(
d.getUserFriendlyName()));
}
subCommand.addArgument(arg);
@@ -1069,7 +1071,8 @@
throws ArgumentException {
this.propertyArgument = new StringArgument(OPTION_DSCFG_LONG_PROPERTY,
OPTION_DSCFG_SHORT_PROPERTY, OPTION_DSCFG_LONG_PROPERTY, false, true,
- true, "{PROP}", null, null, INFO_DSCFG_DESCRIPTION_PROP.get());
+ true, INFO_PROPERTY_PLACEHOLDER.get(), null, null,
+ INFO_DSCFG_DESCRIPTION_PROP.get());
subCommand.addArgument(propertyArgument);
}
@@ -1106,7 +1109,7 @@
throws ArgumentException {
this.unitSizeArgument = new StringArgument(OPTION_DSCFG_LONG_UNIT_SIZE,
OPTION_DSCFG_SHORT_UNIT_SIZE, OPTION_DSCFG_LONG_UNIT_SIZE, false, true,
- "{UNIT}", INFO_DSCFG_DESCRIPTION_UNIT_SIZE.get());
+ INFO_UNIT_PLACEHOLDER.get(), INFO_DSCFG_DESCRIPTION_UNIT_SIZE.get());
this.unitSizeArgument.setPropertyName(OPTION_DSCFG_LONG_UNIT_SIZE);
subCommand.addArgument(unitSizeArgument);
@@ -1126,7 +1129,7 @@
throws ArgumentException {
this.unitTimeArgument = new StringArgument(OPTION_DSCFG_LONG_UNIT_TIME,
OPTION_DSCFG_SHORT_UNIT_TIME, OPTION_DSCFG_LONG_UNIT_TIME, false, true,
- "{UNIT}", INFO_DSCFG_DESCRIPTION_UNIT_TIME.get());
+ INFO_UNIT_PLACEHOLDER.get(), INFO_DSCFG_DESCRIPTION_UNIT_TIME.get());
this.unitTimeArgument.setPropertyName(OPTION_DSCFG_LONG_UNIT_TIME);
subCommand.addArgument(unitTimeArgument);
--
Gitblit v1.10.0