svnno****@sourc*****
svnno****@sourc*****
2008年 11月 13日 (木) 18:47:06 JST
Revision: 1346 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1346 Author: takakura Date: 2008-11-13 18:47:05 +0900 (Thu, 13 Nov 2008) Log Message: ----------- added internationalization property files & JSP files. Modified Paths: -------------- addresslist/trunk/src/main/resources/application.properties addresslist/trunk/src/main/webapp/WEB-INF/view/admin/company/confirm.jsp addresslist/trunk/src/main/webapp/WEB-INF/view/admin/company/edit.jsp addresslist/trunk/src/main/webapp/WEB-INF/view/admin/company/error.jsp addresslist/trunk/src/main/webapp/WEB-INF/view/admin/company/index.jsp addresslist/trunk/src/main/webapp/WEB-INF/view/admin/person/confirm.jsp addresslist/trunk/src/main/webapp/WEB-INF/view/admin/person/edit.jsp addresslist/trunk/src/main/webapp/WEB-INF/view/admin/person/error.jsp addresslist/trunk/src/main/webapp/WEB-INF/view/admin/person/index.jsp addresslist/trunk/src/main/webapp/WEB-INF/view/config/index.jsp addresslist/trunk/src/main/webapp/WEB-INF/view/user/company/confirm.jsp addresslist/trunk/src/main/webapp/WEB-INF/view/user/company/edit.jsp addresslist/trunk/src/main/webapp/WEB-INF/view/user/company/error.jsp addresslist/trunk/src/main/webapp/WEB-INF/view/user/company/index.jsp addresslist/trunk/src/main/webapp/WEB-INF/view/user/person/confirm.jsp addresslist/trunk/src/main/webapp/WEB-INF/view/user/person/edit.jsp addresslist/trunk/src/main/webapp/WEB-INF/view/user/person/error.jsp addresslist/trunk/src/main/webapp/WEB-INF/view/user/person/index.jsp Added Paths: ----------- addresslist/trunk/src/main/resources/application_ja.properties -------------- next part -------------- Modified: addresslist/trunk/src/main/resources/application.properties =================================================================== --- addresslist/trunk/src/main/resources/application.properties 2008-11-13 06:58:14 UTC (rev 1345) +++ addresslist/trunk/src/main/resources/application.properties 2008-11-13 09:47:05 UTC (rev 1346) @@ -12,7 +12,7 @@ errors.minbytelength={0} can not be less than {1} bytes. errors.range={0} is not in the range {1} through {2}. errors.required={0} is required. -errors.required.other={0} is required ({1}). +errors.required.other={0} is required ({1}). errors.byte={0} must be an byte. errors.date={0} is not a date. errors.double={0} must be an double. @@ -50,3 +50,79 @@ errors.failed_to_delete_person=Failed to delete the person information. errors.could_not_find_person=Could not find the person information({0}). +labels.detail=Detail +labels.create=Create +labels.update=Update +labels.delete=Delete +labels.back=Back +labels.edit=Edit +labels.confirm=Confirm +labels.to_back=Back +labels.to_next=Next + +labels.yes=Yes +labels.no=No + +labels.person=Person +labels.company=Company + +labels.confirm_company_info=Confirm Company Info +labels.name=Name +labels.name_desc=Name (Description) +labels.department=Department +labels.postal_code=Postal Code +labels.state=State +labels.city=City +labels.street=Street +labels.building=Building/Others +labels.tel1=Telephone 1 +labels.tel2=Telephone 2 +labels.fax1=Fax 1 +labels.fax2=Fax 2 +labels.url=URL +labels.public=Public + +labels.edit_company_info=Edit Company Info + +labels.create_new_company=Create New Company + +labels.config=Configuration +labels.guest_user_name=Guest User Name + +labels.address_info=Address Info +labels.f_name=Family Name +labels.f_name_desc=Family Name (Description) +labels.g_name=Given Name +labels.g_name_desc=Given Name (Description) +labels.m_name=Middle name +labels.name_prefix=Name Prefix +labels.name_suffix=Name Suffix +labels.nickname=Nickname +labels.j_title=Job Title + +labels.contact=Contact +labels.tel_h=Telephone (Home) +labels.tel_mh=Cell Phone (Home) +labels.mail_hp=Email (Home PC) +labels.mail_hm=Email (Home Mobile) +labels.fax_h=FAX (Home) +labels.tel_b=Telephone (Business) +labels.tel_mb=Cell Phone (Business) +labels.mail_bp=Email (Business PC) +labels.mail_bm=Email (Business Mobile) +labels.fax_b=FAX (Business) + +labels.home=Home +labels.c_o_company=Confirmation of Company + +labels.custom=Custom +labels.custom1=Custom 1 +labels.custom2=Custom 2 +labels.custom3=Custom 3 +labels.custom4=Custom 4 + +labels.create_new_person=Create New Person + +labels.none=None + +labels.configuration=Configuration \ No newline at end of file Added: addresslist/trunk/src/main/resources/application_ja.properties =================================================================== --- addresslist/trunk/src/main/resources/application_ja.properties (rev 0) +++ addresslist/trunk/src/main/resources/application_ja.properties 2008-11-13 09:47:05 UTC (rev 1346) @@ -0,0 +1,121 @@ +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 +errors.maxbytelength={0} \u306e\u30b5\u30a4\u30ba\u306f {1} \u30d0\u30a4\u30c8\u4ee5\u4e0b\u3067\u306a\u304f\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002 +errors.minbytelength={0} \u306e\u30b5\u30a4\u30ba\u306f {1} \u30d0\u30a4\u30c8\u4ee5\u4e0b\u3067\u306a\u304f\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002 +errors.range={0} \u306f {1} \u304b\u3089 {2} \u306e\u9593\u3067\u306a\u304f\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002 +errors.required={0} \u306f\u5fc5\u305a\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044\u3002 +errors.required.other={0} \u306f\u5fc5\u305a\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044\u3002({1}) +errors.byte={0} \u306f\u30d0\u30a4\u30c8\u5f62\u5f0f\u306e\u30c7\u30fc\u30bf\u3067\u306a\u304f\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002 +errors.date={0} \u306f\u65e5\u4ed8\u5f62\u5f0f\u306e\u30c7\u30fc\u30bf\u3067\u306a\u304f\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002 +errors.double={0} \u306f\u6d6e\u52d5\u5c0f\u6570\u70b9\u578b (double \u578b) \u3067\u306a\u304f\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002 +errors.float={0} \u306f\u6d6e\u52d5\u5c0f\u6570\u70b9\u578b (float \u578b) \u3067\u306a\u304f\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002 +errors.integer={0} \u306f\u6574\u6570\u578b (2147483647 \u4ee5\u4e0b\u306e\u6574\u6570) \u3067\u306a\u304f\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002 +errors.long={0} \u306f\u6574\u6570\u578b (9223372036854775807 \u4ee5\u4e0b\u306e\u6574\u6570) \u3067\u306a\u304f\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002 +errors.short={0} \u306f\u6574\u6570\u578b (32767 \u4ee5\u4e0b\u306e\u6574\u6570) \u3067\u306a\u304f\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002 +errors.creditcard={0} \u306f\u6b63\u3057\u3044\u30af\u30ec\u30b8\u30c3\u30c8\u30ab\u30fc\u30c9\u756a\u53f7\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002 +errors.email={0} \u306f\u6b63\u3057\u3044\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002 +errors.url={0} \u306f\u6b63\u3057\u3044 URL (\u30db\u30fc\u30e0\u30da\u30fc\u30b8\u306e\u30a2\u30c9\u30ec\u30b9) \u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002 + +success.update_config=\u8a2d\u5b9a\u3092\u66f4\u65b0\u3057\u307e\u3057\u305f\u3002 +success.create_userInfo=\u30e6\u30fc\u30b6\u30fc\u60c5\u5831\u3092\u4f5c\u6210\u3057\u307e\u3057\u305f\u3002 +success.update_userInfo=\u30e6\u30fc\u30b6\u30fc\u60c5\u5831\u3092\u66f4\u65b0\u3057\u307e\u3057\u305f\u3002 +success.delete_userInfo=\u30e6\u30fc\u30b6\u30fc\u60c5\u5831\u3092\u524a\u9664\u3057\u307e\u3057\u305f\u3002 +success.create_company=\u4f1a\u793e\u60c5\u5831\u3092\u4f5c\u6210\u3057\u307e\u3057\u305f\u3002 +success.update_company=\u4f1a\u793e\u60c5\u5831\u3092\u66f4\u65b0\u3057\u307e\u3057\u305f\u3002 +success.delete_company=\u4f1a\u793e\u60c5\u5831\u3092\u524a\u9664\u3057\u307e\u3057\u305f\u3002 +success.create_person=\u500b\u4eba\u60c5\u5831\u3092\u4f5c\u6210\u3057\u307e\u3057\u305f\u3002 +success.update_person=\u500b\u4eba\u60c5\u5831\u3092\u66f4\u65b0\u3057\u307e\u3057\u305f\u3002 +success.delete_person=\u500b\u4eba\u60c5\u5831\u3092\u524a\u9664\u3057\u307e\u3057\u305f\u3002 + +errors.failed_to_update_config=\u8a2d\u5b9a\u306e\u66f4\u65b0\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002 +errors.invalid.mode=\u30e2\u30fc\u30c9\u304c\u9055\u3044\u307e\u3059\u3002(\u6b63\u3057\u3044\u5024\u306f {0} \u3067\u3059\u304c\u3001\u5165\u529b\u3055\u308c\u305f\u5024\u306f {1} \u306b\u306a\u3063\u3066\u3044\u307e\u3059) +errors.failed_to_create_userInfo=\u30e6\u30fc\u30b6\u30fc\u60c5\u5831\u306e\u4f5c\u6210\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002 +errors.failed_to_update_userInfo=\u30e6\u30fc\u30b6\u30fc\u60c5\u5831\u306e\u66f4\u65b0\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002 +errors.failed_to_delete_userInfo=\u30e6\u30fc\u30b6\u30fc\u60c5\u5831\u306e\u524a\u9664\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002 +errors.could_not_find_userInfo=\u30e6\u30fc\u30b6\u30fc\u60c5\u5831 {0} \u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3002 +errors.failed_to_create_company=\u4f1a\u793e\u60c5\u5831\u306e\u4f5c\u6210\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002 +errors.failed_to_update_company=\u4f1a\u793e\u60c5\u5831\u306e\u66f4\u65b0\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002 +errors.failed_to_delete_company=\u4f1a\u793e\u60c5\u5831\u306e\u524a\u9664\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002 +errors.could_not_find_company=\u4f1a\u793e\u60c5\u5831 {0} \u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3002 +errors.failed_to_create_person=\u500b\u4eba\u60c5\u5831\u306e\u4f5c\u6210\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002 +errors.failed_to_update_person=\u500b\u4eba\u60c5\u5831\u306e\u66f4\u65b0\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002 +errors.failed_to_delete_person=\u500b\u4eba\u60c5\u5831\u306e\u524a\u9664\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002 +errors.could_not_find_person=\u500b\u4eba\u60c5\u5831 {0} \u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3002 + +labels.detail=\u8a73\u7d30 +labels.create=\u4f5c\u6210 +labels.update=\u66f4\u65b0 +labels.delete=\u524a\u9664 +labels.back=\u623b\u308b +labels.edit=\u7de8\u96c6 +labels.confirm=\u78ba\u8a8d +labels.to_back=\u524d\u3078 +labels.to_next=\u6b21\u3078 + +labels.yes=\u516c\u958b\u3059\u308b +labels.no=\u516c\u958b\u3057\u306a\u3044 + +labels.person=\u500b\u4eba +labels.company=\u4f1a\u793e + +labels.confirm_company_info=\u4f1a\u793e\u60c5\u5831 +labels.name=\u540d\u524d +labels.name_desc=\u540d\u524d (\u8a73\u7d30) +labels.department=\u90e8\u7f72 +labels.postal_code=\u90f5\u4fbf\u756a\u53f7 +labels.state=\u90fd\u9053\u5e9c\u770c +labels.city=\u5e02\u533a\u90e1 +labels.street=\u753a\u6751\u540d +labels.building=\u5efa\u7269\u540d\u306a\u3069 +labels.tel1=\u96fb\u8a71\u756a\u53f7 1 +labels.tel2=\u96fb\u8a71\u756a\u53f7 2 +labels.fax1=Fax\u756a\u53f7 1 +labels.fax2=Fax\u756a\u53f7 2 +labels.url=URL +labels.public=\u516c\u958b\u8a2d\u5b9a + +labels.edit_company_info=\u4f1a\u793e\u60c5\u5831\u306e\u7de8\u96c6 + +labels.create_new_company=\u65b0\u898f\u767b\u9332 + +labels.config=\u8a2d\u5b9a +labels.guest_user_name=\u30b2\u30b9\u30c8\u30e6\u30fc\u30b6\u30fc\u306e\u540d\u524d + +labels.address_info=\u500b\u4eba\u60c5\u5831 +labels.f_name=\u59d3 +labels.f_name_desc=\u59d3 (\u8a73\u7d30) +labels.g_name=\u540d +labels.g_name_desc=\u540d (\u8a73\u7d30) +labels.m_name=\u30df\u30c9\u30eb\u30cd\u30fc\u30e0 +labels.name_prefix=\u656c\u79f0 (\u524d) +labels.name_suffix=\u656c\u79f0 (\u5f8c) +labels.nickname=\u30cb\u30c3\u30af\u30cd\u30fc\u30e0 +labels.j_title=\u5f79\u8077 + +labels.contact=\u9023\u7d61\u5148 +labels.tel_h=\u96fb\u8a71\u756a\u53f7 (\u500b\u4eba\u7528\u81ea\u5b85) +labels.tel_mh=\u96fb\u8a71\u756a\u53f7 (\u500b\u4eba\u7528\u643a\u5e2f\u96fb\u8a71) +labels.mail_hp=\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9 (\u500b\u4eba\u7528 PC) +labels.mail_hm=\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9 (\u500b\u4eba\u7528\u643a\u5e2f\u96fb\u8a71) +labels.fax_h=FAX (\u500b\u4eba\u7528) +labels.tel_b=\u96fb\u8a71\u756a\u53f7 (\u4f1a\u793e) +labels.tel_mb=\u96fb\u8a71\u756a\u53f7 (\u4f1a\u793e\u7528\u643a\u5e2f\u96fb\u8a71) +labels.mail_bp=\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9 (\u4f1a\u793e\u7528 PC) +labels.mail_bm=\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9 (\u4f1a\u793e\u7528\u643a\u5e2f\u96fb\u8a71) +labels.fax_b=FAX (\u4f1a\u793e) + +labels.home=\u81ea\u5b85 +labels.c_o_company=\u4f1a\u793e\u60c5\u5831\u306e\u78ba\u8a8d + +labels.custom=\u30ab\u30b9\u30bf\u30e0 +labels.custom1=\u30ab\u30b9\u30bf\u30e0 1 +labels.custom2=\u30ab\u30b9\u30bf\u30e0 2 +labels.custom3=\u30ab\u30b9\u30bf\u30e0 3 +labels.custom4=\u30ab\u30b9\u30bf\u30e0 4 + +labels.create_new_person=\u65b0\u898f\u767b\u9332 + +labels.none=\u306a\u3057 + +labels.configuration=\u8a2d\u5b9a \ No newline at end of file Property changes on: addresslist/trunk/src/main/resources/application_ja.properties ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: addresslist/trunk/src/main/webapp/WEB-INF/view/admin/company/confirm.jsp =================================================================== --- addresslist/trunk/src/main/webapp/WEB-INF/view/admin/company/confirm.jsp 2008-11-13 06:58:14 UTC (rev 1345) +++ addresslist/trunk/src/main/webapp/WEB-INF/view/admin/company/confirm.jsp 2008-11-13 09:47:05 UTC (rev 1346) @@ -10,9 +10,9 @@ <div class="tab-nav"> <ul> <li class="first"></li> - <li class="selectable"><s:link href="/admin/person/" style="text-decoration: none;">Person</s:link></li> + <li class="selectable"><s:link href="/admin/person/" style="text-decoration: none;"><bean:message key="labels.person"/></s:link></li> <li class="spacer"></li> - <li class="selected"><span>Company</span></li> + <li class="selected"><span><bean:message key="labels.company"/></span></li> <li class="last"></li> </ul> </div> @@ -25,65 +25,65 @@ <html:hidden property="mode"/> <div class="form-table" style="margin-top:3px;"> <table> - <caption>Confirm Company Info</caption> + <caption><bean:message key="labels.confirm_company_info"/></caption> <tbody> <tr> - <th style="width: 150px;">Name</th> + <th style="width: 150px;"><bean:message key="labels.name"/></th> <td style="width: 200px;">${f:h(name)}<html:hidden property="name"/></td> </tr> <tr> - <th>Name (Description)</th> + <th><bean:message key="labels.name_desc"/></th> <td>${f:h(nameDesc)}<html:hidden property="nameDesc"/></td> </tr> <tr> - <th>Department</th> + <th><bean:message key="labels.department"/></th> <td>${f:h(department)}<html:hidden property="department"/></td> </tr> <tr> - <th>Postal Code</th> + <th><bean:message key="labels.postal_code"/></th> <td>${f:h(postalCode)}<html:hidden property="postalCode"/></td> </tr> <tr> - <th>State</th> + <th><bean:message key="labels.state"/></th> <td>${f:h(state)}<html:hidden property="state"/></td> </tr> <tr> - <th>City</th> + <th><bean:message key="labels.city"/></th> <td>${f:h(city)}<html:hidden property="city"/></td> </tr> <tr> - <th>Street</th> + <th><bean:message key="labels.street"/></th> <td>${f:h(street)}<html:hidden property="street"/></td> </tr> <tr> - <th>Building/Others</th> + <th><bean:message key="labels.building"/></th> <td>${f:h(building)}<html:hidden property="building"/></td> </tr> <tr> - <th>Telephone 1</th> + <th><bean:message key="labels.tel1"/></th> <td>${f:h(telephone1)}<html:hidden property="telephone1"/></td> </tr> <tr> - <th>Telephone 2</th> + <th><bean:message key="labels.tel2"/></th> <td>${f:h(telephone2)}<html:hidden property="telephone2"/></td> </tr> <tr> - <th>FAX 1</th> + <th><bean:message key="labels.fax1"/></th> <td>${f:h(fax1)}<html:hidden property="fax1"/></td> </tr> <tr> - <th>FAX 2</th> + <th><bean:message key="labels.fax2"/></th> <td>${f:h(fax2)}<html:hidden property="fax2"/></td> </tr> <tr> - <th>URL</th> + <th><bean:message key="labels.url"/></th> <td>${f:h(url)}<html:hidden property="url"/></td> </tr> <tr> - <th>Public</th> + <th><bean:message key="labels.public"/></th> <td> -<c:if test="${isPublic=='T'}">Yes</c:if> -<c:if test="${isPublic=='F'}">No</c:if> +<c:if test="${isPublic=='T'}"><bean:message key="labels.yes"/></c:if> +<c:if test="${isPublic=='F'}"><bean:message key="labels.no"/></c:if> <html:hidden property="isPublic"/> </td> </tr> @@ -92,21 +92,21 @@ <tr> <td colspan="2"> <c:if test="${mode == 1}"> - <input type="submit" name="create" value="登録"/> - <input type="submit" name="editagain" value="戻る"/> + <input type="submit" name="create" value="<bean:message key="labels.create"/>"/> + <input type="submit" name="editagain" value="<bean:message key="labels.back"/>"/> </c:if> <c:if test="${mode == 2}"> - <input type="submit" name="update" value="更新"/> - <input type="submit" name="editagain" value="戻る"/> + <input type="submit" name="update" value="<bean:message key="labels.update"/>"/> + <input type="submit" name="editagain" value="<bean:message key="labels.back"/>"/> </c:if> <c:if test="${mode == 3}"> - <input type="submit" name="delete" value="削除"/> - <input type="submit" name="back" value="戻る"/> + <input type="submit" name="delete" value="<bean:message key="labels.delete"/>"/> + <input type="submit" name="back" value="<bean:message key="labels.back"/>"/> </c:if> <c:if test="${mode == 4}"> - <input type="submit" name="back" value="戻る"/> - <input type="submit" name="editpagefromconfirm" value="編集"/> - <input type="submit" name="deletepagefromconfirm" value="削除"/> + <input type="submit" name="back" value="<bean:message key="labels.back"/>"/> + <input type="submit" name="editpagefromconfirm" value="<bean:message key="labels.edit"/>"/> + <input type="submit" name="deletepagefromconfirm" value="<bean:message key="labels.delete"/>"/> </c:if> </td> </tr> Modified: addresslist/trunk/src/main/webapp/WEB-INF/view/admin/company/edit.jsp =================================================================== --- addresslist/trunk/src/main/webapp/WEB-INF/view/admin/company/edit.jsp 2008-11-13 06:58:14 UTC (rev 1345) +++ addresslist/trunk/src/main/webapp/WEB-INF/view/admin/company/edit.jsp 2008-11-13 09:47:05 UTC (rev 1346) @@ -10,9 +10,9 @@ <div class="tab-nav"> <ul> <li class="first"></li> - <li class="selectable"><s:link href="/admin/person/" style="text-decoration: none;">Person</s:link></li> + <li class="selectable"><s:link href="/admin/person/" style="text-decoration: none;"><bean:message key="labels.person"/></s:link></li> <li class="spacer"></li> - <li class="selected"><span>Company</span></li> + <li class="selected"><span><bean:message key="labels.company"/></span></li> <li class="last"></li> </ul> </div> @@ -25,66 +25,66 @@ <html:hidden property="mode"/> <div class="form-table" style="margin-top:3px;"> <table> - <caption>Edit Company Info</caption> + <caption><bean:message key="labels.edit_company_info"/></caption> <tbody> <tr> - <th style="width: 150px;">Name</th> + <th style="width: 150px;"><bean:message key="labels.name"/></th> <td style="width: 200px;"><html:text property="name" size="20"/></td> </tr> <tr> - <th>Name (Description)</th> + <th><bean:message key="labels.name_desc"/></th> <td><html:text property="nameDesc" size="20"/></td> </tr> <tr> - <th>Department</th> + <th><bean:message key="labels.department"/></th> <td><html:text property="department" size="20"/></td> </tr> <tr> - <th>Postal Code</th> + <th><bean:message key="labels.postal_code"/></th> <td><html:text property="postalCode" size="20"/></td> </tr> <tr> - <th>State</th> + <th><bean:message key="labels.state"/></th> <td><html:text property="state" size="20"/></td> </tr> <tr> - <th>City</th> + <th><bean:message key="labels.city"/></th> <td><html:text property="city" size="20"/></td> </tr> <tr> - <th>Street</th> + <th><bean:message key="labels.street"/></th> <td><html:text property="street" size="20"/></td> </tr> <tr> - <th>Building/Others</th> + <th><bean:message key="labels.building"/></th> <td><html:text property="building" size="20"/></td> </tr> <tr> - <th>Telephone 1</th> + <th><bean:message key="labels.tel1"/></th> <td><html:text property="telephone1" size="20"/></td> </tr> <tr> - <th>Telephone 2</th> + <th><bean:message key="labels.tel2"/></th> <td><html:text property="telephone2" size="20"/></td> </tr> <tr> - <th>FAX 1</th> + <th><bean:message key="labels.fax1"/></th> <td><html:text property="fax1" size="20"/></td> </tr> <tr> - <th>FAX 2</th> + <th><bean:message key="labels.fax2"/></th> <td><html:text property="fax2" size="20"/></td> </tr> <tr> - <th>URL</th> + <th><bean:message key="labels.url"/></th> <td><html:text property="url" size="20"/></td> </tr> <tr> - <th>Public</th> + <th><bean:message key="labels.public"/></th> <td> <html:select property="isPublic"> - <html:option value="T">Yes</html:option> - <html:option value="F">No</html:option> + <html:option value="T"><bean:message key="labels.yes"/></html:option> + <html:option value="F"><bean:message key="labels.no"/></html:option> </html:select> </td> </tr> @@ -92,8 +92,8 @@ <tfoot> <tr> <td colspan="2"> - <input type="submit" name="confirm" value="確認"/> - <input type="submit" name="back" value="戻る"/> + <input type="submit" name="confirm" value="<bean:message key="labels.confirm"/>"/> + <input type="submit" name="back" value="<bean:message key="labels.back"/>"/> </td> </tr> </tfoot> Modified: addresslist/trunk/src/main/webapp/WEB-INF/view/admin/company/error.jsp =================================================================== --- addresslist/trunk/src/main/webapp/WEB-INF/view/admin/company/error.jsp 2008-11-13 06:58:14 UTC (rev 1345) +++ addresslist/trunk/src/main/webapp/WEB-INF/view/admin/company/error.jsp 2008-11-13 09:47:05 UTC (rev 1346) @@ -8,18 +8,20 @@ <!-- tab: BEGIN --> <div class="tab-nav"> <ul> + <ul> <li class="first"></li> - <li class="selectable"><s:link href="/admin/person/" style="text-decoration: none;">Person</s:link></li> + <li class="selectable"><s:link href="/admin/person/" style="text-decoration: none;"><bean:message key="labels.person"/></s:link></li> <li class="spacer"></li> - <li class="selected"><span>Company</span></li> + <li class="selected"><span><bean:message key="labels.company"/></span></li> <li class="last"></li> </ul> + </ul> </div> <!-- tab: END --> <html:errors/> <br> -<s:link href="index">戻る</s:link> +<s:link href="index"><bean:message key="labels.back"/></s:link> </div> </body> </html> Modified: addresslist/trunk/src/main/webapp/WEB-INF/view/admin/company/index.jsp =================================================================== --- addresslist/trunk/src/main/webapp/WEB-INF/view/admin/company/index.jsp 2008-11-13 06:58:14 UTC (rev 1345) +++ addresslist/trunk/src/main/webapp/WEB-INF/view/admin/company/index.jsp 2008-11-13 09:47:05 UTC (rev 1346) @@ -10,9 +10,9 @@ <div class="tab-nav"> <ul> <li class="first"></li> - <li class="selectable"><s:link href="/admin/person/" style="text-decoration: none;">Person</s:link></li> + <li class="selectable"><s:link href="/admin/person/" style="text-decoration: none;"><bean:message key="labels.person"/></s:link></li> <li class="spacer"></li> - <li class="selected"><span>Company</span></li> + <li class="selected"><span><bean:message key="labels.company"/></span></li> <li class="last"></li> </ul> </div> @@ -22,13 +22,13 @@ <div class="list-table" style="margin-top:3px;"> <div> -<s:link href="createpage">Create New Company</s:link> +<s:link href="createpage"><bean:message key="labels.create_new_company"/></s:link> </div> <table border="1"> <thead> <tr> - <th style="width:200px;text-align: center;">Name</th> - <th style="width:200px;text-align: center;">Department</th> + <th style="width:200px;text-align: center;"><bean:message key="labels.name"/></th> + <th style="width:200px;text-align: center;"><bean:message key="labels.department"/></th> <th style="width:100px;text-align: center;"> </th> </tr> </thead> @@ -38,8 +38,8 @@ <td><s:link href="confirmpage/4/${f:u(c.id)}">${f:h(c.name)}</s:link></td> <td>${f:h(c.department)}</td> <td align="center"> - <s:link href="editpage/2/${f:u(c.id)}">Edit</s:link> - <s:link href="deletepage/3/${f:u(c.id)}">Delete</s:link> + <s:link href="editpage/2/${f:u(c.id)}"><bean:message key="labels.edit"/></s:link> + <s:link href="deletepage/3/${f:u(c.id)}"><bean:message key="labels.delete"/></s:link> </td> </tr> </c:forEach> @@ -49,7 +49,7 @@ <div style="width: 450px;text-align: center;"> <span> <c:if test="${companyPager.existPrePage}"> - <s:link href="list/${companyPager.currentPageNumber - 1}">前へ</s:link> + <s:link href="list/${companyPager.currentPageNumber - 1}"><bean:message key="labels.to_back"/></s:link> </c:if> </span> <span> @@ -66,7 +66,7 @@ </span> <span> <c:if test="${companyPager.existNextPage}"> - <s:link href="list/${companyPager.currentPageNumber + 1}">次へ</s:link> + <s:link href="list/${companyPager.currentPageNumber + 1}"><bean:message key="labels.to_next"/></s:link> </c:if> </span> </div> Modified: addresslist/trunk/src/main/webapp/WEB-INF/view/admin/person/confirm.jsp =================================================================== --- addresslist/trunk/src/main/webapp/WEB-INF/view/admin/person/confirm.jsp 2008-11-13 06:58:14 UTC (rev 1345) +++ addresslist/trunk/src/main/webapp/WEB-INF/view/admin/person/confirm.jsp 2008-11-13 09:47:05 UTC (rev 1346) @@ -10,9 +10,9 @@ <div class="tab-nav"> <ul> <li class="first"></li> - <li class="selected"><span>Person</span></li> + <li class="selected"><span><bean:message key="labels.person"/></span></li> <li class="spacer"></li> - <li class="selectable"><s:link href="/admin/company/" style="text-decoration: none;">Company</s:link></li> + <li class="selectable"><s:link href="/admin/company/" style="text-decoration: none;"><bean:message key="labels.company"/></s:link></li> <li class="last"></li> </ul> </div> @@ -25,54 +25,54 @@ <html:hidden property="mode"/> <div class="form-table" style="margin-top:3px;"> <table> - <caption>Address Info</caption> + <caption><bean:message key="labels.address_info"/></caption> <tbody> <tr> - <th style="width: 100px;">Person</th> + <th style="width: 100px;"><bean:message key="labels.person"/></th> <td> <table> <tbody> <tr> - <th style="width: 150px;">Family Name</th> + <th style="width: 150px;"><bean:message key="labels.f_name"/></th> <td style="width: 200px;">${f:h(familyName)}<html:hidden property="familyName"/></td> </tr> <tr> - <th>Family Name (Description)</th> + <th><bean:message key="labels.f_name_desc"/></th> <td>${f:h(familyNameDesc)}<html:hidden property="familyNameDesc"/></td> </tr> <tr> - <th style="width: 120px;">Given Name</th> + <th style="width: 120px;"><bean:message key="labels.g_name"/></th> <td>${f:h(givenName)}<html:hidden property="givenName"/></td> </tr> <tr> - <th>Given Name (Description)</th> + <th><bean:message key="labels.g_name_desc"/></th> <td>${f:h(givenNameDesc)}<html:hidden property="givenNameDesc"/></td> </tr> <tr> - <th>Middle name</th> + <th><bean:message key="labels.m_name"/></th> <td>${f:h(middleName)}<html:hidden property="middleName"/></td> </tr> <tr> - <th>Name Prefix</th> + <th><bean:message key="labels.name_prefix"/></th> <td>${f:h(namePrefix)}<html:hidden property="namePrefix"/></td> </tr> <tr> - <th>Name Suffix</th> + <th><bean:message key="labels.name_suffix"/></th> <td>${f:h(nameSuffix)}<html:hidden property="nameSuffix"/></td> </tr> <tr> - <th>Nickname</th> + <th><bean:message key="labels.nickname"/></th> <td>${f:h(nickname)}<html:hidden property="nickname"/></td> </tr> <tr> - <th>Job Title</th> + <th><bean:message key="labels.j_title"/></th> <td>${f:h(jobTitle)}<html:hidden property="jobTitle"/></td> </tr> <tr> - <th>Public</th> + <th><bean:message key="labels.public"/></th> <td> -<c:if test="${isPublic=='T'}">Yes</c:if> -<c:if test="${isPublic=='F'}">No</c:if> +<c:if test="${isPublic=='T'}"><bean:message key="labels.yes"/></c:if> +<c:if test="${isPublic=='F'}"><bean:message key="labels.no"/></c:if> <html:hidden property="isPublic"/> </td> </tr> @@ -81,48 +81,48 @@ </td> </tr> <tr> - <th>Contact</th> + <th><bean:message key="labels.contact"/></th> <td> <table> <tbody> <tr> - <th style="width: 150px;">Telephone (Home)</th> + <th style="width: 150px;"><bean:message key="labels.tel_h"/></th> <td style="width: 200px;">${f:h(homeTelephone)}<html:hidden property="homeTelephone"/></td> </tr> <tr> - <th>Cell Phone (Home)</th> + <th><bean:message key="labels.tel_mh"/></th> <td>${f:h(homeCellphone)}<html:hidden property="homeCellphone"/></td> </tr> <tr> - <th>Email (Home PC)</th> + <th><bean:message key="labels.mail_hp"/></th> <td>${f:h(homeEmailPC)}<html:hidden property="homeEmailPC"/></td> </tr> <tr> - <th>Email (Home Mobile)</th> + <th><bean:message key="labels.mail_hm"/></th> <td>${f:h(homeEmailMobile)}<html:hidden property="homeEmailMobile"/></td> </tr> <tr> - <th>FAX (Home)</th> + <th><bean:message key="labels.fax_h"/></th> <td>${f:h(homeFax)}<html:hidden property="homeFax"/></td> </tr> <tr> - <th>Telephone (Business)</th> + <th><bean:message key="labels.tel_b"/></th> <td>${f:h(businessTelephone)}<html:hidden property="businessTelephone"/></td> </tr> <tr> - <th>Cell Phone (Business)</th> + <th><bean:message key="labels.tel_mb"/></th> <td>${f:h(businessCellphone)}<html:hidden property="businessCellphone"/></td> </tr> <tr> - <th>Email (Business PC)</th> + <th><bean:message key="labels.mail_bp"/></th> <td>${f:h(businessEmailPC)}<html:hidden property="businessEmailPC"/></td> </tr> <tr> - <th>Email (Business Mobile)</th> + <th><bean:message key="labels.mail_bm"/></th> <td>${f:h(businessEmailMobile)}<html:hidden property="businessEmailMobile"/></td> </tr> <tr> - <th>FAX (Business)</th> + <th><bean:message key="labels.fax_b"/></th> <td>${f:h(businessFax)}<html:hidden property="businessFax"/></td> </tr> </tbody> @@ -130,28 +130,28 @@ </td> </tr> <tr> - <th>Home</th> + <th><bean:message key="labels.home"/></th> <td> <table> <tbody> <tr> - <th style="width: 150px;">Postal Code</th> + <th style="width: 150px;"><bean:message key="labels.postal_code"/></th> <td style="width: 200px;">${f:h(postalCode)}<html:hidden property="postalCode"/></td> </tr> <tr> - <th>State</th> + <th><bean:message key="labels.state"/></th> <td>${f:h(state)}<html:hidden property="state"/></td> </tr> <tr> - <th>City</th> + <th><bean:message key="labels.city"/></th> <td>${f:h(city)}<html:hidden property="city"/></td> </tr> <tr> - <th>Street</th> + <th><bean:message key="labels.street"/></th> <td>${f:h(street)}<html:hidden property="street"/></td> </tr> <tr> - <th>Building/Others</th> + <th><bean:message key="labels.building"/></th> <td>${f:h(building)}<html:hidden property="building"/></td> </tr> </tbody> @@ -159,70 +159,70 @@ </td> </tr> <tr> - <th>Company</th> + <th><bean:message key="labels.company"/></th> <td> <html:hidden property="companyId"/> <c:if test="${company!=null}"> <table> - <caption>Confirmation of Company</caption> + <caption><bean:message key="labels.c_o_company"/></caption> <tbody> <tr> - <th style="width: 150px;">Name</th> + <th style="width: 150px;"><bean:message key="labels.name"/></th> <td style="width: 200px;">${f:h(company.name)}</td> </tr> <tr> - <th>Name Description</th> + <th><bean:message key="labels.name_desc"/></th> <td>${f:h(company.nameDesc)}</td> </tr> <tr> - <th>Department</th> + <th><bean:message key="labels.department"/></th> <td>${f:h(company.department)}</td> </tr> <tr> - <th>Postal Code</th> + <th><bean:message key="labels.postal_code"/></th> <td>${f:h(company.postalCode)}</td> </tr> <tr> - <th>State</th> + <th><bean:message key="labels.state"/></th> <td>${f:h(company.state)}</td> </tr> <tr> - <th>City</th> + <th><bean:message key="labels.city"/></th> <td>${f:h(company.city)}</td> </tr> <tr> - <th>Street</th> + <th><bean:message key="labels.street"/></th> <td>${f:h(company.street)}</td> </tr> <tr> - <th>Building/Others</th> + <th><bean:message key="labels.building"/></th> <td>${f:h(company.building)}</td> </tr> <tr> - <th>Telephone 1</th> + <th><bean:message key="labels.tel1"/></th> <td>${f:h(company.telephone1)}</td> </tr> <tr> - <th>Telephone 2</th> + <th><bean:message key="labels.tel2"/></th> <td>${f:h(company.telephone2)}</td> </tr> <tr> - <th>FAX 1</th> + <th><bean:message key="labels.fax1"/></th> <td>${f:h(company.fax1)}</td> </tr> <tr> - <th>FAX 2</th> + <th><bean:message key="labels.fax2"/></th> <td>${f:h(company.fax2)}</td> </tr> <tr> - <th>URL</th> + <th><bean:message key="labels.url"/></th> <td>${f:h(company.url)}</td> </tr> <tr> - <th>Public</th> + <th><bean:message key="labels.public"/></th> <td> -<c:if test="${company.isPublic=='T'}">Yes</c:if> -<c:if test="${company.isPublic=='F'}">No</c:if> +<c:if test="${company.isPublic=='T'}"><bean:message key="labels.yes"/></c:if> +<c:if test="${company.isPublic=='F'}"><bean:message key="labels.no"/></c:if> </td> </tr> </tbody> @@ -231,24 +231,24 @@ </td> </tr> <tr> - <th>Custom</th> + <th><bean:message key="labels.custom"/></th> <td> <table> <tbody> <tr> - <th style="width: 150px;">Custom 1</th> + <th style="width: 150px;"><bean:message key="labels.custom1"/></th> <td style="width: 200px;">${f:h(customData1)}<html:hidden property="customData1"/></td> </tr> <tr> - <th>Custom 2</th> + <th><bean:message key="labels.custom2"/></th> <td>${f:h(customData2)}<html:hidden property="customData2"/></td> </tr> <tr> - <th>Custom 3</th> + <th><bean:message key="labels.custom3"/></th> <td>${f:h(customData3)}<html:hidden property="customData3"/></td> </tr> <tr> - <th>Custom 4</th> + <th><bean:message key="labels.custom4"/></th> <td>${f:h(customData4)}<html:hidden property="customData4"/></td> </tr> </tbody> @@ -260,21 +260,21 @@ <tr> <td colspan="2"> <c:if test="${mode == 1}"> - <input type="submit" name="create" value="登録"/> - <input type="submit" name="editagain" value="戻る"/> + <input type="submit" name="create" value="<bean:message key="labels.create"/>"/> + <input type="submit" name="editagain" value="<bean:message key="labels.back"/>"/> </c:if> <c:if test="${mode == 2}"> - <input type="submit" name="update" value="更新"/> - <input type="submit" name="editagain" value="戻る"/> + <input type="submit" name="update" value="<bean:message key="labels.update"/>"/> + <input type="submit" name="editagain" value="<bean:message key="labels.back"/>"/> </c:if> <c:if test="${mode == 3}"> - <input type="submit" name="delete" value="削除"/> - <input type="submit" name="back" value="戻る"/> + <input type="submit" name="delete" value="delete"/> + <input type="submit" name="back" value="<bean:message key="labels.back"/>"/> </c:if> <c:if test="${mode == 4}"> - <input type="submit" name="back" value="戻る"/> - <input type="submit" name="editpagefromconfirm" value="編集"/> - <input type="submit" name="deletepagefromconfirm" value="削除"/> + <input type="submit" name="back" value="<bean:message key="labels.back"/>"/> + <input type="submit" name="editpagefromconfirm" value="<bean:message key="labels.edit"/>"/> + <input type="submit" name="deletepagefromconfirm" value="<bean:message key="labels.delete"/>"/> </c:if> </td> </tr> Modified: addresslist/trunk/src/main/webapp/WEB-INF/view/admin/person/edit.jsp =================================================================== --- addresslist/trunk/src/main/webapp/WEB-INF/view/admin/person/edit.jsp 2008-11-13 06:58:14 UTC (rev 1345) +++ addresslist/trunk/src/main/webapp/WEB-INF/view/admin/person/edit.jsp 2008-11-13 09:47:05 UTC (rev 1346) @@ -10,9 +10,9 @@ <div class="tab-nav"> <ul> <li class="first"></li> - <li class="selected"><span>Person</span></li> + <li class="selected"><span><bean:message key="labels.person"/></span></li> <li class="spacer"></li> - <li class="selectable"><s:link href="/admin/company/" style="text-decoration: none;">Company</s:link></li> + <li class="selectable"><s:link href="/admin/company/" style="text-decoration: none;"><bean:message key="labels.company"/></s:link></li> <li class="last"></li> </ul> </div> @@ -25,55 +25,55 @@ <html:hidden property="mode"/> <div class="form-table" style="margin-top:3px;"> <table> - <caption>Address Info</caption> + <caption><bean:message key="labels.address_info"/></caption> <tbody> <tr> - <th style="width: 100px;">Person</th> + <th style="width: 100px;"><bean:message key="labels.person"/></th> <td> <table> <tbody> <tr> - <th style="width: 150px;">Family Name</th> + <th style="width: 150px;"><bean:message key="labels.f_name"/></th> <td style="width: 200px;"><html:text property="familyName" size="20"/></td> </tr> <tr> - <th>Family Name (Description)</th> + <th><bean:message key="labels.f_name_desc"/></th> <td><html:text property="familyNameDesc" size="20"/></td> </tr> <tr> - <th style="width: 120px;">Given Name</th> + <th style="width: 120px;"><bean:message key="labels.g_name"/></th> <td><html:text property="givenName" size="20"/></td> </tr> <tr> - <th>Given Name (Description)</th> + <th><bean:message key="labels.g_name_desc"/></th> <td><html:text property="givenNameDesc" size="20"/></td> </tr> <tr> - <th>Middle name</th> + <th><bean:message key="labels.m_name"/></th> <td><html:text property="middleName" size="20"/></td> </tr> <tr> - <th>Name Prefix</th> + <th><bean:message key="labels.name_prefix"/></th> <td><html:text property="namePrefix" size="20"/></td> </tr> <tr> - <th>Name Suffix</th> + <th><bean:message key="labels.name_suffix"/></th> <td><html:text property="nameSuffix" size="20"/></td> </tr> <tr> - <th>Nickname</th> + <th><bean:message key="labels.nickname"/></th> <td><html:text property="nickname" size="20"/></td> </tr> <tr> - <th>Job Title</th> + <th><bean:message key="labels.j_title"/></th> <td><html:text property="jobTitle" size="20"/></td> </tr> <tr> - <th>Public</th> + <th><bean:message key="labels.public"/></th> <td> <html:select property="isPublic"> - <html:option value="T">Yes</html:option> - <html:option value="F">No</html:option> + <html:option value="T"><bean:message key="labels.yes"/></html:option> + <html:option value="F"><bean:message key="labels.no"/></html:option> </html:select> </td> </tr> @@ -82,48 +82,48 @@ </td> </tr> <tr> - <th>Contact</th> + <th><bean:message key="labels.contact"/></th> <td> <table> <tbody> <tr> - <th style="width: 150px;">Telephone (Home)</th> + <th style="width: 150px;"><bean:message key="labels.tel_h"/></th> <td style="width: 200px;"><html:text property="homeTelephone" size="20"/></td> </tr> <tr> - <th>Cell Phone (Home)</th> + <th><bean:message key="labels.tel_mh"/></th> <td><html:text property="homeCellphone" size="20"/></td> </tr> <tr> - <th>Email (Home PC)</th> + <th><bean:message key="labels.mail_hp"/></th> <td><html:text property="homeEmailPC" size="20"/></td> </tr> <tr> - <th>Email (Home Mobile)</th> + <th><bean:message key="labels.mail_hm"/></th> <td><html:text property="homeEmailMobile" size="20"/></td> </tr> <tr> - <th>FAX (Home)</th> + <th><bean:message key="labels.fax_h"/></th> <td><html:text property="homeFax" size="20"/></td> </tr> <tr> - <th>Telephone(Business)</th> + <th><bean:message key="labels.tel_b"/></th> <td><html:text property="businessTelephone" size="20"/></td> </tr> <tr> - <th>Cell Phone(Business)</th> + <th><bean:message key="labels.tel_mb"/></th> <td><html:text property="businessCellphone" size="20"/></td> </tr> <tr> - <th>Email(Business PC)</th> + <th><bean:message key="labels.mail_bp"/></th> <td><html:text property="businessEmailPC" size="20"/></td> </tr> <tr> - <th>Email(Business Mobile)</th> + <th><bean:message key="labels.mail_bm"/></th> <td><html:text property="businessEmailMobile" size="20"/></td> </tr> <tr> - <th>FAX(Business)</th> + <th><bean:message key="labels.fax_b"/></th> <td><html:text property="businessFax" size="20"/></td> </tr> </tbody> @@ -131,28 +131,28 @@ </td> </tr> <tr> - <th>Home</th> + <th><bean:message key="labels.home"/></th> <td> <table> <tbody> <tr> - <th style="width: 150px;">Postal Code</th> + <th style="width: 150px;"><bean:message key="labels.postal_code"/></th> <td style="width: 200px;"><html:text property="postalCode" size="20"/></td> </tr> <tr> - <th>State</th> + <th><bean:message key="labels.state"/></th> <td><html:text property="state" size="20"/></td> </tr> <tr> - <th>City</th> + <th><bean:message key="labels.city"/></th> <td><html:text property="city" size="20"/></td> </tr> <tr> - <th>Street</th> + <th><bean:message key="labels.street"/></th> <td><html:text property="street" size="20"/></td> </tr> <tr> - <th>Building/Others</th> + <th><bean:message key="labels.building"/></th> <td><html:text property="building" size="20"/></td> </tr> </tbody> @@ -160,10 +160,10 @@ </td> </tr> <tr> - <th>Company</th> + <th><bean:message key="labels.company"/></th> <td> <html:select property="companyId"> -<option value="">None</option> +<option value=""><bean:message key="labels.none"/></option> <c:forEach var="c" varStatus="s" items="${companyItems}"> <html:option value="${f:h(c.id)}">${f:h(c.name)}</html:option> </c:forEach> @@ -171,24 +171,24 @@ </td> </tr> <tr> - <th>Custom</th> + <th><bean:message key="labels.custom"/></th> <td> <table> <tbody> <tr> - <th style="width: 150px;">Custom 1</th> + <th style="width: 150px;"><bean:message key="labels.custom1"/></th> <td style="width: 200px;"><html:text property="customData1" size="20"/></td> </tr> <tr> - <th>Custom 2</th> + <th><bean:message key="labels.custom2"/></th> <td><html:text property="customData2" size="20"/></td> </tr> <tr> - <th>Custom 3</th> + <th><bean:message key="labels.custom3"/></th> <td><html:text property="customData3" size="20"/></td> </tr> <tr> - <th>Custom 4</th> + <th><bean:message key="labels.custom4"/></th> <td><html:text property="customData4" size="20"/></td> </tr> </tbody> @@ -199,8 +199,8 @@ <tfoot> <tr> <td colspan="2"> - <input type="submit" name="confirm" value="確認"/> - <input type="submit" name="back" value="戻る"/> + <input type="submit" name="confirm" value="<bean:message key="labels.confirm"/>"/> + <input type="submit" name="back" value="<bean:message key="labels.back"/>"/> </td> </tr> </tfoot> Modified: addresslist/trunk/src/main/webapp/WEB-INF/view/admin/person/error.jsp =================================================================== --- addresslist/trunk/src/main/webapp/WEB-INF/view/admin/person/error.jsp 2008-11-13 06:58:14 UTC (rev 1345) +++ addresslist/trunk/src/main/webapp/WEB-INF/view/admin/person/error.jsp 2008-11-13 09:47:05 UTC (rev 1346) @@ -9,9 +9,9 @@ <div class="tab-nav"> <ul> <li class="first"></li> - <li class="selected"><span>Person</span></li> + <li class="selected"><span><bean:message key="labels.person"/></span></li> <li class="spacer"></li> - <li class="selectable"><s:link href="/admin/company/" style="text-decoration: none;">Company</s:link></li> + <li class="selectable"><s:link href="/admin/company/" style="text-decoration: none;"><bean:message key="labels.company"/></s:link></li> <li class="last"></li> </ul> </div> @@ -19,7 +19,7 @@ <html:errors/> <br> -<s:link href="index">戻る</s:link> +<s:link href="index"><bean:message key="labels.back"/></s:link> </div> </body> </html> 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-13 06:58:14 UTC (rev 1345) +++ addresslist/trunk/src/main/webapp/WEB-INF/view/admin/person/index.jsp 2008-11-13 09:47:05 UTC (rev 1346) @@ -10,9 +10,9 @@ <div class="tab-nav"> <ul> <li class="first"></li> - <li class="selected"><span>Person</span></li> + <li class="selected"><span><bean:message key="labels.person"/></span></li> <li class="spacer"></li> - <li class="selectable"><s:link href="/admin/company/" style="text-decoration: none;">Company</s:link></li> + <li class="selectable"><s:link href="/admin/company/" style="text-decoration: none;"><bean:message key="labels.company"/></s:link></li> <li class="last"></li> </ul> </div> @@ -22,13 +22,13 @@ <div class="list-table" style="margin-top:3px;"> <div> -<s:link href="createpage">Create New Person</s:link> +<s:link href="createpage"><bean:message key="labels.create_new_person"/></s:link> </div> <table border="1"> <thead> <tr> - <th style="width:150px;text-align: center;">Name</th> - <th style="width:200px;text-align: center;">Company</th> + <th style="width:150px;text-align: center;"><bean:message key="labels.name"/></th> + <th style="width:200px;text-align: center;"><bean:message key="labels.company"/></th> <th style="width:100px;text-align: center;"> </th> </tr> </thead> @@ -38,8 +38,8 @@ <td><s:link href="confirmpage/4/${f:u(p.id)}">${f:h(p.familyName)} ${f:h(p.givenName)}</s:link></td> <td>${f:h(p.company.name)}</td> <td align="center"> - <s:link href="editpage/2/${f:u(p.id)}">Edit</s:link> - <s:link href="deletepage/3/${f:u(p.id)}">Delete</s:link> + <s:link href="editpage/2/${f:u(p.id)}"><bean:message key="labels.edit"/></s:link> + <s:link href="deletepage/3/${f:u(p.id)}"><bean:message key="labels.delete"/></s:link> </td> </tr> </c:forEach> @@ -49,7 +49,7 @@ <div style="width: 450px;text-align: center;"> <span> <c:if test="${personPager.existPrePage}"> - <s:link href="list/${personPager.currentPageNumber - 1}">前へ</s:link> + <s:link href="list/${personPager.currentPageNumber - 1}"><bean:message key="labels.to_back"/></s:link> </c:if> </span> <span> @@ -66,7 +66,7 @@ </span> <span> <c:if test="${personPager.existNextPage}"> - <s:link href="list/${personPager.currentPageNumber + 1}">次へ</s:link> + <s:link href="list/${personPager.currentPageNumber + 1}"><bean:message key="labels.to_next"/></s:link> </c:if> </span> </div> Modified: addresslist/trunk/src/main/webapp/WEB-INF/view/config/index.jsp =================================================================== --- addresslist/trunk/src/main/webapp/WEB-INF/view/config/index.jsp 2008-11-13 06:58:14 UTC (rev 1345) +++ addresslist/trunk/src/main/webapp/WEB-INF/view/config/index.jsp 2008-11-13 09:47:05 UTC (rev 1346) @@ -10,17 +10,17 @@ <div class="form-table"> <s:form> <table> - <caption>Configuration</caption> + <caption><bean:message key="labels.configuration"/></caption> <tbody> <tr> - <th>Guest User Name</th> + <th><bean:message key="labels.guest_user_name"/></th> <td><html:text property="guestName" size="20"/></td> </tr> </tbody> <tfoot> <tr> <td colspan="2"> -<input type="submit" name="update" value="Update"/> +<input type="submit" name="update" value="<bean:message key="labels.update"/>"/> </td> </tr> </tfoot> Modified: addresslist/trunk/src/main/webapp/WEB-INF/view/user/company/confirm.jsp =================================================================== --- addresslist/trunk/src/main/webapp/WEB-INF/view/user/company/confirm.jsp 2008-11-13 06:58:14 UTC (rev 1345) +++ addresslist/trunk/src/main/webapp/WEB-INF/view/user/company/confirm.jsp 2008-11-13 09:47:05 UTC (rev 1346) @@ -10,9 +10,9 @@ <div class="tab-nav"> <ul> <li class="first"></li> - <li class="selectable"><s:link href="/user/person/" style="text-decoration: none;">Person</s:link></li> + <li class="selectable"><s:link href="/user/person/" style="text-decoration: none;"><bean:message key="labels.person"/></s:link></li> <li class="spacer"></li> - <li class="selected"><span>Company</span></li> + <li class="selected"><span><bean:message key="labels.company"/></span></li> <li class="last"></li> </ul> </div> @@ -25,65 +25,65 @@ <html:hidden property="mode"/> <div class="form-table" style="margin-top:3px;"> <table> - <caption>Confirm Company Info</caption> + <caption><bean:message key="labels.confirm_company_info"/></caption> <tbody> <tr> - <th style="width: 150px;">Name</th> + <th style="width: 150px;"><bean:message key="labels.name"/></th> <td style="width: 200px;">${f:h(name)}<html:hidden property="name"/></td> </tr> <tr> - <th>Name (Description)</th> + <th><bean:message key="labels.name_desc"/></th> <td>${f:h(nameDesc)}<html:hidden property="nameDesc"/></td> </tr> <tr> - <th>Department</th> + <th><bean:message key="labels.department"/></th> <td>${f:h(department)}<html:hidden property="department"/></td> </tr> <tr> - <th>Postal Code</th> + <th><bean:message key="labels.postal_code"/></th> <td>${f:h(postalCode)}<html:hidden property="postalCode"/></td> </tr> <tr> - <th>State</th> + <th><bean:message key="labels.state"/></th> <td>${f:h(state)}<html:hidden property="state"/></td> </tr> <tr> - <th>City</th> + <th><bean:message key="labels.city"/></th> <td>${f:h(city)}<html:hidden property="city"/></td> </tr> <tr> - <th>Street</th> + <th><bean:message key="labels.street"/></th> <td>${f:h(street)}<html:hidden property="street"/></td> </tr> <tr> - <th>Building/Others</th> + <th><bean:message key="labels.building"/></th> <td>${f:h(building)}<html:hidden property="building"/></td> </tr> <tr> - <th>Telephone 1</th> + <th><bean:message key="labels.tel1"/></th> <td>${f:h(telephone1)}<html:hidden property="telephone1"/></td> </tr> <tr> - <th>Telephone 2</th> + <th><bean:message key="labels.tel2"/></th> <td>${f:h(telephone2)}<html:hidden property="telephone2"/></td> </tr> <tr> - <th>FAX 1</th> + <th><bean:message key="labels.fax1"/></th> <td>${f:h(fax1)}<html:hidden property="fax1"/></td> </tr> <tr> - <th>FAX 2</th> + <th><bean:message key="labels.fax2"/></th> <td>${f:h(fax2)}<html:hidden property="fax2"/></td> </tr> <tr> - <th>URL</th> + <th><bean:message key="labels.url"/></th> <td>${f:h(url)}<html:hidden property="url"/></td> </tr> <tr> - <th>Public</th> + <th><bean:message key="labels.public"/></th> <td> -<c:if test="${isPublic=='T'}">Yes</c:if> -<c:if test="${isPublic=='F'}">No</c:if> +<c:if test="${isPublic=='T'}"><bean:message key="labels.yes"/></c:if> +<c:if test="${isPublic=='F'}"><bean:message key="labels.no"/></c:if> <html:hidden property="isPublic"/> </td> </tr> @@ -92,21 +92,21 @@ <tr> <td colspan="2"> <c:if test="${mode == 1}"> - <input type="submit" name="create" value="登録"/> - <input type="submit" name="editagain" value="戻る"/> + <input type="submit" name="create" value="<bean:message key="labels.create"/>"/> + <input type="submit" name="editagain" value="<bean:message key="labels.back"/>"/> </c:if> <c:if test="${mode == 2}"> - <input type="submit" name="update" value="更新"/> - <input type="submit" name="editagain" value="戻る"/> + <input type="submit" name="update" value="<bean:message key="labels.update"/>"/> + <input type="submit" name="editagain" value="<bean:message key="labels.back"/>"/> </c:if> <c:if test="${mode == 3}"> - <input type="submit" name="delete" value="削除"/> - <input type="submit" name="back" value="戻る"/> + <input type="submit" name="delete" value="<bean:message key="labels.delete"/>"/> + <input type="submit" name="back" value="<bean:message key="labels.back"/>"/> </c:if> <c:if test="${mode == 4}"> - <input type="submit" name="back" value="戻る"/> - <input type="submit" name="editpagefromconfirm" value="編集"/> - <input type="submit" name="deletepagefromconfirm" value="削除"/> + <input type="submit" name="back" value="<bean:message key="labels.back"/>"/> + <input type="submit" name="editpagefromconfirm" value="<bean:message key="labels.edit"/>"/> + <input type="submit" name="deletepagefromconfirm" value="<bean:message key="labels.delete"/>"/> </c:if> </td> </tr> Modified: addresslist/trunk/src/main/webapp/WEB-INF/view/user/company/edit.jsp =================================================================== --- addresslist/trunk/src/main/webapp/WEB-INF/view/user/company/edit.jsp 2008-11-13 06:58:14 UTC (rev 1345) +++ addresslist/trunk/src/main/webapp/WEB-INF/view/user/company/edit.jsp 2008-11-13 09:47:05 UTC (rev 1346) @@ -10,9 +10,9 @@ <div class="tab-nav"> <ul> <li class="first"></li> - <li class="selectable"><s:link href="/user/person/" style="text-decoration: none;">Person</s:link></li> + <li class="selectable"><s:link href="/user/person/" style="text-decoration: none;"><bean:message key="labels.person"/></s:link></li> <li class="spacer"></li> - <li class="selected"><span>Company</span></li> + <li class="selected"><span><bean:message key="labels.company"/></span></li> <li class="last"></li> </ul> </div> @@ -25,66 +25,66 @@ <html:hidden property="mode"/> <div class="form-table" style="margin-top:3px;"> <table> - <caption>Edit Company Info</caption> + <caption><bean:message key="labels.edit_company_info"/></caption> <tbody> <tr> - <th style="width: 150px;">Name</th> + <th style="width: 150px;"><bean:message key="labels.name"/></th> <td style="width: 200px;"><html:text property="name" size="20"/></td> </tr> <tr> - <th>Name (Description)</th> + <th><bean:message key="labels.name_desc"/></th> <td><html:text property="nameDesc" size="20"/></td> </tr> <tr> - <th>Department</th> + <th><bean:message key="labels.department"/></th> <td><html:text property="department" size="20"/></td> </tr> <tr> - <th>Postal Code</th> + <th><bean:message key="labels.postal_code"/></th> <td><html:text property="postalCode" size="20"/></td> </tr> <tr> - <th>State</th> + <th><bean:message key="labels.state"/></th> <td><html:text property="state" size="20"/></td> </tr> <tr> - <th>City</th> + <th><bean:message key="labels.city"/></th> <td><html:text property="city" size="20"/></td> </tr> <tr> - <th>Street</th> + <th><bean:message key="labels.street"/></th> <td><html:text property="street" size="20"/></td> </tr> <tr> - <th>Building/Others</th> + <th><bean:message key="labels.building"/></th> <td><html:text property="building" size="20"/></td> </tr> <tr> - <th>Telephone 1</th> + <th><bean:message key="labels.tel1"/></th> <td><html:text property="telephone1" size="20"/></td> </tr> <tr> - <th>Telephone 2</th> + <th><bean:message key="labels.tel2"/></th> <td><html:text property="telephone2" size="20"/></td> </tr> <tr> - <th>FAX 1</th> + <th><bean:message key="labels.fax1"/></th> <td><html:text property="fax1" size="20"/></td> </tr> <tr> - <th>FAX 2</th> + <th><bean:message key="labels.fax2"/></th> <td><html:text property="fax2" size="20"/></td> </tr> <tr> - <th>URL</th> + <th><bean:message key="labels.url"/></th> <td><html:text property="url" size="20"/></td> </tr> <tr> - <th>Public</th> + <th><bean:message key="labels.public"/></th> <td> <html:select property="isPublic"> - <html:option value="T">Yes</html:option> - <html:option value="F">No</html:option> + <html:option value="T"><bean:message key="labels.yes"/></html:option> + <html:option value="F"><bean:message key="labels.no"/></html:option> </html:select> </td> </tr> @@ -92,8 +92,8 @@ <tfoot> <tr> <td colspan="2"> - <input type="submit" name="confirm" value="確認"/> - <input type="submit" name="back" value="戻る"/> + <input type="submit" name="confirm" value="<bean:message key="labels.confirm"/>"/> + <input type="submit" name="back" value="<bean:message key="labels.back"/>"/> </td> </tr> </tfoot> Modified: addresslist/trunk/src/main/webapp/WEB-INF/view/user/company/error.jsp =================================================================== --- addresslist/trunk/src/main/webapp/WEB-INF/view/user/company/error.jsp 2008-11-13 06:58:14 UTC (rev 1345) +++ addresslist/trunk/src/main/webapp/WEB-INF/view/user/company/error.jsp 2008-11-13 09:47:05 UTC (rev 1346) @@ -9,9 +9,9 @@ <div class="tab-nav"> <ul> <li class="first"></li> - <li class="selectable"><s:link href="/user/person/" style="text-decoration: none;">Person</s:link></li> + <li class="selectable"><s:link href="/user/person/" style="text-decoration: none;"><bean:message key="labels.person"/></s:link></li> <li class="spacer"></li> - <li class="selected"><span>Company</span></li> + <li class="selected"><span><bean:message key="labels.company"/></span></li> <li class="last"></li> </ul> </div> @@ -19,7 +19,7 @@ <html:errors/> <br> -<s:link href="index">戻る</s:link> +<s:link href="index"><bean:message key="labels.back"/></s:link> </div> </body> </html> Modified: addresslist/trunk/src/main/webapp/WEB-INF/view/user/company/index.jsp =================================================================== --- addresslist/trunk/src/main/webapp/WEB-INF/view/user/company/index.jsp 2008-11-13 06:58:14 UTC (rev 1345) +++ addresslist/trunk/src/main/webapp/WEB-INF/view/user/company/index.jsp 2008-11-13 09:47:05 UTC (rev 1346) @@ -10,9 +10,9 @@ <div class="tab-nav"> <ul> <li class="first"></li> - <li class="selectable"><s:link href="/user/person/" style="text-decoration: none;">Person</s:link></li> + <li class="selectable"><s:link href="/user/person/" style="text-decoration: none;"><bean:message key="labels.person"/></s:link></li> <li class="spacer"></li> - <li class="selected"><span>Company</span></li> + <li class="selected"><span><bean:message key="labels.company"/></span></li> <li class="last"></li> </ul> </div> @@ -22,13 +22,13 @@ <div class="list-table" style="margin-top:3px;"> <div> -<s:link href="createpage">Create New Company</s:link> +<s:link href="createpage"><bean:message key="labels.create_new_company"/></s:link> </div> <table border="1"> <thead> <tr> - <th style="width:200px;text-align: center;">Name</th> - <th style="width:200px;text-align: center;">Department</th> + <th style="width:200px;text-align: center;"><bean:message key="labels.name"/></th> + <th style="width:200px;text-align: center;"><bean:message key="labels.department"/></th> <th style="width:100px;text-align: center;"> </th> </tr> </thead> @@ -38,8 +38,8 @@ <td><s:link href="confirmpage/4/${f:u(c.id)}">${f:h(c.name)}</s:link></td> <td>${f:h(c.department)}</td> <td align="center"> - <s:link href="editpage/2/${f:u(c.id)}">Edit</s:link> - <s:link href="deletepage/3/${f:u(c.id)}">Delete</s:link> + <s:link href="editpage/2/${f:u(c.id)}"><bean:message key="labels.edit"/></s:link> + <s:link href="deletepage/3/${f:u(c.id)}"><bean:message key="labels.delete"/></s:link> </td> </tr> </c:forEach> @@ -49,7 +49,7 @@ <div style="width: 450px;text-align: center;"> <span> <c:if test="${companyPager.existPrePage}"> - <s:link href="list/${companyPager.currentPageNumber - 1}">前へ</s:link> + <s:link href="list/${companyPager.currentPageNumber - 1}"><bean:message key="labels.to_back"/></s:link> </c:if> </span> <span> @@ -66,7 +66,7 @@ </span> <span> <c:if test="${companyPager.existNextPage}"> - <s:link href="list/${companyPager.currentPageNumber + 1}">次へ</s:link> + <s:link href="list/${companyPager.currentPageNumber + 1}"><bean:message key="labels.to_next"/></s:link> </c:if> </span> </div> Modified: addresslist/trunk/src/main/webapp/WEB-INF/view/user/person/confirm.jsp =================================================================== --- addresslist/trunk/src/main/webapp/WEB-INF/view/user/person/confirm.jsp 2008-11-13 06:58:14 UTC (rev 1345) +++ addresslist/trunk/src/main/webapp/WEB-INF/view/user/person/confirm.jsp 2008-11-13 09:47:05 UTC (rev 1346) @@ -10,9 +10,9 @@ <div class="tab-nav"> <ul> <li class="first"></li> - <li class="selected"><span>Person</span></li> + <li class="selected"><span><bean:message key="labels.person"/></span></li> <li class="spacer"></li> - <li class="selectable"><s:link href="/user/company/" style="text-decoration: none;">Company</s:link></li> + <li class="selectable"><s:link href="/user/company/" style="text-decoration: none;"><bean:message key="labels.company"/></s:link></li> <li class="last"></li> </ul> </div> @@ -25,54 +25,54 @@ <html:hidden property="mode"/> <div class="form-table" style="margin-top:3px;"> <table> - <caption>Address Info</caption> + <caption><bean:message key="labels.address_info"/></caption> <tbody> <tr> - <th style="width: 100px;">Person</th> + <th style="width: 100px;"><bean:message key="labels.person"/></th> <td> <table> <tbody> <tr> - <th style="width: 150px;">Family Name</th> + <th style="width: 150px;"><bean:message key="labels.f_name"/></th> <td style="width: 200px;">${f:h(familyName)}<html:hidden property="familyName"/></td> </tr> <tr> - <th>Family Name (Description)</th> + <th><bean:message key="labels.f_name_desc"/></th> <td>${f:h(familyNameDesc)}<html:hidden property="familyNameDesc"/></td> </tr> <tr> - <th style="width: 120px;">Given Name</th> + <th style="width: 120px;"><bean:message key="labels.g_name"/></th> <td>${f:h(givenName)}<html:hidden property="givenName"/></td> </tr> <tr> - <th>Given Name (Description)</th> + <th><bean:message key="labels.g_name_desc"/></th> <td>${f:h(givenNameDesc)}<html:hidden property="givenNameDesc"/></td> </tr> <tr> - <th>Middle name</th> + <th><bean:message key="labels.m_name"/></th> <td>${f:h(middleName)}<html:hidden property="middleName"/></td> </tr> <tr> - <th>Name Prefix</th> + <th><bean:message key="labels.name_prefix"/></th> <td>${f:h(namePrefix)}<html:hidden property="namePrefix"/></td> </tr> <tr> - <th>Name Suffix</th> + <th><bean:message key="labels.name_suffix"/></th> <td>${f:h(nameSuffix)}<html:hidden property="nameSuffix"/></td> </tr> <tr> - <th>Nickname</th> + <th><bean:message key="labels.nickname"/></th> <td>${f:h(nickname)}<html:hidden property="nickname"/></td> </tr> <tr> - <th>Job Title</th> + <th><bean:message key="labels.j_title"/></th> <td>${f:h(jobTitle)}<html:hidden property="jobTitle"/></td> </tr> <tr> - <th>Public</th> + <th><bean:message key="labels.public"/></th> <td> -<c:if test="${isPublic=='T'}">Yes</c:if> -<c:if test="${isPublic=='F'}">No</c:if> +<c:if test="${isPublic=='T'}"><bean:message key="labels.yes"/></c:if> +<c:if test="${isPublic=='F'}"><bean:message key="labels.no"/></c:if> <html:hidden property="isPublic"/> </td> </tr> @@ -81,48 +81,48 @@ </td> </tr> <tr> - <th>Contact</th> + <th><bean:message key="labels.contact"/></th> <td> <table> <tbody> <tr> - <th style="width: 150px;">Telephone (Home)</th> + <th style="width: 150px;"><bean:message key="labels.tel_h"/></th> <td style="width: 200px;">${f:h(homeTelephone)}<html:hidden property="homeTelephone"/></td> </tr> <tr> - <th>Cell Phone (Home)</th> + <th><bean:message key="labels.tel_mh"/></th> <td>${f:h(homeCellphone)}<html:hidden property="homeCellphone"/></td> </tr> <tr> - <th>Email (Home PC)</th> + <th><bean:message key="labels.mail_hp"/></th> <td>${f:h(homeEmailPC)}<html:hidden property="homeEmailPC"/></td> </tr> <tr> - <th>Email (Home Mobile)</th> + <th><bean:message key="labels.mail_hm"/></th> <td>${f:h(homeEmailMobile)}<html:hidden property="homeEmailMobile"/></td> </tr> <tr> - <th>FAX (Home)</th> + <th><bean:message key="labels.fax_h"/></th> <td>${f:h(homeFax)}<html:hidden property="homeFax"/></td> </tr> <tr> - <th>Telephone (Business)</th> + <th><bean:message key="labels.tel_b"/></th> <td>${f:h(businessTelephone)}<html:hidden property="businessTelephone"/></td> </tr> <tr> - <th>Cell Phone (Business)</th> + <th><bean:message key="labels.tel_mb"/></th> <td>${f:h(businessCellphone)}<html:hidden property="businessCellphone"/></td> </tr> <tr> - <th>Email (Business PC)</th> + <th><bean:message key="labels.mail_bp"/></th> <td>${f:h(businessEmailPC)}<html:hidden property="businessEmailPC"/></td> </tr> <tr> - <th>Email (Business Mobile)</th> + <th><bean:message key="labels.mail_bm"/></th> <td>${f:h(businessEmailMobile)}<html:hidden property="businessEmailMobile"/></td> </tr> <tr> - <th>FAX (Business)</th> + <th><bean:message key="labels.fax_b"/></th> <td>${f:h(businessFax)}<html:hidden property="businessFax"/></td> </tr> </tbody> @@ -130,28 +130,28 @@ </td> </tr> <tr> - <th>Home</th> + <th><bean:message key="labels.home"/></th> <td> <table> <tbody> <tr> - <th style="width: 150px;">Postal Code</th> + <th style="width: 150px;"><bean:message key="labels.postal_code"/></th> <td style="width: 200px;">${f:h(postalCode)}<html:hidden property="postalCode"/></td> </tr> <tr> - <th>State</th> + <th><bean:message key="labels.state"/></th> <td>${f:h(state)}<html:hidden property="state"/></td> </tr> <tr> - <th>City</th> + <th><bean:message key="labels.city"/></th> <td>${f:h(city)}<html:hidden property="city"/></td> </tr> <tr> - <th>Street</th> + <th><bean:message key="labels.street"/></th> <td>${f:h(street)}<html:hidden property="street"/></td> </tr> <tr> - <th>Building/Others</th> + <th><bean:message key="labels.building"/></th> <td>${f:h(building)}<html:hidden property="building"/></td> </tr> </tbody> @@ -159,70 +159,70 @@ </td> </tr> <tr> - <th>Company</th> + <th><bean:message key="labels.company"/></th> <td> <html:hidden property="companyId"/> <c:if test="${company!=null}"> <table> - <caption>Confirmation of Company</caption> + <caption><bean:message key="labels.c_o_company"/></caption> <tbody> <tr> - <th style="width: 150px;">Name</th> + <th style="width: 150px;"><bean:message key="labels.name"/></th> <td style="width: 200px;">${f:h(company.name)}</td> </tr> <tr> - <th>Name Description</th> + <th><bean:message key="labels.name_desc"/></th> <td>${f:h(company.nameDesc)}</td> </tr> <tr> - <th>Department</th> + <th><bean:message key="labels.department"/></th> <td>${f:h(company.department)}</td> </tr> <tr> - <th>Postal Code</th> + <th><bean:message key="labels.postal_code"/></th> <td>${f:h(company.postalCode)}</td> </tr> <tr> - <th>State</th> + <th><bean:message key="labels.state"/></th> <td>${f:h(company.state)}</td> </tr> <tr> - <th>City</th> + <th><bean:message key="labels.city"/></th> <td>${f:h(company.city)}</td> </tr> <tr> - <th>Street</th> + <th><bean:message key="labels.street"/></th> <td>${f:h(company.street)}</td> </tr> <tr> - <th>Building/Others</th> + <th><bean:message key="labels.building"/></th> <td>${f:h(company.building)}</td> </tr> <tr> - <th>Telephone 1</th> + <th><bean:message key="labels.tel1"/></th> <td>${f:h(company.telephone1)}</td> </tr> <tr> - <th>Telephone 2</th> + <th><bean:message key="labels.tel2"/></th> <td>${f:h(company.telephone2)}</td> </tr> <tr> - <th>FAX 1</th> + <th><bean:message key="labels.fax1"/></th> <td>${f:h(company.fax1)}</td> </tr> <tr> - <th>FAX 2</th> + <th><bean:message key="labels.fax2"/></th> <td>${f:h(company.fax2)}</td> </tr> <tr> - <th>URL</th> + <th><bean:message key="labels.url"/></th> <td>${f:h(company.url)}</td> </tr> <tr> - <th>Public</th> + <th><bean:message key="labels.public"/></th> <td> -<c:if test="${company.isPublic=='T'}">Yes</c:if> -<c:if test="${company.isPublic=='F'}">No</c:if> +<c:if test="${company.isPublic=='T'}"><bean:message key="labels.yes"/></c:if> +<c:if test="${company.isPublic=='F'}"><bean:message key="labels.no"/></c:if> </td> </tr> </tbody> @@ -231,24 +231,24 @@ </td> </tr> <tr> - <th>Custom</th> + <th><bean:message key="labels.custom"/></th> <td> <table> <tbody> <tr> - <th style="width: 150px;">Custom 1</th> + <th style="width: 150px;"><bean:message key="labels.custom1"/></th> <td style="width: 200px;">${f:h(customData1)}<html:hidden property="customData1"/></td> </tr> <tr> - <th>Custom 2</th> + <th><bean:message key="labels.custom2"/></th> <td>${f:h(customData2)}<html:hidden property="customData2"/></td> </tr> <tr> - <th>Custom 3</th> + <th><bean:message key="labels.custom3"/></th> <td>${f:h(customData3)}<html:hidden property="customData3"/></td> </tr> <tr> - <th>Custom 4</th> + <th><bean:message key="labels.custom4"/></th> <td>${f:h(customData4)}<html:hidden property="customData4"/></td> </tr> </tbody> @@ -260,21 +260,21 @@ <tr> <td colspan="2"> <c:if test="${mode == 1}"> - <input type="submit" name="create" value="登録"/> - <input type="submit" name="editagain" value="戻る"/> + <input type="submit" name="create" value="<bean:message key="labels.create"/>"/> + <input type="submit" name="editagain" value="<bean:message key="labels.back"/>"/> </c:if> <c:if test="${mode == 2}"> - <input type="submit" name="update" value="更新"/> - <input type="submit" name="editagain" value="戻る"/> + <input type="submit" name="update" value="<bean:message key="labels.update"/>"/> + <input type="submit" name="editagain" value="<bean:message key="labels.back"/>"/> </c:if> <c:if test="${mode == 3}"> - <input type="submit" name="delete" value="削除"/> - <input type="submit" name="back" value="戻る"/> + <input type="submit" name="delete" value="delete"/> + <input type="submit" name="back" value="<bean:message key="labels.back"/>"/> </c:if> <c:if test="${mode == 4}"> - <input type="submit" name="back" value="戻る"/> - <input type="submit" name="editpagefromconfirm" value="編集"/> - <input type="submit" name="deletepagefromconfirm" value="削除"/> + <input type="submit" name="back" value="<bean:message key="labels.back"/>"/> + <input type="submit" name="editpagefromconfirm" value="<bean:message key="labels.edit"/>"/> + <input type="submit" name="deletepagefromconfirm" value="<bean:message key="labels.delete"/>"/> </c:if> </td> </tr> Modified: addresslist/trunk/src/main/webapp/WEB-INF/view/user/person/edit.jsp =================================================================== --- addresslist/trunk/src/main/webapp/WEB-INF/view/user/person/edit.jsp 2008-11-13 06:58:14 UTC (rev 1345) +++ addresslist/trunk/src/main/webapp/WEB-INF/view/user/person/edit.jsp 2008-11-13 09:47:05 UTC (rev 1346) @@ -10,9 +10,9 @@ <div class="tab-nav"> <ul> <li class="first"></li> - <li class="selected"><span>Person</span></li> + <li class="selected"><span><bean:message key="labels.person"/></span></li> <li class="spacer"></li> - <li class="selectable"><s:link href="/user/company/" style="text-decoration: none;">Company</s:link></li> + <li class="selectable"><s:link href="/user/company/" style="text-decoration: none;"><bean:message key="labels.company"/></s:link></li> <li class="last"></li> </ul> </div> @@ -25,55 +25,55 @@ <html:hidden property="mode"/> <div class="form-table" style="margin-top:3px;"> <table> - <caption>Address Info</caption> + <caption><bean:message key="labels.address_info"/></caption> <tbody> <tr> - <th style="width: 100px;">Person</th> + <th style="width: 100px;"><bean:message key="labels.person"/></th> <td> <table> <tbody> <tr> - <th style="width: 150px;">Family Name</th> + <th style="width: 150px;"><bean:message key="labels.f_name"/></th> <td style="width: 200px;"><html:text property="familyName" size="20"/></td> </tr> <tr> - <th>Family Name (Description)</th> + <th><bean:message key="labels.f_name_desc"/></th> <td><html:text property="familyNameDesc" size="20"/></td> </tr> <tr> - <th style="width: 120px;">Given Name</th> + <th style="width: 120px;"><bean:message key="labels.g_name"/></th> <td><html:text property="givenName" size="20"/></td> </tr> <tr> - <th>Given Name (Description)</th> + <th><bean:message key="labels.g_name_desc"/></th> <td><html:text property="givenNameDesc" size="20"/></td> </tr> <tr> - <th>Middle name</th> + <th><bean:message key="labels.m_name"/></th> <td><html:text property="middleName" size="20"/></td> </tr> <tr> - <th>Name Prefix</th> + <th><bean:message key="labels.name_prefix"/></th> <td><html:text property="namePrefix" size="20"/></td> </tr> <tr> - <th>Name Suffix</th> + <th><bean:message key="labels.name_suffix"/></th> <td><html:text property="nameSuffix" size="20"/></td> </tr> <tr> - <th>Nickname</th> + <th><bean:message key="labels.nickname"/></th> <td><html:text property="nickname" size="20"/></td> </tr> <tr> - <th>Job Title</th> + <th><bean:message key="labels.j_title"/></th> <td><html:text property="jobTitle" size="20"/></td> </tr> <tr> - <th>Public</th> + <th><bean:message key="labels.public"/></th> <td> <html:select property="isPublic"> - <html:option value="T">Yes</html:option> - <html:option value="F">No</html:option> + <html:option value="T"><bean:message key="labels.yes"/></html:option> + <html:option value="F"><bean:message key="labels.no"/></html:option> </html:select> </td> </tr> @@ -82,48 +82,48 @@ </td> </tr> <tr> - <th>Contact</th> + <th><bean:message key="labels.contact"/></th> <td> <table> <tbody> <tr> - <th style="width: 150px;">Telephone (Home)</th> + <th style="width: 150px;"><bean:message key="labels.tel_h"/></th> <td style="width: 200px;"><html:text property="homeTelephone" size="20"/></td> </tr> <tr> - <th>Cell Phone (Home)</th> + <th><bean:message key="labels.tel_mh"/></th> <td><html:text property="homeCellphone" size="20"/></td> </tr> <tr> - <th>Email (Home PC)</th> + <th><bean:message key="labels.mail_hp"/></th> <td><html:text property="homeEmailPC" size="20"/></td> </tr> <tr> - <th>Email (Home Mobile)</th> + <th><bean:message key="labels.mail_hm"/></th> <td><html:text property="homeEmailMobile" size="20"/></td> </tr> <tr> - <th>FAX (Home)</th> + <th><bean:message key="labels.fax_h"/></th> <td><html:text property="homeFax" size="20"/></td> </tr> <tr> - <th>Telephone(Business)</th> + <th><bean:message key="labels.tel_b"/></th> <td><html:text property="businessTelephone" size="20"/></td> </tr> <tr> - <th>Cell Phone(Business)</th> + <th><bean:message key="labels.tel_mb"/></th> <td><html:text property="businessCellphone" size="20"/></td> </tr> <tr> - <th>Email(Business PC)</th> + <th><bean:message key="labels.mail_bp"/></th> <td><html:text property="businessEmailPC" size="20"/></td> </tr> <tr> - <th>Email(Business Mobile)</th> + <th><bean:message key="labels.mail_bm"/></th> <td><html:text property="businessEmailMobile" size="20"/></td> </tr> <tr> - <th>FAX(Business)</th> + <th><bean:message key="labels.fax_b"/></th> <td><html:text property="businessFax" size="20"/></td> </tr> </tbody> @@ -131,28 +131,28 @@ </td> </tr> <tr> - <th>Home</th> + <th><bean:message key="labels.home"/></th> <td> <table> <tbody> <tr> - <th style="width: 150px;">Postal Code</th> + <th style="width: 150px;"><bean:message key="labels.postal_code"/></th> <td style="width: 200px;"><html:text property="postalCode" size="20"/></td> </tr> <tr> - <th>State</th> + <th><bean:message key="labels.state"/></th> <td><html:text property="state" size="20"/></td> </tr> <tr> - <th>City</th> + <th><bean:message key="labels.city"/></th> <td><html:text property="city" size="20"/></td> </tr> <tr> - <th>Street</th> + <th><bean:message key="labels.street"/></th> <td><html:text property="street" size="20"/></td> </tr> <tr> - <th>Building/Others</th> + <th><bean:message key="labels.building"/></th> <td><html:text property="building" size="20"/></td> </tr> </tbody> @@ -160,10 +160,10 @@ </td> </tr> <tr> - <th>Company</th> + <th><bean:message key="labels.company"/></th> <td> <html:select property="companyId"> -<option value="">None</option> +<option value=""><bean:message key="labels.none"/></option> <c:forEach var="c" varStatus="s" items="${companyItems}"> <html:option value="${f:h(c.id)}">${f:h(c.name)}</html:option> </c:forEach> @@ -171,24 +171,24 @@ </td> </tr> <tr> - <th>Custom</th> + <th><bean:message key="labels.custom"/></th> <td> <table> <tbody> <tr> - <th style="width: 150px;">Custom 1</th> + <th style="width: 150px;"><bean:message key="labels.custom1"/></th> <td style="width: 200px;"><html:text property="customData1" size="20"/></td> </tr> <tr> - <th>Custom 2</th> + <th><bean:message key="labels.custom2"/></th> <td><html:text property="customData2" size="20"/></td> </tr> <tr> - <th>Custom 3</th> + <th><bean:message key="labels.custom3"/></th> <td><html:text property="customData3" size="20"/></td> </tr> <tr> - <th>Custom 4</th> + <th><bean:message key="labels.custom4"/></th> <td><html:text property="customData4" size="20"/></td> </tr> </tbody> @@ -199,8 +199,8 @@ <tfoot> <tr> <td colspan="2"> - <input type="submit" name="confirm" value="確認"/> - <input type="submit" name="back" value="戻る"/> + <input type="submit" name="confirm" value="<bean:message key="labels.confirm"/>"/> + <input type="submit" name="back" value="<bean:message key="labels.back"/>"/> </td> </tr> </tfoot> Modified: addresslist/trunk/src/main/webapp/WEB-INF/view/user/person/error.jsp =================================================================== --- addresslist/trunk/src/main/webapp/WEB-INF/view/user/person/error.jsp 2008-11-13 06:58:14 UTC (rev 1345) +++ addresslist/trunk/src/main/webapp/WEB-INF/view/user/person/error.jsp 2008-11-13 09:47:05 UTC (rev 1346) @@ -9,9 +9,9 @@ <div class="tab-nav"> <ul> <li class="first"></li> - <li class="selected"><span>Person</span></li> + <li class="selected"><span><bean:message key="labels.person"/></span></li> <li class="spacer"></li> - <li class="selectable"><s:link href="/user/company/" style="text-decoration: none;">Company</s:link></li> + <li class="selectable"><s:link href="/user/company/" style="text-decoration: none;"><bean:message key="labels.company"/></s:link></li> <li class="last"></li> </ul> </div> @@ -19,7 +19,7 @@ <html:errors/> <br> -<s:link href="index">戻る</s:link> +<s:link href="index"><bean:message key="labels.back"/></s:link> </div> </body> </html> 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-13 06:58:14 UTC (rev 1345) +++ addresslist/trunk/src/main/webapp/WEB-INF/view/user/person/index.jsp 2008-11-13 09:47:05 UTC (rev 1346) @@ -10,9 +10,9 @@ <div class="tab-nav"> <ul> <li class="first"></li> - <li class="selected"><span>Person</span></li> + <li class="selected"><span><bean:message key="labels.person"/></span></li> <li class="spacer"></li> - <li class="selectable"><s:link href="/user/company/" style="text-decoration: none;">Company</s:link></li> + <li class="selectable"><s:link href="/user/company/" style="text-decoration: none;"><bean:message key="labels.company"/></s:link></li> <li class="last"></li> </ul> </div> @@ -22,13 +22,13 @@ <div class="list-table" style="margin-top:3px;"> <div> -<s:link href="createpage">Create New Person</s:link> +<s:link href="createpage"><bean:message key="labels.create_new_person"/></s:link> </div> <table border="1"> <thead> <tr> - <th style="width:150px;text-align: center;">Name</th> - <th style="width:200px;text-align: center;">Company</th> + <th style="width:150px;text-align: center;"><bean:message key="labels.name"/></th> + <th style="width:200px;text-align: center;"><bean:message key="labels.company"/></th> <th style="width:100px;text-align: center;"> </th> </tr> </thead> @@ -38,8 +38,8 @@ <td><s:link href="confirmpage/4/${f:u(p.id)}">${f:h(p.familyName)} ${f:h(p.givenName)}</s:link></td> <td>${f:h(p.company.name)}</td> <td align="center"> - <s:link href="editpage/2/${f:u(p.id)}">Edit</s:link> - <s:link href="deletepage/3/${f:u(p.id)}">Delete</s:link> + <s:link href="editpage/2/${f:u(p.id)}"><bean:message key="labels.edit"/></s:link> + <s:link href="deletepage/3/${f:u(p.id)}"><bean:message key="labels.delete"/></s:link> </td> </tr> </c:forEach> @@ -49,7 +49,7 @@ <div style="width: 450px;text-align: center;"> <span> <c:if test="${personPager.existPrePage}"> - <s:link href="list/${personPager.currentPageNumber - 1}">前へ</s:link> + <s:link href="list/${personPager.currentPageNumber - 1}"><bean:message key="labels.to_back"/></s:link> </c:if> </span> <span> @@ -66,7 +66,7 @@ </span> <span> <c:if test="${personPager.existNextPage}"> - <s:link href="list/${personPager.currentPageNumber + 1}">次へ</s:link> + <s:link href="list/${personPager.currentPageNumber + 1}"><bean:message key="labels.to_next"/></s:link> </c:if> </span> </div>