svnno****@sourc*****
svnno****@sourc*****
2008年 11月 18日 (火) 09:49:31 JST
Revision: 1360
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1360
Author: shinsuke
Date: 2008-11-18 09:49:30 +0900 (Tue, 18 Nov 2008)
Log Message:
-----------
i18ned display name, disabled config tool.
Modified Paths:
--------------
scheduler/trunk/src/main/java/jp/sf/pal/scheduler/db/exentity/UserInfo.java
scheduler/trunk/src/main/resources/application.properties
scheduler/trunk/src/main/resources/application_ja.properties
scheduler/trunk/src/main/webapp/WEB-INF/portlet.xml
scheduler/trunk/src/main/webapp/WEB-INF/view/admin/onetimeSchedule/confirm.jsp
scheduler/trunk/src/main/webapp/WEB-INF/view/admin/onetimeSchedule/edit.jsp
scheduler/trunk/src/main/webapp/WEB-INF/view/admin/onetimeSchedule/userlist.jsp
scheduler/trunk/src/main/webapp/WEB-INF/view/admin/repeatSchedule/confirm.jsp
scheduler/trunk/src/main/webapp/WEB-INF/view/admin/repeatSchedule/edit.jsp
scheduler/trunk/src/main/webapp/WEB-INF/view/admin/repeatSchedule/userlist.jsp
scheduler/trunk/src/main/webapp/WEB-INF/view/user/onetimeSchedule/confirm.jsp
scheduler/trunk/src/main/webapp/WEB-INF/view/user/onetimeSchedule/edit.jsp
scheduler/trunk/src/main/webapp/WEB-INF/view/user/onetimeSchedule/userlist.jsp
scheduler/trunk/src/main/webapp/WEB-INF/view/user/repeatSchedule/confirm.jsp
scheduler/trunk/src/main/webapp/WEB-INF/view/user/repeatSchedule/edit.jsp
scheduler/trunk/src/main/webapp/WEB-INF/view/user/repeatSchedule/userlist.jsp
-------------- next part --------------
Modified: scheduler/trunk/src/main/java/jp/sf/pal/scheduler/db/exentity/UserInfo.java
===================================================================
--- scheduler/trunk/src/main/java/jp/sf/pal/scheduler/db/exentity/UserInfo.java 2008-11-17 15:11:35 UTC (rev 1359)
+++ scheduler/trunk/src/main/java/jp/sf/pal/scheduler/db/exentity/UserInfo.java 2008-11-18 00:49:30 UTC (rev 1360)
@@ -17,23 +17,31 @@
/** Serial version UID. (Default) */
private static final long serialVersionUID = 1L;
- public String getDisplayName() {
- // TODO i18n
- StringBuilder buf = new StringBuilder();
- if (!StringUtils.isEmpty(getFamilyName())) {
- buf.append(getFamilyName());
- }
- if (!StringUtils.isEmpty(getFamilyName())
- && !StringUtils.isEmpty(getGivenName())) {
- buf.append(" ");
- }
- if (!StringUtils.isEmpty(getGivenName())) {
- buf.append(getGivenName());
- }
- String displayName = buf.toString();
- if (StringUtils.isEmpty(displayName)) {
+ public String getNameArg0() {
+ if (StringUtils.isEmpty(getGivenName())
+ && StringUtils.isEmpty(getFamilyName())) {
return getUserId();
}
- return displayName;
+ return getGivenName() != null ? getGivenName() : "";
}
+
+ public String getNameArg1() {
+ return getFamilyName() != null ? getFamilyName() : "";
+ }
+
+ public String getNameArg2() {
+ if (StringUtils.isEmpty(getGivenName())
+ && StringUtils.isEmpty(getFamilyName())) {
+ return "";
+ }
+ return getMiddleName() != null ? getMiddleName() : "";
+ }
+
+ public String getNameArg3() {
+ return getGivenNameDesc() != null ? getGivenNameDesc() : "";
+ }
+
+ public String getNameArg4() {
+ return getFamilyNameDesc() != null ? getFamilyNameDesc() : "";
+ }
}
Modified: scheduler/trunk/src/main/resources/application.properties
===================================================================
--- scheduler/trunk/src/main/resources/application.properties 2008-11-17 15:11:35 UTC (rev 1359)
+++ scheduler/trunk/src/main/resources/application.properties 2008-11-18 00:49:30 UTC (rev 1360)
@@ -5,6 +5,11 @@
msg.header=<ul>
msg.footer=</ul>
+# 0: Given name, 1: Family name, 2: Middle Name
+display.name={0} {2} {1}
+# 0: Given name, 1: Family name, 2: Middle Name, 3: Given name(Reading), 4: Family name(Reading)
+long.display.name={0} {2} {1}
+
errors.invalid={0} is invalid.
errors.maxlength={0} can not be greater than {1} characters.
errors.minlength={0} can not be less than {1} characters.
Modified: scheduler/trunk/src/main/resources/application_ja.properties
===================================================================
--- scheduler/trunk/src/main/resources/application_ja.properties 2008-11-17 15:11:35 UTC (rev 1359)
+++ scheduler/trunk/src/main/resources/application_ja.properties 2008-11-18 00:49:30 UTC (rev 1360)
@@ -1,3 +1,8 @@
+# 0: Given name, 1: Family name, 2: Middle Name
+display.name={1} {0}
+# 0: Given name, 1: Family name, 2: Middle Name, 3: Given name(Reading), 4: Family name(Reading)
+long.display.name={1} {0} ({4} {3})
+
errors.invalid={0} \u306b\u306f\u6b63\u3057\u3044\u5f62\u5f0f\u306e\u30c7\u30fc\u30bf\u3092\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044\u3002
errors.maxlength={0} \u306f {1} \u6587\u5b57\u4ee5\u4e0b\u3067\u306a\u304f\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002
errors.minlength={0} \u306f {1} \u6587\u5b57\u4ee5\u4e0a\u5165\u529b\u3057\u306a\u304f\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002
Modified: scheduler/trunk/src/main/webapp/WEB-INF/portlet.xml
===================================================================
--- scheduler/trunk/src/main/webapp/WEB-INF/portlet.xml 2008-11-17 15:11:35 UTC (rev 1359)
+++ scheduler/trunk/src/main/webapp/WEB-INF/portlet.xml 2008-11-18 00:49:30 UTC (rev 1360)
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<portlet-app version="1.0">
+<!--
<portlet>
<portlet-name>SchedulerConfig</portlet-name>
<display-name>Scheduler: Scheduler Configuration</display-name>
@@ -22,6 +23,7 @@
<keywords>Scheduler,URL</keywords>
</portlet-info>
</portlet>
+ -->
<portlet>
<portlet-name>SchedulerManager</portlet-name>
<display-name>Scheduler: Scheduler Manager</display-name>
Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/admin/onetimeSchedule/confirm.jsp
===================================================================
--- scheduler/trunk/src/main/webapp/WEB-INF/view/admin/onetimeSchedule/confirm.jsp 2008-11-17 15:11:35 UTC (rev 1359)
+++ scheduler/trunk/src/main/webapp/WEB-INF/view/admin/onetimeSchedule/confirm.jsp 2008-11-18 00:49:30 UTC (rev 1360)
@@ -72,7 +72,7 @@
</tr>
<c:forEach var="u" varStatus="s" items="${selectedUserItems}">
<tr>
- <td>${f:h(u.displayName)}</td>
+ <td><bean:message key="display.name" arg0="${f:h(u.nameArg0)}" arg1="${f:h(u.nameArg1)}" arg2="${f:h(u.nameArg2)}"/></td>
</tr>
</c:forEach>
</tbody>
Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/admin/onetimeSchedule/edit.jsp
===================================================================
--- scheduler/trunk/src/main/webapp/WEB-INF/view/admin/onetimeSchedule/edit.jsp 2008-11-17 15:11:35 UTC (rev 1359)
+++ scheduler/trunk/src/main/webapp/WEB-INF/view/admin/onetimeSchedule/edit.jsp 2008-11-18 00:49:30 UTC (rev 1360)
@@ -73,7 +73,7 @@
</tr>
<c:forEach var="u" varStatus="s" items="${selectedUserItems}">
<tr>
- <td>${f:h(u.displayName)}</td>
+ <td><bean:message key="display.name" arg0="${f:h(u.nameArg0)}" arg1="${f:h(u.nameArg1)}" arg2="${f:h(u.nameArg2)}"/></td>
</tr>
</c:forEach>
</tbody>
Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/admin/onetimeSchedule/userlist.jsp
===================================================================
--- scheduler/trunk/src/main/webapp/WEB-INF/view/admin/onetimeSchedule/userlist.jsp 2008-11-17 15:11:35 UTC (rev 1359)
+++ scheduler/trunk/src/main/webapp/WEB-INF/view/admin/onetimeSchedule/userlist.jsp 2008-11-18 00:49:30 UTC (rev 1360)
@@ -44,7 +44,7 @@
<html:select property="addedUsers" multiple="true" size="10" style="width:180px;">
<!-- TODO i18n -->
<c:forEach var="u" varStatus="s" items="${availableUserItems}">
- <html:option value="${f:u(u.userId)}">${f:h(u.displayName)}</html:option>
+ <html:option value="${f:u(u.userId)}"><bean:message key="display.name" arg0="${f:h(u.nameArg0)}" arg1="${f:h(u.nameArg1)}" arg2="${f:h(u.nameArg2)}"/></html:option>
</c:forEach>
</html:select>
</td>
@@ -69,7 +69,7 @@
<html:select property="removedUsers" multiple="true" size="10" style="width:180px;">
<!-- TODO i18n -->
<c:forEach var="u" varStatus="s" items="${selectedUserItems}">
- <html:option value="${f:u(u.userId)}">${f:h(u.displayName)}</html:option>
+ <html:option value="${f:u(u.userId)}"><bean:message key="display.name" arg0="${f:h(u.nameArg0)}" arg1="${f:h(u.nameArg1)}" arg2="${f:h(u.nameArg2)}"/></html:option>
</c:forEach>
</html:select>
<html:select property="selectedUsers" multiple="true" style="display:none;">
Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/admin/repeatSchedule/confirm.jsp
===================================================================
--- scheduler/trunk/src/main/webapp/WEB-INF/view/admin/repeatSchedule/confirm.jsp 2008-11-17 15:11:35 UTC (rev 1359)
+++ scheduler/trunk/src/main/webapp/WEB-INF/view/admin/repeatSchedule/confirm.jsp 2008-11-18 00:49:30 UTC (rev 1360)
@@ -85,7 +85,7 @@
</tr>
<c:forEach var="u" varStatus="s" items="${selectedUserItems}">
<tr>
- <td>${f:h(u.displayName)}</td>
+ <td><bean:message key="display.name" arg0="${f:h(u.nameArg0)}" arg1="${f:h(u.nameArg1)}" arg2="${f:h(u.nameArg2)}"/></td>
</tr>
</c:forEach>
</tbody>
Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/admin/repeatSchedule/edit.jsp
===================================================================
--- scheduler/trunk/src/main/webapp/WEB-INF/view/admin/repeatSchedule/edit.jsp 2008-11-17 15:11:35 UTC (rev 1359)
+++ scheduler/trunk/src/main/webapp/WEB-INF/view/admin/repeatSchedule/edit.jsp 2008-11-18 00:49:30 UTC (rev 1360)
@@ -87,7 +87,7 @@
</tr>
<c:forEach var="u" varStatus="s" items="${selectedUserItems}">
<tr>
- <td>${f:h(u.displayName)}</td>
+ <td><bean:message key="display.name" arg0="${f:h(u.nameArg0)}" arg1="${f:h(u.nameArg1)}" arg2="${f:h(u.nameArg2)}"/></td>
</tr>
</c:forEach>
</tbody>
Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/admin/repeatSchedule/userlist.jsp
===================================================================
--- scheduler/trunk/src/main/webapp/WEB-INF/view/admin/repeatSchedule/userlist.jsp 2008-11-17 15:11:35 UTC (rev 1359)
+++ scheduler/trunk/src/main/webapp/WEB-INF/view/admin/repeatSchedule/userlist.jsp 2008-11-18 00:49:30 UTC (rev 1360)
@@ -45,7 +45,7 @@
<html:select property="addedUsers" multiple="true" size="10" style="width:180px;">
<!-- TODO i18n -->
<c:forEach var="u" varStatus="s" items="${availableUserItems}">
- <html:option value="${f:u(u.userId)}">${f:h(u.displayName)}</html:option>
+ <html:option value="${f:u(u.userId)}"><bean:message key="display.name" arg0="${f:h(u.nameArg0)}" arg1="${f:h(u.nameArg1)}" arg2="${f:h(u.nameArg2)}"/></html:option>
</c:forEach>
</html:select>
</td>
@@ -70,7 +70,7 @@
<html:select property="removedUsers" multiple="true" size="10" style="width:180px;">
<!-- TODO i18n -->
<c:forEach var="u" varStatus="s" items="${selectedUserItems}">
- <html:option value="${f:u(u.userId)}">${f:h(u.displayName)}</html:option>
+ <html:option value="${f:u(u.userId)}"><bean:message key="display.name" arg0="${f:h(u.nameArg0)}" arg1="${f:h(u.nameArg1)}" arg2="${f:h(u.nameArg2)}"/></html:option>
</c:forEach>
</html:select>
<html:select property="selectedUsers" multiple="true" style="display:none;">
Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/user/onetimeSchedule/confirm.jsp
===================================================================
--- scheduler/trunk/src/main/webapp/WEB-INF/view/user/onetimeSchedule/confirm.jsp 2008-11-17 15:11:35 UTC (rev 1359)
+++ scheduler/trunk/src/main/webapp/WEB-INF/view/user/onetimeSchedule/confirm.jsp 2008-11-18 00:49:30 UTC (rev 1360)
@@ -80,7 +80,7 @@
</tr>
<c:forEach var="u" varStatus="s" items="${selectedUserItems}">
<tr>
- <td>${f:h(u.displayName)}</td>
+ <td><bean:message key="display.name" arg0="${f:h(u.nameArg0)}" arg1="${f:h(u.nameArg1)}" arg2="${f:h(u.nameArg2)}"/></td>
</tr>
</c:forEach>
</tbody>
Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/user/onetimeSchedule/edit.jsp
===================================================================
--- scheduler/trunk/src/main/webapp/WEB-INF/view/user/onetimeSchedule/edit.jsp 2008-11-17 15:11:35 UTC (rev 1359)
+++ scheduler/trunk/src/main/webapp/WEB-INF/view/user/onetimeSchedule/edit.jsp 2008-11-18 00:49:30 UTC (rev 1360)
@@ -147,7 +147,7 @@
</tr>
<c:forEach var="u" varStatus="s" items="${selectedUserItems}">
<tr>
- <td>${f:h(u.displayName)}</td>
+ <td><bean:message key="display.name" arg0="${f:h(u.nameArg0)}" arg1="${f:h(u.nameArg1)}" arg2="${f:h(u.nameArg2)}"/></td>
</tr>
</c:forEach>
</tbody>
Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/user/onetimeSchedule/userlist.jsp
===================================================================
--- scheduler/trunk/src/main/webapp/WEB-INF/view/user/onetimeSchedule/userlist.jsp 2008-11-17 15:11:35 UTC (rev 1359)
+++ scheduler/trunk/src/main/webapp/WEB-INF/view/user/onetimeSchedule/userlist.jsp 2008-11-18 00:49:30 UTC (rev 1360)
@@ -52,7 +52,7 @@
<html:select property="addedUsers" multiple="true" size="10" style="width:180px;">
<!-- TODO i18n -->
<c:forEach var="u" varStatus="s" items="${availableUserItems}">
- <html:option value="${f:u(u.userId)}">${f:h(u.displayName)}</html:option>
+ <html:option value="${f:u(u.userId)}"><bean:message key="display.name" arg0="${f:h(u.nameArg0)}" arg1="${f:h(u.nameArg1)}" arg2="${f:h(u.nameArg2)}"/></html:option>
</c:forEach>
</html:select>
</td>
@@ -77,7 +77,7 @@
<html:select property="removedUsers" multiple="true" size="10" style="width:180px;">
<!-- TODO i18n -->
<c:forEach var="u" varStatus="s" items="${selectedUserItems}">
- <html:option value="${f:u(u.userId)}">${f:h(u.displayName)}</html:option>
+ <html:option value="${f:u(u.userId)}"><bean:message key="display.name" arg0="${f:h(u.nameArg0)}" arg1="${f:h(u.nameArg1)}" arg2="${f:h(u.nameArg2)}"/></html:option>
</c:forEach>
</html:select>
<html:select property="selectedUsers" multiple="true" style="display:none;">
Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/user/repeatSchedule/confirm.jsp
===================================================================
--- scheduler/trunk/src/main/webapp/WEB-INF/view/user/repeatSchedule/confirm.jsp 2008-11-17 15:11:35 UTC (rev 1359)
+++ scheduler/trunk/src/main/webapp/WEB-INF/view/user/repeatSchedule/confirm.jsp 2008-11-18 00:49:30 UTC (rev 1360)
@@ -93,7 +93,7 @@
</tr>
<c:forEach var="u" varStatus="s" items="${selectedUserItems}">
<tr>
- <td>${f:h(u.displayName)}</td>
+ <td><bean:message key="display.name" arg0="${f:h(u.nameArg0)}" arg1="${f:h(u.nameArg1)}" arg2="${f:h(u.nameArg2)}"/></td>
</tr>
</c:forEach>
</tbody>
Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/user/repeatSchedule/edit.jsp
===================================================================
--- scheduler/trunk/src/main/webapp/WEB-INF/view/user/repeatSchedule/edit.jsp 2008-11-17 15:11:35 UTC (rev 1359)
+++ scheduler/trunk/src/main/webapp/WEB-INF/view/user/repeatSchedule/edit.jsp 2008-11-18 00:49:30 UTC (rev 1360)
@@ -164,7 +164,7 @@
</tr>
<c:forEach var="u" varStatus="s" items="${selectedUserItems}">
<tr>
- <td>${f:h(u.displayName)}</td>
+ <td><bean:message key="display.name" arg0="${f:h(u.nameArg0)}" arg1="${f:h(u.nameArg1)}" arg2="${f:h(u.nameArg2)}"/></td>
</tr>
</c:forEach>
</tbody>
Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/user/repeatSchedule/userlist.jsp
===================================================================
--- scheduler/trunk/src/main/webapp/WEB-INF/view/user/repeatSchedule/userlist.jsp 2008-11-17 15:11:35 UTC (rev 1359)
+++ scheduler/trunk/src/main/webapp/WEB-INF/view/user/repeatSchedule/userlist.jsp 2008-11-18 00:49:30 UTC (rev 1360)
@@ -26,7 +26,7 @@
<s:form>
<div style="margin-top:3px;">
-<html:hidden property="return"/>
+<html:hidden property="returnType"/>
<html:hidden property="year"/>
<html:hidden property="month"/>
<html:hidden property="date"/>
@@ -53,7 +53,7 @@
<html:select property="addedUsers" multiple="true" size="10" style="width:180px;">
<!-- TODO i18n -->
<c:forEach var="u" varStatus="s" items="${availableUserItems}">
- <html:option value="${f:u(u.userId)}">${f:h(u.displayName)}</html:option>
+ <html:option value="${f:u(u.userId)}"><bean:message key="display.name" arg0="${f:h(u.nameArg0)}" arg1="${f:h(u.nameArg1)}" arg2="${f:h(u.nameArg2)}"/></html:option>
</c:forEach>
</html:select>
</td>
@@ -78,7 +78,7 @@
<html:select property="removedUsers" multiple="true" size="10" style="width:180px;">
<!-- TODO i18n -->
<c:forEach var="u" varStatus="s" items="${selectedUserItems}">
- <html:option value="${f:u(u.userId)}">${f:h(u.displayName)}</html:option>
+ <html:option value="${f:u(u.userId)}"><bean:message key="display.name" arg0="${f:h(u.nameArg0)}" arg1="${f:h(u.nameArg1)}" arg2="${f:h(u.nameArg2)}"/></html:option>
</c:forEach>
</html:select>
<html:select property="selectedUsers" multiple="true" style="display:none;">