Revision: 1340
Author: ge0ffrey
Date: 2006-08-24 08:06:20 -0700 (Thu, 24 Aug 2006)
ViewCVS: http://svn.sourceforge.net/spring-rich-c/?rev=1340&view=rev
Log Message:
-----------
standarize finishSuccess message and title i18n keys and fill in en + nl for
finishSuccessTitle
Modified Paths:
--------------
trunk/spring-richclient/support/src/main/java/org/springframework/richclient/dialog/ApplicationDialog.java
trunk/spring-richclient/support/src/main/resources/org/springframework/richclient/application/messages.properties
trunk/spring-richclient/support/src/main/resources/org/springframework/richclient/application/messages_nl.properties
Modified:
trunk/spring-richclient/support/src/main/java/org/springframework/richclient/dialog/ApplicationDialog.java
===================================================================
---
trunk/spring-richclient/support/src/main/java/org/springframework/richclient/dialog/ApplicationDialog.java
2006-08-24 12:02:25 UTC (rev 1339)
+++
trunk/spring-richclient/support/src/main/java/org/springframework/richclient/dialog/ApplicationDialog.java
2006-08-24 15:06:20 UTC (rev 1340)
@@ -78,8 +78,12 @@
protected static final String DEFAULT_CANCEL_COMMAND_ID = "cancelCommand";
- protected static final String DEFAULT_SUCCESS_MESSAGE_KEY =
"defaultFinishSuccessMessage";
+ protected static final String DEFAULT_FINISH_SUCCESS_MESSAGE_KEY =
"defaultFinishSuccessMessage";
+ protected static final String DEFAULT_FINISH_SUCCESS_TITLE_KEY =
"defaultFinishSuccessTitle";
+ protected static final String SUCCESS_FINISH_MESSAGE_KEY =
"finishSuccessMessage";
+ protected static final String SUCCESS_FINISH_TITLE_KEY =
"finishSuccessTitle";
+
protected final Log logger = LogFactory.getLog(getClass());
private final DialogEventHandler dialogEventHandler = new
DialogEventHandler();
@@ -394,12 +398,11 @@
protected String getFinishSuccessMessage() {
ActionCommand callingCommand = getCallingCommand();
if (callingCommand != null) {
- String[] successMessageKeys = new String[] {callingCommand.getId()
+ ".successMessage",
- DEFAULT_SUCCESS_MESSAGE_KEY};
+ String[] successMessageKeys = new String[] {callingCommand.getId()
+ "." + SUCCESS_FINISH_MESSAGE_KEY,
+ DEFAULT_FINISH_SUCCESS_MESSAGE_KEY};
return getMessage(successMessageKeys,
getFinishSuccessMessageArguments());
}
-
- return getMessage(DEFAULT_SUCCESS_MESSAGE_KEY);
+ return getMessage(DEFAULT_FINISH_SUCCESS_MESSAGE_KEY);
}
protected ActionCommand getCallingCommand() {
@@ -411,7 +414,13 @@
}
protected String getFinishSuccessTitle() {
- return getMessage("finishSuccessTitle",
getFinishSuccessTitleArguments());
+ ActionCommand callingCommand = getCallingCommand();
+ if (callingCommand != null) {
+ String[] successTitleKeys = new String[] {callingCommand.getId() +
"." + SUCCESS_FINISH_TITLE_KEY,
+ DEFAULT_FINISH_SUCCESS_TITLE_KEY};
+ return getMessage(successTitleKeys,
getFinishSuccessTitleArguments());
+ }
+ return getMessage(DEFAULT_FINISH_SUCCESS_TITLE_KEY);
}
protected Object[] getFinishSuccessTitleArguments() {
Modified:
trunk/spring-richclient/support/src/main/resources/org/springframework/richclient/application/messages.properties
===================================================================
---
trunk/spring-richclient/support/src/main/resources/org/springframework/richclient/application/messages.properties
2006-08-24 12:02:25 UTC (rev 1339)
+++
trunk/spring-richclient/support/src/main/resources/org/springframework/richclient/application/messages.properties
2006-08-24 15:06:20 UTC (rev 1340)
@@ -73,7 +73,8 @@
loginCommand.label=&[EMAIL PROTECTED] L
loginCommand.caption=Authenticate your account with the system.
-loginCommand.successMessage=Login Successful
+loginCommand.finishSuccessTitle=Login successful
+loginCommand.finishSuccessMessage=Login Successful
loginForm.title=Login
loginForm.credentials.title=Credentials
Modified:
trunk/spring-richclient/support/src/main/resources/org/springframework/richclient/application/messages_nl.properties
===================================================================
---
trunk/spring-richclient/support/src/main/resources/org/springframework/richclient/application/messages_nl.properties
2006-08-24 12:02:25 UTC (rev 1339)
+++
trunk/spring-richclient/support/src/main/resources/org/springframework/richclient/application/messages_nl.properties
2006-08-24 15:06:20 UTC (rev 1340)
@@ -73,7 +73,8 @@
loginCommand.label=&[EMAIL PROTECTED] L
loginCommand.caption=Authenticate your account with the system.
-loginCommand.successMessage=Login gelukt
+loginCommand.finishSuccessTitle=Login gelukt
+loginCommand.finishSuccessMessage=Login gelukt
loginForm.title=Login
loginForm.credentials.title=Legitimatie
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
spring-rich-c-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/spring-rich-c-cvs
