[cvs] expresso commit by mtraum: DBMaint i18n fixes (for Nahuel
Espindola)
JCorporate Ltd
jcorp at jcorporate.com
Wed Apr 20 01:59:08 UTC 2005
Log Message:
-----------
DBMaint i18n fixes (for Nahuel Espindola)
Modified Files:
--------------
expresso/expresso-web/expresso/doc:
ChangeLog.xml
expresso/expresso-web/expresso/jsp/dbmaint:
buttons.jsp
list.jsp
confirm.jsp
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core:
MessagesBundle_es.properties
MessagesBundle.properties
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint:
AddUpdate.java
ViewBlob.java
UpdateUpdate.java
Add.java
ListBase.java
DynamicCmd.java
UpdateDelete.java
GetBase.java
Search.java
Update.java
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller:
DBMaint.java
Revision Data
-------------
Index: UpdateUpdate.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/UpdateUpdate.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/UpdateUpdate.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/UpdateUpdate.java -u -r1.22 -r1.23
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/UpdateUpdate.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/UpdateUpdate.java
@@ -162,11 +162,11 @@
super.saveBlobFields(myDBObj);
- addOutput(new Output("title", "Data Saved"));
+ addOutput(new Output("title", res.getString("Data_Saved")));
showUserName("");
showNext = false;
showPrev = false;
- addOutput(new Output("message", "Data Updated"));
+ addOutput(new Output("message", res.getString("Data_Updated")));
showKey(true);
showOptions();
clearFormCache();
Index: UpdateDelete.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/UpdateDelete.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/UpdateDelete.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/UpdateDelete.java -u -r1.10 -r1.11
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/UpdateDelete.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/UpdateDelete.java
@@ -116,8 +116,8 @@
showPrev = false;
showNext = false;
showUserName("");
- addOutput(new Output("title", "Data Deleted"));
- addOutput(new Output("message", "Record Deleted"));
+ addOutput(new Output("title", res.getString("Data_Deleted")));
+ addOutput(new Output("message", res.getString("Record_Deleted")));
showKey(false);
showOptions();
clearFormCache();
Index: Search.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/Search.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/Search.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/Search.java -u -r1.26 -r1.27
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/Search.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/Search.java
@@ -235,7 +235,7 @@
objectMetadata.getName() + " were null");
}
- values.add(new ValidValue("", "All Values"));
+ values.add(new ValidValue("", getString("All_Values")));
oneField.setValidValues(values);
oneField.setDefaultValue("");
} else {
@@ -256,7 +256,7 @@
lookup.setName("lookup");
lookup.addParam("dbobj", lookupObjectName);
lookup.addParam(Controller.STATE_PARAM_KEY, "Search");
- lookup.setDescription("Look up Values");
+ lookup.setDescription(getString("Look_up_Values"));
oneField.addNested(lookup);
} /* if there was a lookup object */
Index: ListBase.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/ListBase.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/ListBase.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/ListBase.java -u -r1.32 -r1.33
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/ListBase.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/ListBase.java
@@ -176,10 +176,9 @@
recordCount = listRecords(sortKey, myTable);
if (recordCount == 0) {
- addOutput(new Output("recordCount", "No records found"));
+ addOutput(new Output("recordCount", getString("No_records_found")));
} else {
- addOutput(new Output("recordCount",
- "" + totalRecordCount + " records found"));
+ addOutput(new Output("recordCount", getString("_records_found", new Object[]{Long.toString(totalRecordCount)})));
addBlock(this.generatePageTransitions(getControllerRequest(),
this.getRecordPaginator(), 10));
@@ -222,7 +221,7 @@
* @param l the User's Locale gathered from the ControllerResponse object
* @return a properly formatted date
*/
- private String displayDateValue(DataFieldMetaData metaData, Date dt, Locale l) {
+ protected String displayDateValue(DataFieldMetaData metaData, Date dt, Locale l) {
if (dt == null) {
return "";
}
@@ -287,14 +286,10 @@
addRecordsToBlock(allRecords, myTable);
}
-
-
-
//xun li add for record count
showNext = paginator.isMoreRecords();
- addOutput(new Output("recordRange",
- "Records " + startShowingRecord + " to " +
- endShowingRecord));
+ addOutput(new Output("recordRange",
+ getString("Records_to_", new Object[]{Integer.toString(startShowingRecord),Integer.toString(endShowingRecord)})));
return totalRecordCount;
} /* listRecords(String, Output) */
@@ -413,7 +408,7 @@
t.setState(state);
t.setControllerObject(controllerClass);
t.addParam("page", Integer.toString(curPage - 1));
- t.setLabel("< Previous");
+ t.setLabel(getString("<_Previous"));
t.setName(Integer.toString(index));
index++;
returnBlock.add(t);
@@ -446,14 +441,14 @@
t.setControllerObject(controllerClass);
t.addParam("page", Integer.toString(curPage + 1));
t.setState(state);
- t.setLabel("Next >");
+ t.setLabel(getString("Next_>"));
t.setName(Integer.toString(index));
index++;
returnBlock.add(t);
}
- addOutput(new Output("pageCount",
- Integer.toString(this.getRecordPaginator().getPageCount()) + " Pages"));
+ addOutput(new Output("pageCount",
+ getString("_Pages", new Object[]{Integer.toString(this.getRecordPaginator().getPageCount())})));
return returnBlock;
}
Index: Add.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/Add.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/Add.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/Add.java -u -r1.24 -r1.25
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/Add.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/Add.java
@@ -193,7 +193,7 @@
lookup.setName("lookup");
lookup.addParam("dbobj", lookupObjectName);
lookup.addParam(Controller.STATE_PARAM_KEY, "Search");
- lookup.setDescription("Look up Values");
+ lookup.setDescription(getString("Look_up_Values"));
i.addNested(lookup);
} /* if there was a lookup object */
Index: Update.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/Update.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/Update.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/Update.java -u -r1.27 -r1.28
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/Update.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/Update.java
@@ -190,7 +190,7 @@
lookup.setName("lookup");
lookup.addParam("dbobj", lookupObjectName);
lookup.addParam(Controller.STATE_PARAM_KEY, "Search");
- lookup.setDescription("Look up Values");
+ lookup.setDescription(getControllerResponse().getString("Look_up_Values"));
oneField.addNested(lookup);
} /* if there was a lookup object */
@@ -217,7 +217,7 @@
if ("file".equalsIgnoreCase(oneField.getType()) &&
myDBObj.getFieldMetaData(oneFieldName).isLongObjectType()) {
- Transition t = new Transition("view", "View"
+ Transition t = new Transition("view", getControllerResponse().getString("View")
, com.jcorporate.expresso.services.controller.DBMaint.class,
"ViewBlob");
t.addParam("fieldName", oneFieldName);
Index: AddUpdate.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/AddUpdate.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/AddUpdate.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/AddUpdate.java -u -r1.17 -r1.18
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/AddUpdate.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/AddUpdate.java
@@ -144,9 +144,9 @@
//Save any updated BLOB fields.
super.saveBlobFields(myDBObj);
- addOutput(new Output("title", "Data Saved."));
+ addOutput(new Output("title", res.getString("Data_Saved")));
showUserName("");
- addOutput(new Output("message", "Record Added"));
+ addOutput(new Output("message", res.getString("Record_Added")));
showNext = false;
showPrev = false;
showKey(true);
Index: GetBase.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/GetBase.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/GetBase.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/GetBase.java -u -r1.19 -r1.20
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/GetBase.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/GetBase.java
@@ -174,10 +174,11 @@
* @param oneField the input to have a nested transition added to if valid.
* @param oneFieldName the name of the field to check
* @throws DBException upon error
+ * @throws ControllerException
*/
protected void addLookupTransition(DataObjectMetaData metadata,
Input oneField,
- String oneFieldName) throws DBException {
+ String oneFieldName) throws DBException, ControllerException {
/* Now, if there is a lookup object specified for the field */
/* add an icon for the user to search this object in a new window */
@@ -209,7 +210,7 @@
lookup.addParam("definition", definitionName);
}
lookup.addParam(Controller.STATE_PARAM_KEY, "Search");
- lookup.setDescription("Look up Values");
+ lookup.setDescription(getString("Look_up_Values"));
oneField.addNested(lookup);
}
} /* if there was a lookup object */
Index: DynamicCmd.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/DynamicCmd.java,v
retrieving revision 1.42
retrieving revision 1.43
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/DynamicCmd.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/DynamicCmd.java -u -r1.42 -r1.43
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/DynamicCmd.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/DynamicCmd.java
@@ -282,12 +282,12 @@
int pos;
while ((pos = newString.indexOf("%20")) > -1) {
- System.out.println("pos:" + pos);
+// System.out.println("pos:" + pos);
newString = newString.substring(0, pos) + " " +
newString.substring(pos + 3);
}
while ((pos = newString.indexOf("%2B")) > -1) {
- System.out.println("pos:" + pos);
+// System.out.println("pos:" + pos);
newString = newString.substring(0, pos) + "+" +
newString.substring(pos + 3);
}
@@ -412,7 +412,7 @@
Transition prevSet = new Transition();
prevSet.setName("prevSet");
- prevSet.setDescription("Previous " + pageLimit + " records");
+ prevSet.setDescription(getString("Previous_records", new Object[]{Integer.toString(pageLimit)}));
prevSet.addParam("dbobj", myDBObjName);
prevSet.addParam(Controller.STATE_PARAM_KEY, "List");
prevSet.addParam("page",
@@ -453,7 +453,7 @@
if (canSearch) {
Transition listAction = new Transition();
listAction.setName("List");
- listAction.setLabel("List");
+ listAction.setLabel(getString("List"));
listAction.addParam("dbobj", myDBObjName);
listAction.addParam(Controller.STATE_PARAM_KEY, "SearchList");
tempParam = getFieldsParam();
@@ -485,7 +485,7 @@
}
- listAction.setDescription("List Selected Records");
+ listAction.setDescription(getString("List_Selected_Records"));
myTable.add(listAction);
}
@@ -505,7 +505,7 @@
if (canAdd) {
Transition addAction = new Transition();
addAction.setName("Add");
- addAction.setLabel("Add");
+ addAction.setLabel(getString("Add"));
addAction.addParam("dbobj", myDBObjName);
addAction.addParam(Controller.STATE_PARAM_KEY, "Add");
if (myDBObj instanceof Defineable) {
@@ -535,14 +535,14 @@
addAction.addParam("back", tempParam);
}
- addAction.setDescription("Add New Record");
+ addAction.setDescription(getString("Add_New_Record"));
myTable.add(addAction);
}
if (canSearch) {
Transition searchAction = new Transition();
searchAction.setName("Search");
- searchAction.setLabel("Search");
+ searchAction.setLabel(getString("Search"));
searchAction.addParam("dbobj", myDBObjName);
searchAction.addParam(Controller.STATE_PARAM_KEY, "Search");
if (myDBObj instanceof Defineable) {
@@ -579,7 +579,7 @@
searchAction.addParam("details", "y");
}
- searchAction.setDescription("Search for Records");
+ searchAction.setDescription(getString("Search_for_Records"));
myTable.add(searchAction);
}
if ((pageLimit > 0) && (showNext)) {
@@ -620,7 +620,7 @@
nextSet.addParam("nocount", "");
}
- nextSet.setDescription("Next " + pageLimit + " records");
+ nextSet.setDescription(getString("Next_records", new Object[]{Integer.toString(pageLimit)}));
myTable.add(nextSet);
}
} /* showOptions() */
@@ -646,7 +646,7 @@
db = "default";
}
if (userName.equals("") || userName.equals("NONE")) {
- unTable.addNested(new Output("userDescrip", "Not logged in"));
+ unTable.addNested(new Output("userDescrip", getString("Not_logged_in")));
} else {
unTable.addNested(new Output("userDescrip", userName));
}
Index: ViewBlob.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/ViewBlob.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/ViewBlob.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/ViewBlob.java -u -r1.12 -r1.13
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/ViewBlob.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/dbmaint/ViewBlob.java
@@ -111,7 +111,7 @@
* Constructor that sets the necessary description and key name.
*/
public ViewBlob() {
- super("ViewBlob", "Binary File Contents");
+ super("ViewBlob", "Binary_File_Contents");
this.addRequiredParameter("fieldName");
}
Index: ChangeLog.xml
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/expresso/doc/ChangeLog.xml,v
retrieving revision 1.301
retrieving revision 1.302
diff -Lexpresso-web/expresso/doc/ChangeLog.xml -Lexpresso-web/expresso/doc/ChangeLog.xml -u -r1.301 -r1.302
--- expresso-web/expresso/doc/ChangeLog.xml
+++ expresso-web/expresso/doc/ChangeLog.xml
@@ -6,6 +6,10 @@
<project name="Expresso">
<version name="5.6.1" releaseDate="Not released yet">
<comment>Continued Updates</comment>
+ <bug-fix title="Internationalization (i18n) fixes for DBMaint">
+ <explanation>Many strings in DBMaint have been i18n'd</explanation>
+ <contributor>Nahuel Espindola</contributor>
+ </bug-fix>
<new-feature title="Added ability to set how quickly Event emails are sent out">
<explanation>The EventHandler throttles the rate at which emails are sent out to minimize the impact on the system load. Previously, these
values were hardcoded to send out 5 emails and then wait 30 seconds. Now, the defaults are 10 emails, waiting 2 seconds in between. These values
Index: list.jsp
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/expresso/jsp/dbmaint/list.jsp,v
retrieving revision 1.23
retrieving revision 1.24
diff -Lexpresso-web/expresso/jsp/dbmaint/list.jsp -Lexpresso-web/expresso/jsp/dbmaint/list.jsp -u -r1.23 -r1.24
--- expresso-web/expresso/jsp/dbmaint/list.jsp
+++ expresso-web/expresso/jsp/dbmaint/list.jsp
@@ -29,7 +29,7 @@
<tr>
<td colspan="3" align="center"><small><bean:write property="recordRange"/>
- of <bean:write property="recordCount"/></small></td>
+ <bean:message key="of"/> <bean:write property="recordCount"/></small></td>
</tr>
<tr>
<td colspan="3" align="center" class="jc-errors"><html:errors/></td>
@@ -69,7 +69,7 @@
</table>
<logic:notPresent property="recordList/1">
<h3 align="center" class="jc-dbmaint-error">
- No Records Found
+ <bean:message key="No_Records_Found"/>
</h3>
</logic:notPresent>
<table class="jc-pagejump-footer" width="100%" cellpadding="0" cellspacing="0">
Index: buttons.jsp
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/expresso/jsp/dbmaint/buttons.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lexpresso-web/expresso/jsp/dbmaint/buttons.jsp -Lexpresso-web/expresso/jsp/dbmaint/buttons.jsp -u -r1.1 -r1.2
--- expresso-web/expresso/jsp/dbmaint/buttons.jsp
+++ expresso-web/expresso/jsp/dbmaint/buttons.jsp
@@ -23,7 +23,8 @@
</logic:notPresent>
<logic:present property="buttons/List.url">
<bean:define id="list" property="buttons/List.url" type="java.lang.String"/>
- <html:link page="<%= list %>" onmouseout="MM_swapImgRestore();" onmouseover="MM_swapImage('documentmag','','../../images/documentmag_f2.png',1);"><img name="documentmag" src="../../images/documentmag.png" width="20" height="20" border="0" alt="List Records" align="ABSMIDDLE"/>
+ <bean:define id="descrip" property="buttons/List.description" type="java.lang.String"/>
+ <html:link page="<%= list %>" onmouseout="MM_swapImgRestore();" onmouseover="MM_swapImage('documentmag','','../../images/documentmag_f2.png',1);"><img name="documentmag" src="../../images/documentmag.png" width="20" height="20" border="0" alt="<%= descrip %>" align="ABSMIDDLE"/>
</html:link>
</logic:present>
<logic:notPresent property="buttons/List.url">
@@ -31,15 +32,17 @@
</logic:notPresent>
<logic:present property="buttons/Add.url">
<bean:define id="add" property="buttons/Add.url" type="java.lang.String"/>
- <html:link page="<%= add %>" onmouseout="MM_swapImgRestore();" onmouseover="MM_swapImage('add','','../../images/add_f2.png',1);"><img name="add" src="../../images/add.png" width="20" height="20" border="0" alt="Add New Record" align="ABSMIDDLE"/>
+ <bean:define id="descrip" property="buttons/Add.description" type="java.lang.String"/>
+ <html:link page="<%= add %>" onmouseout="MM_swapImgRestore();" onmouseover="MM_swapImage('add','','../../images/add_f2.png',1);"><img name="add" src="../../images/add.png" width="20" height="20" border="0" alt="<%= descrip %>" align="ABSMIDDLE"/>
</html:link>
</logic:present>
<logic:notPresent property="buttons/Add.url">
</logic:notPresent>
<logic:present property="buttons/Search.url"> <bean:define id="search" property="buttons/Search.url" type="java.lang.String"/>
+ <bean:define id="descrip" property="buttons/Search.description" type="java.lang.String"/>
<html:link page="<%= search %>" onmouseout="MM_swapImgRestore();" onmouseover="MM_swapImage('binocular','','../../images/binocular_f2.png',1);">
- <img name="binocular" src="../../images/binocular.png" width="20" height="20" border="0" alt="Search" align="ABSMIDDLE"/>
+ <img name="binocular" src="../../images/binocular.png" width="20" height="20" border="0" alt="<%= descrip %>" align="ABSMIDDLE"/>
</html:link>
</logic:present>
<logic:notPresent property="buttons/Search.url">
Index: confirm.jsp
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/expresso/jsp/dbmaint/confirm.jsp,v
retrieving revision 1.7
retrieving revision 1.8
diff -Lexpresso-web/expresso/jsp/dbmaint/confirm.jsp -Lexpresso-web/expresso/jsp/dbmaint/confirm.jsp -u -r1.7 -r1.8
--- expresso-web/expresso/jsp/dbmaint/confirm.jsp
+++ expresso-web/expresso/jsp/dbmaint/confirm.jsp
@@ -31,14 +31,14 @@
<strong><bean:write property="message"/></strong>
</tr>
<tr><td colspan="3" align="center"><br/>
-<small>Record with the following key was affected:</small><br/>
+<small><bean:message key="Record_with_following_key_was_affected"/></small><br/>
</td></tr>
</table>
<table class="jc-formtable" width="100%">
<tr>
<td>
<table align="center" border="1" cellpadding="2" cellspacing="0">
-<expresso:TableHead value="Field|Value"/>
+<expresso:TableHead keys="Field|Value"/>
<logic:iterate id="oneRow" property="key">
<tr scope="row">
<logic:iterate id="oneCell" name="oneRow">
Index: MessagesBundle_es.properties
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/MessagesBundle_es.properties,v
retrieving revision 1.5
retrieving revision 1.6
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/MessagesBundle_es.properties -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/MessagesBundle_es.properties -u -r1.5 -r1.6
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/MessagesBundle_es.properties
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/MessagesBundle_es.properties
@@ -1,4 +1,3 @@
-
Web_Document_Root_Director = Directorio Raiz de los documentos Web en el Servidor
Web_Server_Host_Name = Host Name del Servidor Web
Filename_for_Server_HTML_L = Nombre Archivo para el Log HTML del Servidor
@@ -556,4 +555,48 @@
errors.date={0} no es una fecha.
errors.range={0} no esta entre {1} y {2}.
errors.creditcard={0} no es un nro de tarjeta de credito valida.
-errors.email={0} es una direccion de e-mail invalida.
+errors.email={0} es una direccion de e-mail invalida.
+
+All_Values=Cualquier Valor
+No_records_found=No se han encontrado registros
+_records_found={0} registros encontrados
+<_Previous=< Previo
+Next_>=Próximo >
+_Pages={0} Páginas
+Records_to_=Registros {0} al {1}
+Previous_records=Previos {0} registros
+List_Selected_Records=Listar Registros
+Add_New_Record=Agregar un Registro Nuevo
+Search_for_Records=Buscar Registros
+Next_records=Siguientes {0} registros
+Not_logged_in=No Logueado
+Look_up_Values=Valores Look up
+
+Prompt_to_Select_Schema=Seleccione el Schema
+Select_Database_Object=Seleccione el Database Object
+Prompt_for_New_Record=Ingresar nuevo Registro
+Save_New_Record=Guardar nuevo Registro
+List_Records=Listar Registros
+Prompt_for_Search_Criteria=Ingresar Criterio Búsqueda
+Display_records_found_by_Search=Mostrar registros encontrados por la Búsqueda
+Present_Record_for_Update=Modificación de Registro
+Delete_Record=Borrar Registro
+Update_Record=Modificar Registro
+Binary_File_Contents=Contenido Archivo Binario
+
+Database_Maintenance=Mantenimiento Base de Datos
+
+Choose_Schema=Elija el Schema
+Choose_Database_Object=Elegir el Database Object
+Data_Deleted=Borrar Datos
+Record_Deleted=Registro Borrado
+Data_Saved=Datos Guardados
+Data_Updated=Registro Modificado
+Record_Added=Registro Agregado
+
+Record_with_following_key_was_affected=El registro con la siguiente clave ha sido afectado :
+Field=Campo
+Value=Valor
+No_Records_Found=No se han encontrado registros
+of=de
+
Index: MessagesBundle.properties
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/MessagesBundle.properties,v
retrieving revision 1.22
retrieving revision 1.23
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/MessagesBundle.properties -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/MessagesBundle.properties -u -r1.22 -r1.23
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/MessagesBundle.properties
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/MessagesBundle.properties
@@ -562,4 +562,63 @@
registration.info.approval=Once the administrator has approved or denied your registration, you will be notified via email
registration.success.validate=Login "{0}" was registered successfully in db/context "{1}"
registration.info.validate=You will receive an authorization email at "{0}" in a few moments. Please follow the instructions in the email to proceed with the registration process.
-errors.suffix=.
\ No newline at end of file
+errors.suffix=.
+
+errors.required={0} cannot be null.
+errors.minlength={0} cannot have less than {1} characters.
+errors.maxlength={0} cannot have more than {1} characters.
+errors.invalid={0} is invalid.
+errors.byte={0} should be a byte.
+errors.short={0} should be a short.
+errors.integer={0} should be a integer.
+errors.long={0} should be a long.
+errors.float={0} should be a float.
+errors.double={0} should be a double.
+errors.date={0} should be a date.
+errors.range={0} is not between {1} and {2}.
+errors.creditcard={0} is not a valid credit card number.
+errors.email={0} is not a valid email address.
+
+All_Values=All Values
+No_records_found=No records found
+_records_found={0} records found
+<_Previous=< Previous
+Next_>=Next >
+_Pages={0} Pages
+Records_to_=Records {0} to {1}
+Previous_records=Previous {0} records
+List_Selected_Records=List Selected Records
+Add_New_Record=Add New Record
+Search_for_Records=Search for Records
+Next_records=Next {0} records
+Not_logged_in=Not logged in
+Look_up_Values=Look up Values
+
+Prompt_to_Select_Schema=Prompt to Select Schema
+Select_Database_Object=Select Database Object
+Prompt_for_New_Record=Prompt for New Record
+Save_New_Record=Save New Record
+List_Records=List Records
+Prompt_for_Search_Criteria=Prompt for Search Criteria
+Display_records_found_by_Search=Display records found by Search
+Present_Record_for_Update=Present Record for Update
+Delete_Record=Delete Record
+Update_Record=Update Record
+Binary_File_Contents=Binary File Contents
+
+Database_Maintenance=Database Maintenance
+
+Choose_Schema=Choose Schema
+Choose_Database_Object=Choose Database Object
+
+Data_Deleted=Data Deleted
+Record_Deleted=Record Deleted
+Data_Saved=Data Saved
+Data_Updated=Data Updated
+Record_Added=Record Added
+
+Record_with_following_key_was_affected=Record with the following key was affected :
+Field=Field
+Value=Value
+No_Records_Found=No Records Found
+of=of
Index: DBMaint.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/DBMaint.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/DBMaint.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/DBMaint.java -u -r1.20 -r1.21
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/DBMaint.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/services/controller/DBMaint.java
@@ -132,37 +132,36 @@
*/
public DBMaint() {
super();
- State prompt = new State(PROMPT, "Prompt to Select Schema");
+ State prompt = new State(PROMPT, "Prompt_to_Select_Schema");
addState(prompt);
setInitialState("prompt");
- State selDBObj = new State("selDBObj", "Select Database Object");
+ State selDBObj = new State("selDBObj", "Select_Database_Object");
selDBObj.addRequiredParameter("SchemaClass");
addState(selDBObj);
- State add = new Add(ADD, "Prompt for New Record");
+ State add = new Add(ADD, "Prompt_for_New_Record");
addState(add);
- State addUpdate = new AddUpdate("AddUpdate", "Save New Record");
+ State addUpdate = new AddUpdate("AddUpdate", "Save_New_Record");
addState(addUpdate);
- State list = new List(LIST, "List Records");
+ State list = new List(LIST, "List_Records");
addState(list);
- State search = new Search(SEARCH, "Prompt for Search Criteria");
+ State search = new Search(SEARCH, "Prompt_for_Search_Criteria");
addState(search);
- State searchList = new SearchList("SearchList",
- "Display records found by Search");
+ State searchList = new SearchList("SearchList", "Display_records_found_by_Search");
addState(searchList);
- State update = new Update(UPDATE, "Present Record for Update");
+ State update = new Update(UPDATE, "Present_Record_for_Update");
addState(update);
- State updateDelete = new UpdateDelete("UpdateDelete", "Delete Record");
+ State updateDelete = new UpdateDelete("UpdateDelete", "Delete_Record");
addState(updateDelete);
- State updateUpdate = new UpdateUpdate("UpdateUpdate", "Update Record");
+ State updateUpdate = new UpdateUpdate("UpdateUpdate", "Update_Record");
addState(updateUpdate);
this.addState(new ViewBlob());
@@ -178,7 +177,7 @@
* @return java.lang.String The Title of the controller
*/
public String getTitle() {
- return ("Database Maintenance");
+ return ("Database_Maintenance");
}
/**
@@ -198,11 +197,11 @@
throws ControllerException {
try {
Input chooseSchema = new Input();
- chooseSchema.setLabel("Choose Schema");
+ chooseSchema.setLabel(response.getString("Choose_Schema"));
chooseSchema.setName("SchemaClass");
Vector v2 = new Vector(2);
- v2.addElement(new ValidValue("com.jcorporate.expresso." + "core.ExpressoSchema",
+ v2.addElement(new ValidValue("com.jcorporate.expresso.core.ExpressoSchema",
"General"));
SchemaList sl = new SchemaList(SuperUser.SUPER_USER);
@@ -220,7 +219,7 @@
chooseSchema.setValidValues(v2);
response.addInput(chooseSchema);
- Transition doDBObj = new Transition("Choose Database Object",
+ Transition doDBObj = new Transition(response.getString("Choose_Database_Object"),
getClass().getName());
doDBObj.setName("selDBObj");
doDBObj.addParam(STATE_PARAM_KEY, "selDBObj");
@@ -242,7 +241,7 @@
private void runSelDBObjState(ControllerRequest request, ControllerResponse response)
throws ControllerException {
Input chooseDBobj = new Input();
- chooseDBobj.setLabel("Choose Database Object");
+ chooseDBobj.setLabel(response.getString("Choose_Database_Object"));
chooseDBobj.setName("dbobj");
Vector v2 = new Vector();
More information about the cvs
mailing list