svnno****@sourc*****
svnno****@sourc*****
2009年 1月 31日 (土) 07:04:55 JST
Revision: 1707
http://svn.sourceforge.jp/view?root=pal&view=rev&rev=1707
Author: shinsuke
Date: 2009-01-31 07:04:55 +0900 (Sat, 31 Jan 2009)
Log Message:
-----------
modified messages.
Modified Paths:
--------------
timecard/trunk/src/main/resources/application.properties
timecard/trunk/src/main/resources/application_ja.properties
timecard/trunk/src/main/webapp/WEB-INF/view/admin/timecard/confirm.jsp
timecard/trunk/src/main/webapp/WEB-INF/view/admin/timecard/edit.jsp
timecard/trunk/src/main/webapp/WEB-INF/view/admin/timecard/index.jsp
timecard/trunk/src/main/webapp/WEB-INF/view/employee/index.jsp
timecard/trunk/src/main/webapp/WEB-INF/view/manager/timecard/confirm.jsp
timecard/trunk/src/main/webapp/WEB-INF/view/manager/timecard/edit.jsp
timecard/trunk/src/main/webapp/WEB-INF/view/manager/timecard/index.jsp
-------------- next part --------------
Modified: timecard/trunk/src/main/resources/application.properties
===================================================================
--- timecard/trunk/src/main/resources/application.properties 2009-01-30 21:38:44 UTC (rev 1706)
+++ timecard/trunk/src/main/resources/application.properties 2009-01-30 22:04:55 UTC (rev 1707)
@@ -64,6 +64,8 @@
errors.invalid_state_retry_download_csv=Invalid state. Please retry it after reload a page.
+errors.employee_already_exists=The employee already exists.
+
labels.detail=Detail
labels.create=Create
labels.update=Update
@@ -120,7 +122,7 @@
labels.otj_time=Off-duty time
labels.editing=Editing now
labels.request=Request
-labels.recognized=Approved
+labels.approved=Approved
labels.memo=Memo
labels.edit_timecard=Editing timecard
@@ -167,7 +169,7 @@
labels.auto_fill=Auto fill
labels.fix_monthly_report=Fixing monthly report
-labels.recognized2=Approved
+labels.approved2=Approved
labels.recognize=Approve
labels.holiday_list=Holiday List
Modified: timecard/trunk/src/main/resources/application_ja.properties
===================================================================
--- timecard/trunk/src/main/resources/application_ja.properties 2009-01-30 21:38:44 UTC (rev 1706)
+++ timecard/trunk/src/main/resources/application_ja.properties 2009-01-30 22:04:55 UTC (rev 1707)
@@ -57,6 +57,8 @@
errors.invalid_state_retry_download_csv=\u72b6\u614b\u304c\u6b63\u3057\u304f\u3042\u308a\u307e\u305b\u3093\u3002\u30da\u30fc\u30b8\u3092\u30ea\u30ed\u30fc\u30c9\u5f8c\u3001\u518d\u5ea6\u8a66\u3057\u3066\u304f\u3060\u3055\u3044\u3002
+errors.employee_already_exists=\u305d\u306e\u5f93\u696d\u54e1\u306f\u65e2\u306b\u5b58\u5728\u3057\u307e\u3059\u3002
+
labels.detail=\u8a73\u7d30
labels.create=\u4f5c\u6210
labels.update=\u66f4\u65b0
@@ -113,7 +115,7 @@
labels.otj_time=\u52e4\u52d9\u5916\u6642\u9593
labels.editing=\u7de8\u96c6\u4e2d
labels.request=\u7533\u8acb
-labels.recognized=\u627f\u8a8d\u6e08
+labels.approved=\u627f\u8a8d\u6e08
labels.memo=\u30e1\u30e2
labels.edit_timecard=\u6642\u523b\u7de8\u96c6
@@ -160,7 +162,7 @@
labels.auto_fill=\u81ea\u52d5\u8a18\u5165
labels.fix_monthly_report=\u6708\u6b21\u78ba\u5b9a
-labels.recognized2=\u627f\u8a8d\u6e08\u307f
+labels.approved2=\u627f\u8a8d\u6e08\u307f
labels.recognize=\u627f\u8a8d
labels.holiday_list=\u4f11\u65e5\u4e00\u89a7
Modified: timecard/trunk/src/main/webapp/WEB-INF/view/admin/timecard/confirm.jsp
===================================================================
--- timecard/trunk/src/main/webapp/WEB-INF/view/admin/timecard/confirm.jsp 2009-01-30 21:38:44 UTC (rev 1706)
+++ timecard/trunk/src/main/webapp/WEB-INF/view/admin/timecard/confirm.jsp 2009-01-30 22:04:55 UTC (rev 1707)
@@ -143,7 +143,7 @@
<td>
<c:if test="${status == 1}"><bean:message key="labels.editing"/></c:if>
<c:if test="${status == 2}"><bean:message key="labels.request"/></c:if>
-<c:if test="${status == 10}"><bean:message key="labels.recognized"/></c:if>
+<c:if test="${status == 10}"><bean:message key="labels.approved"/></c:if>
<html:hidden property="status"/>
</td>
</tr>
Modified: timecard/trunk/src/main/webapp/WEB-INF/view/admin/timecard/edit.jsp
===================================================================
--- timecard/trunk/src/main/webapp/WEB-INF/view/admin/timecard/edit.jsp 2009-01-30 21:38:44 UTC (rev 1706)
+++ timecard/trunk/src/main/webapp/WEB-INF/view/admin/timecard/edit.jsp 2009-01-30 22:04:55 UTC (rev 1707)
@@ -152,7 +152,7 @@
<html:select property="status">
<html:option value="1"><bean:message key="labels.editing"/></html:option>
<html:option value="2"><bean:message key="labels.request"/></html:option>
-<html:option value="10"><bean:message key="labels.recognized"/></html:option>
+<html:option value="10"><bean:message key="labels.approved"/></html:option>
</html:select>
</td>
</tr>
Modified: timecard/trunk/src/main/webapp/WEB-INF/view/admin/timecard/index.jsp
===================================================================
--- timecard/trunk/src/main/webapp/WEB-INF/view/admin/timecard/index.jsp 2009-01-30 21:38:44 UTC (rev 1706)
+++ timecard/trunk/src/main/webapp/WEB-INF/view/admin/timecard/index.jsp 2009-01-30 22:04:55 UTC (rev 1707)
@@ -99,7 +99,7 @@
<html:select property="status">
<html:option value="1"><bean:message key="labels.editing"/></html:option>
<html:option value="2"><bean:message key="labels.request"/></html:option>
-<html:option value="10"><bean:message key="labels.recognized"/></html:option>
+<html:option value="10"><bean:message key="labels.approved"/></html:option>
</html:select>
</td>
</tr>
@@ -185,7 +185,7 @@
<td style="text-align: center;">
<c:if test="${dr.status == 1}"><bean:message key="labels.editing"/></c:if>
<c:if test="${dr.status == 2}"><bean:message key="labels.request"/></c:if>
-<c:if test="${dr.status == 10}"><bean:message key="labels.recognized"/></c:if>
+<c:if test="${dr.status == 10}"><bean:message key="labels.approved"/></c:if>
</td>
<td style="text-align: center;"><s:link href="editpage/2/${f:u(dr.id)}/${year}/${month}/${username}"><bean:message key="labels.edit"/></s:link></td>
</tr>
Modified: timecard/trunk/src/main/webapp/WEB-INF/view/employee/index.jsp
===================================================================
--- timecard/trunk/src/main/webapp/WEB-INF/view/employee/index.jsp 2009-01-30 21:38:44 UTC (rev 1706)
+++ timecard/trunk/src/main/webapp/WEB-INF/view/employee/index.jsp 2009-01-30 22:04:55 UTC (rev 1707)
@@ -79,7 +79,7 @@
<td style="text-align: center;">
<c:if test="${monthlyReport.status==1}"><bean:message key="labels.editing"/></c:if>
<c:if test="${monthlyReport.status==2}"><bean:message key="labels.request"/></c:if>
-<c:if test="${monthlyReport.status==10}"><bean:message key="labels.recognized"/></c:if>
+<c:if test="${monthlyReport.status==10}"><bean:message key="labels.approved"/></c:if>
</td>
</tr>
<c:if test="${monthlyReport.status==1}">
@@ -168,7 +168,7 @@
<td style="text-align: center;">
<c:if test="${dr.status == 1}"><bean:message key="labels.editing"/></c:if>
<c:if test="${dr.status == 2}"><bean:message key="labels.request"/></c:if>
-<c:if test="${dr.status == 10}"><bean:message key="labels.request"/></c:if>
+<c:if test="${dr.status == 10}"><bean:message key="labels.approved"/></c:if>
</td>
<td style="text-align: center;">
<c:if test="${dr.status < 10}">
Modified: timecard/trunk/src/main/webapp/WEB-INF/view/manager/timecard/confirm.jsp
===================================================================
--- timecard/trunk/src/main/webapp/WEB-INF/view/manager/timecard/confirm.jsp 2009-01-30 21:38:44 UTC (rev 1706)
+++ timecard/trunk/src/main/webapp/WEB-INF/view/manager/timecard/confirm.jsp 2009-01-30 22:04:55 UTC (rev 1707)
@@ -142,7 +142,7 @@
<th><bean:message key="labels.status"/></th>
<td>
<c:if test="${status == 1}"><bean:message key="labels.editing"/></c:if>
-<c:if test="${status == 10}"><bean:message key="labels.recognized"/></c:if>
+<c:if test="${status == 10}"><bean:message key="labels.approved"/></c:if>
<html:hidden property="status"/>
</td>
</tr>
Modified: timecard/trunk/src/main/webapp/WEB-INF/view/manager/timecard/edit.jsp
===================================================================
--- timecard/trunk/src/main/webapp/WEB-INF/view/manager/timecard/edit.jsp 2009-01-30 21:38:44 UTC (rev 1706)
+++ timecard/trunk/src/main/webapp/WEB-INF/view/manager/timecard/edit.jsp 2009-01-30 22:04:55 UTC (rev 1707)
@@ -151,7 +151,7 @@
<td>
<html:select property="status">
<html:option value="1"><bean:message key="labels.editing"/></html:option>
-<html:option value="10"><bean:message key="labels.recognized"/></html:option>
+<html:option value="10"><bean:message key="labels.approved"/></html:option>
</html:select>
</td>
</tr>
Modified: timecard/trunk/src/main/webapp/WEB-INF/view/manager/timecard/index.jsp
===================================================================
--- timecard/trunk/src/main/webapp/WEB-INF/view/manager/timecard/index.jsp 2009-01-30 21:38:44 UTC (rev 1706)
+++ timecard/trunk/src/main/webapp/WEB-INF/view/manager/timecard/index.jsp 2009-01-30 22:04:55 UTC (rev 1707)
@@ -102,12 +102,12 @@
<html:select property="status">
<html:option value="1"><bean:message key="labels.editing"/></html:option>
<html:option value="2"><bean:message key="labels.request"/></html:option>
-<html:option value="10"><bean:message key="labels.recognized"/></html:option>
+<html:option value="10"><bean:message key="labels.approved"/></html:option>
</html:select>
</td>
</c:if>
<c:if test="${status==10}">
- <td style="text-align: center;"><bean:message key="labels.recognized2"/></td>
+ <td style="text-align: center;"><bean:message key="labels.approved2"/></td>
</c:if>
</tr>
</tbody>
@@ -188,7 +188,7 @@
<td style="text-align: center;">
<c:if test="${dr.status == 1}"><bean:message key="labels.editing"/></c:if>
<c:if test="${dr.status == 2}"><bean:message key="labels.request"/></c:if>
-<c:if test="${dr.status == 10}"><bean:message key="labels.recognized"/></c:if>
+<c:if test="${dr.status == 10}"><bean:message key="labels.approved"/></c:if>
</td>
<td style="text-align: center;">
<c:if test="${dr.status == 2}">