svnno****@sourc*****
svnno****@sourc*****
2008年 11月 18日 (火) 13:50:50 JST
Revision: 1362
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1362
Author: shinsuke
Date: 2008-11-18 13:50:49 +0900 (Tue, 18 Nov 2008)
Log Message:
-----------
i18ned display name, and updated translation.
Modified Paths:
--------------
addresslist/trunk/src/main/java/jp/sf/pal/addresslist/db/exentity/Person.java
addresslist/trunk/src/main/java/jp/sf/pal/addresslist/db/exentity/UserInfo.java
addresslist/trunk/src/main/resources/application.properties
addresslist/trunk/src/main/resources/application_ja.properties
addresslist/trunk/src/main/webapp/WEB-INF/view/admin/person/index.jsp
addresslist/trunk/src/main/webapp/WEB-INF/view/user/person/index.jsp
-------------- next part --------------
Modified: addresslist/trunk/src/main/java/jp/sf/pal/addresslist/db/exentity/Person.java
===================================================================
--- addresslist/trunk/src/main/java/jp/sf/pal/addresslist/db/exentity/Person.java 2008-11-18 01:04:14 UTC (rev 1361)
+++ addresslist/trunk/src/main/java/jp/sf/pal/addresslist/db/exentity/Person.java 2008-11-18 04:50:49 UTC (rev 1362)
@@ -3,6 +3,8 @@
import java.util.ArrayList;
import java.util.List;
+import org.apache.commons.lang.StringUtils;
+
/**
* The entity of PERSON.
* <p>
@@ -405,4 +407,32 @@
newCustomList.add(custom4);
return newCustomList;
}
+
+ public String getNameArg0() {
+ if (StringUtils.isEmpty(getGivenName())
+ && StringUtils.isEmpty(getFamilyName())) {
+ return getUserId();
+ }
+ 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: addresslist/trunk/src/main/java/jp/sf/pal/addresslist/db/exentity/UserInfo.java
===================================================================
--- addresslist/trunk/src/main/java/jp/sf/pal/addresslist/db/exentity/UserInfo.java 2008-11-18 01:04:14 UTC (rev 1361)
+++ addresslist/trunk/src/main/java/jp/sf/pal/addresslist/db/exentity/UserInfo.java 2008-11-18 04:50:49 UTC (rev 1362)
@@ -1,5 +1,7 @@
package jp.sf.pal.addresslist.db.exentity;
+import org.apache.commons.lang.StringUtils;
+
/**
* The entity of USER_INFO.
* <p>
@@ -14,4 +16,32 @@
/** Serial version UID. (Default) */
private static final long serialVersionUID = 1L;
+
+ public String getNameArg0() {
+ if (StringUtils.isEmpty(getGivenName())
+ && StringUtils.isEmpty(getFamilyName())) {
+ return getUserId();
+ }
+ 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: addresslist/trunk/src/main/resources/application.properties
===================================================================
--- addresslist/trunk/src/main/resources/application.properties 2008-11-18 01:04:14 UTC (rev 1361)
+++ addresslist/trunk/src/main/resources/application.properties 2008-11-18 04:50:49 UTC (rev 1362)
@@ -5,6 +5,13 @@
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}
+# 0: Given name(Reading), 1: Family name(Reading), 2: Middle Name
+phonetic.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.
@@ -68,7 +75,7 @@
labels.confirm_company_info=Confirm Company Info
labels.name=Name
-labels.name_desc=Name (Description)
+labels.name_desc=Name (Phonetic)
labels.department=Department
labels.postal_code=Postal Code
labels.state=State
@@ -91,9 +98,9 @@
labels.address_info=Address Info
labels.f_name=Family Name
-labels.f_name_desc=Family Name (Description)
+labels.f_name_desc=Family Name (Phonetic)
labels.g_name=Given Name
-labels.g_name_desc=Given Name (Description)
+labels.g_name_desc=Given Name (Phonetic)
labels.m_name=Middle name
labels.name_prefix=Name Prefix
labels.name_suffix=Name Suffix
Modified: addresslist/trunk/src/main/resources/application_ja.properties
===================================================================
--- addresslist/trunk/src/main/resources/application_ja.properties 2008-11-18 01:04:14 UTC (rev 1361)
+++ addresslist/trunk/src/main/resources/application_ja.properties 2008-11-18 04:50:49 UTC (rev 1362)
@@ -1,3 +1,10 @@
+# 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})
+# 0: Given name(Reading), 1: Family name(Reading), 2: Middle Name
+phonetic.display.name={1} {0}
+
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
@@ -61,7 +68,7 @@
labels.confirm_company_info=\u4f1a\u793e\u60c5\u5831
labels.name=\u540d\u524d
-labels.name_desc=\u540d\u524d (\u8a73\u7d30)
+labels.name_desc=\u540d\u524d (\u3088\u307f)
labels.department=\u90e8\u7f72
labels.postal_code=\u90f5\u4fbf\u756a\u53f7
labels.state=\u90fd\u9053\u5e9c\u770c
@@ -84,9 +91,9 @@
labels.address_info=\u500b\u4eba\u60c5\u5831
labels.f_name=\u59d3
-labels.f_name_desc=\u59d3 (\u8a73\u7d30)
+labels.f_name_desc=\u59d3 (\u3088\u307f)
labels.g_name=\u540d
-labels.g_name_desc=\u540d (\u8a73\u7d30)
+labels.g_name_desc=\u540d (\u3088\u307f)
labels.m_name=\u30df\u30c9\u30eb\u30cd\u30fc\u30e0
labels.name_prefix=\u656c\u79f0 (\u524d)
labels.name_suffix=\u656c\u79f0 (\u5f8c)
Modified: addresslist/trunk/src/main/webapp/WEB-INF/view/admin/person/index.jsp
===================================================================
--- addresslist/trunk/src/main/webapp/WEB-INF/view/admin/person/index.jsp 2008-11-18 01:04:14 UTC (rev 1361)
+++ addresslist/trunk/src/main/webapp/WEB-INF/view/admin/person/index.jsp 2008-11-18 04:50:49 UTC (rev 1362)
@@ -35,7 +35,7 @@
<tbody>
<c:forEach var="p" varStatus="s" items="${personItems}">
<tr class="${s.index %2 == 0 ? 'row1' : 'row2'}">
- <td><s:link href="confirmpage/4/${f:u(p.id)}">${f:h(p.familyName)} ${f:h(p.givenName)}</s:link></td>
+ <td><s:link href="confirmpage/4/${f:u(p.id)}"><bean:message key="display.name" arg0="${f:h(p.nameArg0)}" arg1="${f:h(p.nameArg1)}" arg2="${f:h(p.nameArg2)}"/></s:link></td>
<td>${f:h(p.company.name)}</td>
<td align="center">
<s:link href="editpage/2/${f:u(p.id)}"><bean:message key="labels.edit"/></s:link>
Modified: addresslist/trunk/src/main/webapp/WEB-INF/view/user/person/index.jsp
===================================================================
--- addresslist/trunk/src/main/webapp/WEB-INF/view/user/person/index.jsp 2008-11-18 01:04:14 UTC (rev 1361)
+++ addresslist/trunk/src/main/webapp/WEB-INF/view/user/person/index.jsp 2008-11-18 04:50:49 UTC (rev 1362)
@@ -35,7 +35,7 @@
<tbody>
<c:forEach var="p" varStatus="s" items="${personItems}">
<tr class="${s.index %2 == 0 ? 'row1' : 'row2'}">
- <td><s:link href="confirmpage/4/${f:u(p.id)}">${f:h(p.familyName)} ${f:h(p.givenName)}</s:link></td>
+ <td><s:link href="confirmpage/4/${f:u(p.id)}"><bean:message key="display.name" arg0="${f:h(p.nameArg0)}" arg1="${f:h(p.nameArg1)}" arg2="${f:h(p.nameArg2)}"/></s:link></td>
<td>${f:h(p.company.name)}</td>
<td align="center">
<s:link href="editpage/2/${f:u(p.id)}"><bean:message key="labels.edit"/></s:link>