From 1877ae980f19fb2db2b0a6608ae8814133828ff3 Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Fri, 18 Jan 2008 11:08:50 +0000
Subject: [PATCH] Fix for issue 2849: localize the labels in the usage message.
---
opendj-sdk/opends/src/messages/messages/utility.properties | 7 +++++--
opendj-sdk/opends/src/server/org/opends/server/util/args/ArgumentParser.java | 12 ++++--------
2 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/opendj-sdk/opends/src/messages/messages/utility.properties b/opendj-sdk/opends/src/messages/messages/utility.properties
index 2213192..3298d79 100644
--- a/opendj-sdk/opends/src/messages/messages/utility.properties
+++ b/opendj-sdk/opends/src/messages/messages/utility.properties
@@ -20,7 +20,7 @@
#
# CDDL HEADER END
#
-# Portions Copyright 2006-2007 Sun Microsystems, Inc.
+# Portions Copyright 2006-2008 Sun Microsystems, Inc.
@@ -550,4 +550,7 @@
INFO_PROMPT_SINGLE_DEFAULT_261=%s [%s]:
INFO_LDAP_CONN_PROMPT_ADMINISTRATOR_UID_262=Global Administrator User ID [%s]:
INFO_LDAP_CONN_GLOBAL_ADMINISTRATOR_OR_BINDDN_PROMPT_263=Global Administrator \
- User ID (or bind DN if no Global Administrator is defined) [%s]:
\ No newline at end of file
+ User ID (or bind DN if no Global Administrator is defined) [%s]:
+INFO_ARGPARSER_USAGE_JAVA_CLASSNAME_264=Usage: java %s {options}
+INFO_ARGPARSER_USAGE_JAVA_SCRIPTNAME_265=Usage: %s {options}
+INFO_ARGPARSER_USAGE_TRAILINGARGS_266={trailing-arguments}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/util/args/ArgumentParser.java b/opendj-sdk/opends/src/server/org/opends/server/util/args/ArgumentParser.java
index 90654ca..b807c2e 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/util/args/ArgumentParser.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/util/args/ArgumentParser.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Portions Copyright 2006-2007 Sun Microsystems, Inc.
+ * Portions Copyright 2006-2008 Sun Microsystems, Inc.
*/
package org.opends.server.util.args;
import org.opends.messages.Message;
@@ -1366,22 +1366,18 @@
String scriptName = System.getProperty(PROPERTY_SCRIPT_NAME);
if ((scriptName == null) || (scriptName.length() == 0))
{
- buffer.append("Usage: java "); // TODO: i18n
- buffer.append(mainClassName);
+ buffer.append(INFO_ARGPARSER_USAGE_JAVA_CLASSNAME.get(mainClassName));
}
else
{
- buffer.append("Usage: "); // TODO: i18n
- buffer.append(scriptName);
+ buffer.append(INFO_ARGPARSER_USAGE_JAVA_CLASSNAME.get(scriptName));
}
- buffer.append(" {options}"); // TODO: i18n
-
if (allowsTrailingArguments)
{
if (trailingArgsDisplayName == null)
{
- buffer.append(" {trailing-arguments}"); // TODO: i18n
+ buffer.append(" "+INFO_ARGPARSER_USAGE_TRAILINGARGS.get());
}
else
{
--
Gitblit v1.10.0