java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml | 7 +++++++ java/code/src/com/redhat/rhn/manager/user/CreateUserCommand.java | 3 +-- 2 files changed, 8 insertions(+), 2 deletions(-)
New commits: commit 8ce92515891c64b2e27e534377601add6c7bf17d Author: Jan Pazdziora jpazdziora@redhat.com Date: Tue Apr 17 14:48:42 2012 +0200
Make the Invalid prefix error localizable.
Addressing ERROR com.redhat.rhn.common.localization.LocalizationService - *** ERROR: Message with id: [Invalid prefix [XX]. Must be one of [ , Dr., Hr., Miss, Mr., Mrs., Ms., Sr.]] not found.*** called by com.redhat.rhn.frontend.struts.XmlMessageResources.getMessage(XmlMessageResources.java:85)
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml index 0bfbdd5..0cd1f53 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml @@ -1215,6 +1215,13 @@ http://www.oasis-open.org/committees/xliff/documents/xliff-core-1.1.xsd" </context-group> </trans-unit>
+ <trans-unit id="error.user_invalid_prefix"> +<source>Invalid prefix [{0}]. Must be one of {1}.</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/CreateUser</context> + </context-group> + </trans-unit> + <trans-unit id="login"> <source>Desired Login</source> <context-group name="ctx"> diff --git a/java/code/src/com/redhat/rhn/manager/user/CreateUserCommand.java b/java/code/src/com/redhat/rhn/manager/user/CreateUserCommand.java index 79a5be7..1d18ba9 100644 --- a/java/code/src/com/redhat/rhn/manager/user/CreateUserCommand.java +++ b/java/code/src/com/redhat/rhn/manager/user/CreateUserCommand.java @@ -229,8 +229,7 @@ public class CreateUserCommand { SortedSet validPrefixes = LocalizationService.getInstance().availablePrefixes(); if (!validPrefixes.contains(user.getPrefix())) { errors.add(new ValidatorError( - "Invalid prefix [" + user.getPrefix() + "]. Must be one of " + - validPrefixes.toString())); + "error.user_invalid_prefix", user.getPrefix(), validPrefixes.toString())); } } }