svnno****@sourc*****
svnno****@sourc*****
2008年 11月 26日 (水) 17:53:03 JST
Revision: 1447
http://svn.sourceforge.jp/view?root=pal&view=rev&rev=1447
Author: sone
Date: 2008-11-26 17:53:03 +0900 (Wed, 26 Nov 2008)
Log Message:
-----------
i18ned scheduler
Modified Paths:
--------------
scheduler/trunk/src/main/resources/application.properties
scheduler/trunk/src/main/resources/application_ja.properties
scheduler/trunk/src/main/webapp/WEB-INF/view/admin/facility/facility/confirm.jsp
scheduler/trunk/src/main/webapp/WEB-INF/view/admin/facility/facility/edit.jsp
scheduler/trunk/src/main/webapp/WEB-INF/view/admin/facility/facility/error.jsp
scheduler/trunk/src/main/webapp/WEB-INF/view/admin/facility/facility/index.jsp
scheduler/trunk/src/main/webapp/WEB-INF/view/admin/facility/facilityGroup/confirm.jsp
scheduler/trunk/src/main/webapp/WEB-INF/view/admin/facility/facilityGroup/edit.jsp
scheduler/trunk/src/main/webapp/WEB-INF/view/admin/facility/facilityGroup/error.jsp
scheduler/trunk/src/main/webapp/WEB-INF/view/admin/facility/facilityGroup/index.jsp
scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/onetimeSchedule/confirm.jsp
scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/onetimeSchedule/edit.jsp
scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/onetimeSchedule/error.jsp
scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/onetimeSchedule/facilitylist.jsp
scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/onetimeSchedule/index.jsp
scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/onetimeSchedule/userlist.jsp
scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/repeatSchedule/confirm.jsp
scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/repeatSchedule/edit.jsp
scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/repeatSchedule/error.jsp
scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/repeatSchedule/facilitylist.jsp
scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/repeatSchedule/index.jsp
scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/repeatSchedule/userlist.jsp
scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/calendar/facilityday.jsp
scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/calendar/facilitymonth.jsp
scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/calendar/facilityweek.jsp
scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/calendar/groupweek.jsp
scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/facility/confirm.jsp
scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/facility/index.jsp
scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/onetimeSchedule/confirm.jsp
scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/onetimeSchedule/edit.jsp
scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/onetimeSchedule/error.jsp
scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/onetimeSchedule/facilitylist.jsp
scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/onetimeSchedule/userlist.jsp
scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/repeatSchedule/confirm.jsp
scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/repeatSchedule/edit.jsp
scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/repeatSchedule/error.jsp
scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/repeatSchedule/facilitylist.jsp
scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/repeatSchedule/userlist.jsp
scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/calendar/groupweek.jsp
scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/calendar/personalday.jsp
scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/calendar/personalmonth.jsp
scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/calendar/personalweek.jsp
scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/onetimeSchedule/confirm.jsp
scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/onetimeSchedule/edit.jsp
scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/onetimeSchedule/error.jsp
scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/onetimeSchedule/facilitylist.jsp
scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/onetimeSchedule/userlist.jsp
scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/repeatSchedule/confirm.jsp
scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/repeatSchedule/edit.jsp
scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/repeatSchedule/error.jsp
scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/repeatSchedule/facilitylist.jsp
scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/repeatSchedule/userlist.jsp
-------------- next part --------------
Modified: scheduler/trunk/src/main/resources/application.properties
===================================================================
--- scheduler/trunk/src/main/resources/application.properties 2008-11-25 13:45:04 UTC (rev 1446)
+++ scheduler/trunk/src/main/resources/application.properties 2008-11-26 08:53:03 UTC (rev 1447)
@@ -84,3 +84,105 @@
errors.invalid_date_format=Invalid date format({0}).
errors.invalid_time_format=Invalid time format({0}).
errors.invalid_end_date=To Date/Time must be after From Date/Time.
+
+labels.facilities=Facilities
+labels.facility_groups=Facility Groups
+labels.confirmation_of_facility=Confirmation Of Facility
+labels.facility_name=Facility Name
+labels.facility_group=Facility Group
+labels.facility_group_name=Facility Group Name
+labels.edit_facility=Edit Facility
+
+labels.comment=Comment
+labels.create_new=Create New
+labels.sort=Sort
+labels.up=Up
+labels.down=Down
+
+labels.previous=Previous
+labels.next=Next
+
+labels.group=Group
+labels.search=Search
+labels.reset=Reset
+labels.details=Details
+
+labels.edit_facility_group=Edit Facility Group
+
+labels.one_time=One Time
+labels.repeats=Repeats
+
+labels.what=What
+labels.where=Where
+labels.when=When
+labels.from=From:
+labels.to=To:
+labels.description=Description
+labels.privacy=Privacy
+labels.public=Public
+labels.private=Private
+labels.assigned=Assigned
+labels.name=Name
+labels.select_facilities=Select Facilities
+labels.facility_list=Facility List
+
+labels.add=Add
+labels.remove=Remove
+labels.selected_facility_list=Selected Facility List
+
+labels.ok=OK
+labels.id=ID
+labels.title=Title
+
+labels.user_list=User List
+labels.selected_user_list=Selected User List
+
+labels.mtwtfss=Daily
+labels.mtwtf=Every weekday (Mon-Fri)
+labels.mwf=Every Mon., Wed., and Fri.
+labels.tt=Every Tues., and Thurs.
+labels.weekly=Weekly
+labels.monthly=Monthly
+labels.yearly=Yearly
+
+labels.select_users=Select Users
+
+labels.day=Day
+labels.week=Week
+labels.month=Month
+labels.today=Today
+labels.sun=S
+labels.mon=M
+labels.tue=T
+labels.wed=W
+labels.thu=T
+labels.fri=F
+labels.sat=S
+
+labels.time=Time
+labels.events=Events
+labels.all_day=All Day
+
+labels.sun2=Sun
+labels.mon2=Mon
+labels.tue2=Tue
+labels.wed2=Wed
+labels.thu2=Thu
+labels.fri2=Fri
+labels.sat2=Sat
+
+labels.facility=Facility
+labels.facility_groups=Facility Groups
+
+labels.calendar=Calendar
+
+labels.display=Display
+
+labels.to2=To
+labels.from2=From
+
+labels.user_group=User Group
+
+labels.week_group=Week(Group)
+labels.group_week=Group(Week)
+labels.change=Change
\ No newline at end of file
Modified: scheduler/trunk/src/main/resources/application_ja.properties
===================================================================
--- scheduler/trunk/src/main/resources/application_ja.properties 2008-11-25 13:45:04 UTC (rev 1446)
+++ scheduler/trunk/src/main/resources/application_ja.properties 2008-11-26 08:53:03 UTC (rev 1447)
@@ -23,23 +23,38 @@
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_singleSchedule=Created your event.
-success.update_singleSchedule=Updated your event.
-success.delete_singleSchedule=Deleted your event.
-success.create_routineSchedule=Created your event.
-success.update_routineSchedule=Updated your event.
-success.delete_routineSchedule=Deleted your event.
+success.create_eventSchedule=\u30a4\u30d9\u30f3\u30c8\u3092\u4f5c\u6210\u3057\u307e\u3057\u305f\u3002
+success.update_eventSchedule=\u30a4\u30d9\u30f3\u30c8\u3092\u66f4\u65b0\u3057\u307e\u3057\u305f\u3002
+success.delete_eventSchedule=\u30a4\u30d9\u30f3\u30c8\u3092\u524a\u9664\u3057\u307e\u3057\u305f\u3002
+success.create_facilityGroup=\u65bd\u8a2d\u30b0\u30eb\u30fc\u30d7\u3092\u4f5c\u6210\u3057\u307e\u3057\u305f\u3002
+success.update_facilityGroup=\u65bd\u8a2d\u30b0\u30eb\u30fc\u30d7\u3092\u66f4\u65b0\u3057\u307e\u3057\u305f\u3002
+success.delete_facilityGroup=\u65bd\u8a2d\u30b0\u30eb\u30fc\u30d7\u3092\u524a\u9664\u3057\u307e\u3057\u305f\u3002
+success.moveup_facilityGroup=\u65bd\u8a2d\u30b0\u30eb\u30fc\u30d7\u3092\u4e0a\u3078\u79fb\u52d5\u3057\u307e\u3057\u305f\u3002
+success.movedown_facilityGroup=\u65bd\u8a2d\u30b0\u30eb\u30fc\u30d7\u3092\u4e0b\u3078\u79fb\u52d5\u3057\u307e\u3057\u305f\u3002
+success.create_facility=\u65bd\u8a2d\u3092\u4f5c\u6210\u3057\u307e\u3057\u305f\u3002
+success.update_facility=\u65bd\u8a2d\u3092\u66f4\u65b0\u3057\u307e\u3057\u305f\u3002
+success.delete_facility=\u65bd\u8a2d\u3092\u524a\u9664\u3057\u307e\u3057\u305f\u3002
+success.moveup_facility=\u65bd\u8a2d\u3092\u4e0a\u306b\u79fb\u52d5\u3057\u307e\u3057\u305f\u3002
+success.movedown_facility=\u65bd\u8a2d\u3092\u4e0b\u3078\u79fb\u52d5\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_singleSchedule=Failed to create a new event.
-errors.failed_to_update_singleSchedule=Failed to update the event.
-errors.failed_to_delete_singleSchedule=Failed to delete the event.
-errors.could_not_find_singleSchedule=Could not find the event({0}).
-errors.failed_to_create_routineSchedule=Failed to create a new event.
-errors.failed_to_update_routineSchedule=Failed to update the event.
-errors.failed_to_delete_routineSchedule=Failed to delete the event.
-errors.could_not_find_routineSchedule=Could not find the event({0}).
+errors.failed_to_create_eventSchedule=\u30a4\u30d9\u30f3\u30c8\u306e\u4f5c\u6210\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002
+errors.failed_to_update_eventSchedule=\u30a4\u30d9\u30f3\u30c8\u306e\u66f4\u65b0\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002
+errors.failed_to_delete_eventSchedule=\u30a4\u30d9\u30f3\u30c8\u306e\u524a\u9664\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002
+errors.could_not_find_eventSchedule=\u30a4\u30d9\u30f3\u30c8({0})\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3067\u3057\u305f\u3002
+errors.failed_to_create_facilityGroup=\u65bd\u8a2d\u30b0\u30eb\u30fc\u30d7\u306e\u4f5c\u6210\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002
+errors.failed_to_update_facilityGroup=\u65bd\u8a2d\u30b0\u30eb\u30fc\u30d7\u306e\u66f4\u65b0\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002
+errors.failed_to_delete_facilityGroup=\u65bd\u8a2d\u30b0\u30eb\u30fc\u30d7\u306e\u524a\u9664\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002
+errors.could_not_find_facilityGroup=\u65bd\u8a2d\u30b0\u30eb\u30fc\u30d7({0})\u306f\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3067\u3057\u305f\u3002
+errors.failed_to_moveup_facilityGroup=\u65bd\u8a2d\u30b0\u30eb\u30fc\u30d7\u3092\u4e0a\u3078\u79fb\u52d5\u3059\u308b\u3053\u3068\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002
+errors.failed_to_movedown_facilityGroup=\u65bd\u8a2d\u30b0\u30eb\u30fc\u30d7\u3092\u4e0b\u3078\u79fb\u52d5\u3059\u308b\u3053\u3068\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002
+errors.failed_to_create_facility=\u65bd\u8a2d\u306e\u65b0\u898f\u4f5c\u6210\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002
+errors.failed_to_update_facility=\u65bd\u8a2d\u306e\u66f4\u65b0\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002
+errors.failed_to_delete_facility=\u65bd\u8a2d\u306e\u524a\u9664\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002
+errors.could_not_find_facility=\u65bd\u8a2d({0})\u306f\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3067\u3057\u305f\u3002
+errors.failed_to_moveup_facility=\u65bd\u8a2d\u3092\u4e0a\u3078\u79fb\u52d5\u3059\u308b\u3053\u3068\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002
+errors.failed_to_movedown_facility=\u65bd\u8a2d\u3092\u4e0b\u3078\u79fb\u52d5\u3059\u308b\u3053\u3068\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002
labels.detail=\u8a73\u7d30
labels.create=\u4f5c\u6210
@@ -53,5 +68,113 @@
errors.invalid_date_format=\u65e5\u4ed8\u5f62\u5f0f\u304c\u6b63\u3057\u304f\u3042\u308a\u307e\u305b\u3093({0})\u3002
errors.invalid_time_format=\u6642\u9593\u5f62\u5f0f\u304c\u6b63\u3057\u304f\u3042\u308a\u307e\u305b\u3093({0})\u3002
-errors.invalid_end_date=To Date/Time must be after From Date/Time.
+errors.invalid_end_date=\u958b\u59cb\u65e5\u306f\u7d42\u4e86\u65e5\u3088\u308a\u524d\u3067\u306a\u304f\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002
+labels.event_detail=\u30a4\u30d9\u30f3\u30c8\u306e\u8a73\u7d30
+labels.confirmation_of_event=\u30a4\u30d9\u30f3\u30c8\u306e\u78ba\u5b9a
+
+labels.create_new_event=\u30a4\u30d9\u30f3\u30c8\u306e\u4f5c\u6210
+labels.to_next=\u6b21\u3078
+labels.to_back=\u623b\u308b
+
+labels.facilities=\u65bd\u8a2d
+labels.facility_groups=\u65bd\u8a2d\u30b0\u30eb\u30fc\u30d7
+labels.confirmation_of_facility=\u65bd\u8a2d\u306e\u78ba\u8a8d
+labels.facility_name=\u65bd\u8a2d\u540d
+labels.facility_group=\u65bd\u8a2d\u30b0\u30eb\u30fc\u30d7
+labels.facility_group_name=\u65bd\u8a2d\u30b0\u30eb\u30fc\u30d7\u540d
+labels.edit_facility=\u65bd\u8a2d\u306e\u7de8\u96c6
+
+labels.comment=\u30b3\u30e1\u30f3\u30c8
+labels.create_new=\u65b0\u898f\u4f5c\u6210
+labels.sort=\u30bd\u30fc\u30c8
+labels.up=\u4e0a\u3078
+labels.down=\u4e0b\u3078
+
+labels.previous=\u524d\u3078
+labels.next=\u6b21\u3078
+
+labels.group=\u30b0\u30eb\u30fc\u30d7
+labels.search=\u691c\u7d22
+labels.reset=\u30ea\u30bb\u30c3\u30c8
+labels.details=\u8a73\u7d30
+
+labels.edit_facility_group=\u65bd\u8a2d\u30b0\u30eb\u30fc\u30d7\u306e\u7de8\u96c6
+
+labels.one_time=\u4e00\u56de\u9650\u308a
+labels.repeats=\u7e70\u308a\u8fd4\u3057
+
+labels.what=\u6982\u8981
+labels.where=\u5834\u6240
+labels.when=\u6642\u9593
+labels.from=\u958b\u59cb\u65e5\u6642:
+labels.to=\u7d42\u4e86\u65e5\u6642:
+labels.description=\u8a73\u7d30
+labels.privacy=\u30d7\u30e9\u30a4\u30d0\u30b7\u30fc
+labels.public=\u516c\u958b
+labels.private=\u975e\u516c\u958b
+labels.assigned=\u62c5\u5f53\u8005
+labels.name=\u540d\u524d
+labels.select_facilities=\u65bd\u8a2d\u9078\u629e
+labels.facility_list=\u65bd\u8a2d\u30ea\u30b9\u30c8
+
+labels.add=\u8ffd\u52a0
+labels.remove=\u524a\u9664
+labels.selected_facility_list=\u9078\u629e\u3055\u308c\u305f\u65bd\u8a2d\u306e\u30ea\u30b9\u30c8
+
+labels.ok=OK
+labels.id=ID
+labels.title=\u30bf\u30a4\u30c8\u30eb
+
+labels.user_list=\u30e6\u30fc\u30b6\u30fc\u30ea\u30b9\u30c8
+labels.selected_user_list=\u9078\u629e\u3055\u308c\u305f\u30e6\u30fc\u30b6\u30fc\u306e\u30ea\u30b9\u30c8
+
+labels.mtwtfss=\u6bce\u65e5
+labels.mtwtf=\u5e73\u65e5(\u6708-\u91d1)
+labels.mwf=\u6bce\u9031\u3001\u6708\u30fb\u6c34\u30fb\u91d1\u66dc\u65e5
+labels.tt=\u6bce\u9031\u3001\u706b\u30fb\u6728\u66dc\u65e5
+labels.weekly=\u4e00\u9031\u9593\u3054\u3068
+labels.monthly=\u4e00\u6708\u3054\u3068
+labels.yearly=\u4e00\u5e74\u3054\u3068
+
+labels.select_users=\u30e6\u30fc\u30b6\u30fc\u9078\u629e
+
+labels.day=\u65e5
+labels.week=\u9031
+labels.month=\u6708
+labels.today=\u672c\u65e5
+labels.sun=\u65e5
+labels.mon=\u6708
+labels.tue=\u706b
+labels.wed=\u6c34
+labels.thu=\u6728
+labels.fri=\u91d1
+labels.sat=\u571f
+
+labels.time=\u6642\u9593
+labels.events=\u30a4\u30d9\u30f3\u30c8
+labels.all_day=\u7d42\u65e5
+
+labels.sun2=\u65e5\u66dc
+labels.mon2=\u6708\u66dc
+labels.tue2=\u706b\u66dc
+labels.wed2=\u6c34\u66dc
+labels.thu2=\u6728\u66dc
+labels.fri2=\u91d1\u66dc
+labels.sat2=\u571f\u66dc
+
+labels.facility=\u65bd\u8a2d
+labels.facility_groups=\u65bd\u8a2d\u30b0\u30eb\u30fc\u30d7
+
+labels.calendar=\u30ab\u30ec\u30f3\u30c0\u30fc
+
+labels.display=\u8868\u793a
+
+labels.to2=\u7d42\u4e86
+labels.from2=\u958b\u59cb
+
+labels.user_group=\u30e6\u30fc\u30b6\u30fc\u30b0\u30eb\u30fc\u30d7
+
+labels.week_group=\u9031(\u30b0\u30eb\u30fc\u30d7)
+labels.group_week=\u30b0\u30eb\u30fc\u30d7(\u9031)
+labels.change=\u5909\u66f4
\ No newline at end of file
Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/admin/facility/facility/confirm.jsp
===================================================================
--- scheduler/trunk/src/main/webapp/WEB-INF/view/admin/facility/facility/confirm.jsp 2008-11-25 13:45:04 UTC (rev 1446)
+++ scheduler/trunk/src/main/webapp/WEB-INF/view/admin/facility/facility/confirm.jsp 2008-11-26 08:53:03 UTC (rev 1447)
@@ -10,9 +10,9 @@
<div class="tab-nav">
<ul>
<li class="first"></li>
- <li class="selected"><span>Facilities</span></li>
+ <li class="selected"><span><bean:message key="labels.facilities"/></span></li>
<li class="spacer"></li>
- <li class="selectable"><s:link href="/admin/facility/facilityGroup/" style="text-decoration: none;">Facility Groups</s:link></li>
+ <li class="selectable"><s:link href="/admin/facility/facilityGroup/" style="text-decoration: none;"><bean:message key="labels.facility_groups"/></s:link></li>
<li class="last"></li>
</ul>
</div>
@@ -25,14 +25,14 @@
<html:hidden property="mode"/>
<div class="form-table" style="margin-top:3px;">
<table style="width: 400px;">
- <caption>Confirmation Of Facility</caption>
+ <caption><bean:message key="labels.confirmation_of_facility"/></caption>
<tbody>
<tr>
- <th style="width: 120px;">Facility Name</th>
+ <th style="width: 120px;"><bean:message key="labels.facility_name"/></th>
<td>${f:h(name)}<html:hidden property="name"/></td>
</tr>
<tr>
- <th>Facility Group</th>
+ <th><bean:message key="labels.facility_group"/></th>
<td>
<c:forEach var="fg" varStatus="s" items="${facilityGroupItems}">
<c:if test="${fg.id==groupId}">${f:h(fg.name)}</c:if>
@@ -48,21 +48,21 @@
<tr>
<td colspan="2">
<c:if test="${mode == 1}">
- <input type="submit" name="create" value="Create"/>
- <input type="submit" name="editagain" value="Back"/>
+ <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="Update"/>
- <input type="submit" name="editagain" value="Back"/>
+ <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="Delete"/>
- <input type="submit" name="back" value="Back"/>
+ <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="Back"/>
- <input type="submit" name="editpagefromconfirm" value="Edit"/>
- <input type="submit" name="deletepagefromconfirm" value="Delete"/>
+ <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: scheduler/trunk/src/main/webapp/WEB-INF/view/admin/facility/facility/edit.jsp
===================================================================
--- scheduler/trunk/src/main/webapp/WEB-INF/view/admin/facility/facility/edit.jsp 2008-11-25 13:45:04 UTC (rev 1446)
+++ scheduler/trunk/src/main/webapp/WEB-INF/view/admin/facility/facility/edit.jsp 2008-11-26 08:53:03 UTC (rev 1447)
@@ -10,9 +10,9 @@
<div class="tab-nav">
<ul>
<li class="first"></li>
- <li class="selected"><span>Facilities</span></li>
+ <li class="selected"><span><bean:message key="labels.facilities"/></span></li>
<li class="spacer"></li>
- <li class="selectable"><s:link href="/admin/facility/facilityGroup/" style="text-decoration: none;">Facility Groups</s:link></li>
+ <li class="selectable"><s:link href="/admin/facility/facilityGroup/" style="text-decoration: none;"><bean:message key="labels.facility_groups"/></s:link></li>
<li class="last"></li>
</ul>
</div>
@@ -25,14 +25,14 @@
<html:hidden property="mode"/>
<div class="form-table" style="margin-top:3px;">
<table style="width: 400px;">
- <caption>Edit Facility</caption>
+ <caption><bean:message key="labels.edit_facility"/></caption>
<tbody>
<tr>
- <th style="width: 120px;">Facility Name</th>
+ <th style="width: 120px;"><bean:message key="labels.facility_name"/></th>
<td><html:text property="name" size="20"/></td>
</tr>
<tr>
- <th>Facility Group</th>
+ <th><bean:message key="labels.facility_group"/></th>
<td>
<html:select property="groupId">
<c:forEach var="fg" varStatus="s" items="${facilityGroupItems}">
@@ -42,15 +42,15 @@
</td>
</tr>
<tr>
- <th>Comment</th>
+ <th><bean:message key="labels.comment"/></th>
<td><html:textarea property="content" cols="20" rows="5"/></td>
</tr>
</tbody>
<tfoot>
<tr>
<td colspan="2">
- <input type="submit" name="confirm" value="Confirm"/>
- <input type="submit" name="back" value="Back"/>
+ <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: scheduler/trunk/src/main/webapp/WEB-INF/view/admin/facility/facility/error.jsp
===================================================================
--- scheduler/trunk/src/main/webapp/WEB-INF/view/admin/facility/facility/error.jsp 2008-11-25 13:45:04 UTC (rev 1446)
+++ scheduler/trunk/src/main/webapp/WEB-INF/view/admin/facility/facility/error.jsp 2008-11-26 08:53:03 UTC (rev 1447)
@@ -9,9 +9,9 @@
<div class="tab-nav">
<ul>
<li class="first"></li>
- <li class="selected"><span>Facilities</span></li>
+ <li class="selected"><span><bean:message key="labels.facilities"/></span></li>
<li class="spacer"></li>
- <li class="selectable"><s:link href="/admin/facility/facilityGroup/" style="text-decoration: none;">Facility Groups</s:link></li>
+ <li class="selectable"><s:link href="/admin/facility/facilityGroup/" style="text-decoration: none;"><bean:message key="labels.facility_groups"/></s:link></li>
<li class="last"></li>
</ul>
</div>
@@ -19,7 +19,7 @@
<html:errors/>
<br>
-<s:link href="index">Back</s:link>
+<s:link href="index"><bean:message key="labels.back"/></s:link>
</div>
</body>
</html>
Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/admin/facility/facility/index.jsp
===================================================================
--- scheduler/trunk/src/main/webapp/WEB-INF/view/admin/facility/facility/index.jsp 2008-11-25 13:45:04 UTC (rev 1446)
+++ scheduler/trunk/src/main/webapp/WEB-INF/view/admin/facility/facility/index.jsp 2008-11-26 08:53:03 UTC (rev 1447)
@@ -10,9 +10,9 @@
<div class="tab-nav">
<ul>
<li class="first"></li>
- <li class="selected"><span>Facilities</span></li>
+ <li class="selected"><span><bean:message key="labels.facilities"/></span></li>
<li class="spacer"></li>
- <li class="selectable"><s:link href="/admin/facility/facilityGroup/" style="text-decoration: none;">Facility Groups</s:link></li>
+ <li class="selectable"><s:link href="/admin/facility/facilityGroup/" style="text-decoration: none;"><bean:message key="labels.facility_groups"/></s:link></li>
<li class="last"></li>
</ul>
</div>
@@ -25,7 +25,7 @@
<table>
<tbody>
<tr>
- <th>Group</th>
+ <th><bean:message key="labels.group"/></th>
<td>
<html:select property="groupId">
<option value="">----</option>
@@ -35,8 +35,8 @@
</html:select>
</td>
<td>
-<input type="submit" name="search" value="Search"/>
-<input type="submit" name="reset" value="Reset"/>
+<input type="submit" name="search" value="<bean:message key="labels.search"/>"/>
+<input type="submit" name="reset" value="<bean:message key="labels.reset"/>"/>
</td>
</tr>
</tbody>
@@ -45,13 +45,13 @@
</div>
<div class="list-table" style="margin-top:3px;">
<div>
-<s:link href="createpage">Create New</s:link>
+<s:link href="createpage"><bean:message key="labels.create_new"/></s:link>
</div>
<table border="1">
<thead>
<tr>
- <th style="width:200px;text-align: center;">Facility Name</th>
- <th style="width:100px;text-align: center;">Sort</th>
+ <th style="width:200px;text-align: center;"><bean:message key="labels.facility_name"/></th>
+ <th style="width:100px;text-align: center;"><bean:message key="labels.sort"/></th>
<th style="width:100px;text-align: center;"> </th>
</tr>
</thead>
@@ -61,15 +61,15 @@
<td><s:link href="confirmpage/4/${f:u(g.id)}">${f:h(g.name)}</s:link></td>
<td align="center">
<c:if test="${!s.first || facilityPager.currentPageNumber!=1}">
- <s:link href="moveup/${f:u(g.id)}">Up</s:link>
+ <s:link href="moveup/${f:u(g.id)}"><bean:message key="labels.up"/></s:link>
</c:if>
<c:if test="${!s.last || facilityPager.currentPageNumber!=facilityPager.allPageCount}">
- <s:link href="movedown/${f:u(g.id)}">Down</s:link>
+ <s:link href="movedown/${f:u(g.id)}"><bean:message key="labels.down"/></s:link>
</c:if>
</td>
<td align="center">
- <s:link href="editpage/2/${f:u(g.id)}">Edit</s:link>
- <s:link href="deletepage/3/${f:u(g.id)}">Delete</s:link>
+ <s:link href="editpage/2/${f:u(g.id)}"><bean:message key="labels.edit"/></s:link>
+ <s:link href="deletepage/3/${f:u(g.id)}"><bean:message key="labels.delete"/></s:link>
</td>
</tr>
</c:forEach>
@@ -79,7 +79,7 @@
<div style="width: 450px;text-align: center;">
<span>
<c:if test="${facilityPager.existPrePage}">
- <s:link href="list/${facilityPager.currentPageNumber - 1}">Previous</s:link>
+ <s:link href="list/${facilityPager.currentPageNumber - 1}"><bean:message key="labels.previous"/></s:link>
</c:if>
</span>
<span>
@@ -96,7 +96,7 @@
</span>
<span>
<c:if test="${facilityPager.existNextPage}">
- <s:link href="list/${facilityPager.currentPageNumber + 1}">Next</s:link>
+ <s:link href="list/${facilityPager.currentPageNumber + 1}"><bean:message key="labels.next"/></s:link>
</c:if>
</span>
</div>
Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/admin/facility/facilityGroup/confirm.jsp
===================================================================
--- scheduler/trunk/src/main/webapp/WEB-INF/view/admin/facility/facilityGroup/confirm.jsp 2008-11-25 13:45:04 UTC (rev 1446)
+++ scheduler/trunk/src/main/webapp/WEB-INF/view/admin/facility/facilityGroup/confirm.jsp 2008-11-26 08:53:03 UTC (rev 1447)
@@ -10,9 +10,9 @@
<div class="tab-nav">
<ul>
<li class="first"></li>
- <li class="selectable"><s:link href="/admin/facility/facility/" style="text-decoration: none;">Facilities</s:link></li>
+ <li class="selectable"><s:link href="/admin/facility/facility/" style="text-decoration: none;"><bean:message key="labels.facilities"/></s:link></li>
<li class="spacer"></li>
- <li class="selected"><span>Facility Groups</span></li>
+ <li class="selected"><span><bean:message key="labels.facility_groups"/></span></li>
<li class="last"></li>
</ul>
</div>
@@ -25,10 +25,10 @@
<html:hidden property="mode"/>
<div class="form-table" style="margin-top:3px;">
<table style="width: 400px;">
- <caption>Confirmation Of Facility Group</caption>
+ <caption><bean:message key="labels.confirmation_of_facility"/></caption>
<tbody>
<tr>
- <th style="width: 120px;">Facility Group Name</th>
+ <th style="width: 120px;"><bean:message key="labels.facility_group_name"/></th>
<td>${f:h(name)}<html:hidden property="name"/></td>
</tr>
</tbody>
@@ -36,21 +36,21 @@
<tr>
<td colspan="2">
<c:if test="${mode == 1}">
- <input type="submit" name="create" value="Create"/>
- <input type="submit" name="editagain" value="Back"/>
+ <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="Update"/>
- <input type="submit" name="editagain" value="Back"/>
+ <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="Delete"/>
- <input type="submit" name="back" value="Back"/>
+ <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="Back"/>
- <input type="submit" name="editpagefromconfirm" value="Edit"/>
- <input type="submit" name="deletepagefromconfirm" value="Delete"/>
+ <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: scheduler/trunk/src/main/webapp/WEB-INF/view/admin/facility/facilityGroup/edit.jsp
===================================================================
--- scheduler/trunk/src/main/webapp/WEB-INF/view/admin/facility/facilityGroup/edit.jsp 2008-11-25 13:45:04 UTC (rev 1446)
+++ scheduler/trunk/src/main/webapp/WEB-INF/view/admin/facility/facilityGroup/edit.jsp 2008-11-26 08:53:03 UTC (rev 1447)
@@ -10,9 +10,9 @@
<div class="tab-nav">
<ul>
<li class="first"></li>
- <li class="selectable"><s:link href="/admin/facility/facility/" style="text-decoration: none;">Facilities</s:link></li>
+ <li class="selectable"><s:link href="/admin/facility/facility/" style="text-decoration: none;"><bean:message key="labels.facilities"/></s:link></li>
<li class="spacer"></li>
- <li class="selected"><span>Facility Groups</span></li>
+ <li class="selected"><span><bean:message key="labels.facility_groups"/></span></li>
<li class="last"></li>
</ul>
</div>
@@ -25,18 +25,18 @@
<html:hidden property="mode"/>
<div class="form-table" style="margin-top:3px;">
<table style="width: 400px;">
- <caption>Edit Facility Group</caption>
+ <caption><bean:message key="labels.edit_facility_group"/></caption>
<tbody>
<tr>
- <th style="width: 120px;">Facility Group Name</th>
+ <th style="width: 120px;"><bean:message key="labels.facility_group_name"/></th>
<td><html:text property="name" size="20"/></td>
</tr>
</tbody>
<tfoot>
<tr>
<td colspan="2">
- <input type="submit" name="confirm" value="Confirm"/>
- <input type="submit" name="back" value="Back"/>
+ <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: scheduler/trunk/src/main/webapp/WEB-INF/view/admin/facility/facilityGroup/error.jsp
===================================================================
--- scheduler/trunk/src/main/webapp/WEB-INF/view/admin/facility/facilityGroup/error.jsp 2008-11-25 13:45:04 UTC (rev 1446)
+++ scheduler/trunk/src/main/webapp/WEB-INF/view/admin/facility/facilityGroup/error.jsp 2008-11-26 08:53:03 UTC (rev 1447)
@@ -9,9 +9,9 @@
<div class="tab-nav">
<ul>
<li class="first"></li>
- <li class="selectable"><s:link href="/admin/facility/facility/" style="text-decoration: none;">Facilities</s:link></li>
+ <li class="selectable"><s:link href="/admin/facility/facility/" style="text-decoration: none;"><bean:message key="labels.facilities"/></s:link></li>
<li class="spacer"></li>
- <li class="selected"><span>Facility Groups</span></li>
+ <li class="selected"><span><bean:message key="labels.facility_groups"/></span></li>
<li class="last"></li>
</ul>
</div>
@@ -19,7 +19,7 @@
<html:errors/>
<br>
-<s:link href="index">Back</s:link>
+<s:link href="index"><bean:message key="labels.back"/></s:link>
</div>
</body>
</html>
Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/admin/facility/facilityGroup/index.jsp
===================================================================
--- scheduler/trunk/src/main/webapp/WEB-INF/view/admin/facility/facilityGroup/index.jsp 2008-11-25 13:45:04 UTC (rev 1446)
+++ scheduler/trunk/src/main/webapp/WEB-INF/view/admin/facility/facilityGroup/index.jsp 2008-11-26 08:53:03 UTC (rev 1447)
@@ -10,9 +10,9 @@
<div class="tab-nav">
<ul>
<li class="first"></li>
- <li class="selectable"><s:link href="/admin/facility/facility/" style="text-decoration: none;">Facilities</s:link></li>
+ <li class="selectable"><s:link href="/admin/facility/facility/" style="text-decoration: none;"><bean:message key="labels.facilities"/></s:link></li>
<li class="spacer"></li>
- <li class="selected"><span>Facility Groups</span></li>
+ <li class="selected"><span><bean:message key="labels.facility_groups"/></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</s:link>
+<s:link href="createpage"><bean:message key="labels.create_new"/></s:link>
</div>
<table border="1">
<thead>
<tr>
- <th style="width:200px;text-align: center;">Facility Group Name</th>
- <th style="width:100px;text-align: center;">Sort</th>
+ <th style="width:200px;text-align: center;"><bean:message key="labels.facility_group_name"/></th>
+ <th style="width:100px;text-align: center;"><bean:message key="labels.sort"/></th>
<th style="width:100px;text-align: center;"> </th>
</tr>
</thead>
@@ -38,15 +38,15 @@
<td><s:link href="confirmpage/4/${f:u(g.id)}">${f:h(g.name)}</s:link></td>
<td align="center">
<c:if test="${!s.first || facilityGroupPager.currentPageNumber!=1}">
- <s:link href="moveup/${f:u(g.id)}">Up</s:link>
+ <s:link href="moveup/${f:u(g.id)}"><bean:message key="labels.up"/></s:link>
</c:if>
<c:if test="${!s.last || facilityGroupPager.currentPageNumber!=facilityGroupPager.allPageCount}">
- <s:link href="movedown/${f:u(g.id)}">Down</s:link>
+ <s:link href="movedown/${f:u(g.id)}"><bean:message key="labels.down"/></s:link>
</c:if>
</td>
<td align="center">
- <s:link href="editpage/2/${f:u(g.id)}">Edit</s:link>
- <s:link href="deletepage/3/${f:u(g.id)}">Delete</s:link>
+ <s:link href="editpage/2/${f:u(g.id)}"><bean:message key="labels.edit"/></s:link>
+ <s:link href="deletepage/3/${f:u(g.id)}"><bean:message key="labels.delete"/></s:link>
</td>
</tr>
</c:forEach>
@@ -56,7 +56,7 @@
<div style="width: 450px;text-align: center;">
<span>
<c:if test="${facilityGroupPager.existPrePage}">
- <s:link href="list/${facilityGroupPager.currentPageNumber - 1}">Previous</s:link>
+ <s:link href="list/${facilityGroupPager.currentPageNumber - 1}"><bean:message key="labels.previous"/></s:link>
</c:if>
</span>
<span>
@@ -73,7 +73,7 @@
</span>
<span>
<c:if test="${facilityGroupPager.existNextPage}">
- <s:link href="list/${facilityGroupPager.currentPageNumber + 1}">Next</s:link>
+ <s:link href="list/${facilityGroupPager.currentPageNumber + 1}"><bean:message key="labels.next"/></s:link>
</c:if>
</span>
</div>
Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/onetimeSchedule/confirm.jsp
===================================================================
--- scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/onetimeSchedule/confirm.jsp 2008-11-25 13:45:04 UTC (rev 1446)
+++ scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/onetimeSchedule/confirm.jsp 2008-11-26 08:53:03 UTC (rev 1447)
@@ -10,9 +10,9 @@
<div class="tab-nav">
<ul>
<li class="first"></li>
- <li class="selected"><span>One time</span></li>
+ <li class="selected"><span><bean:message key="labels.one_time"/></span></li>
<li class="spacer"></li>
- <li class="selectable"><s:link href="/admin/schedule/repeatSchedule/" style="text-decoration: none;">Repeats</s:link></li>
+ <li class="selectable"><s:link href="/admin/schedule/repeatSchedule/" style="text-decoration: none;"><bean:message key="labels.repeats"/></s:link></li>
<li class="last"></li>
</ul>
</div>
@@ -28,47 +28,47 @@
<caption><bean:message key="labels.confirmation_of_event"/></caption>
<tbody>
<tr>
- <th style="width: 120px;">What</th>
+ <th style="width: 120px;"><bean:message key="labels.what"/></th>
<td>${f:h(title)}<html:hidden property="title"/></td>
</tr>
<tr>
- <th>Where</th>
+ <th><bean:message key="labels.where"/></th>
<td>${f:h(location)}<html:hidden property="location"/></td>
</tr>
<tr>
- <th rowspan="2">When</th>
+ <th rowspan="2"><bean:message key="labels.when"/></th>
<td>
-From:
+<bean:message key="labels.from"/>
${f:h(startDate)}<html:hidden property="startDate"/>
${f:h(startTime)}<html:hidden property="startTime"/>
</td>
</tr>
<tr>
<td>
-To:
+<bean:message key="labels.to"/>
${f:h(endDate)}<html:hidden property="endDate"/>
${f:h(endTime)}<html:hidden property="endTime"/>
</td>
</tr>
<tr>
- <th>Description</th>
+ <th><bean:message key="labels.description"/></th>
<td>${f:br(f:h(content))}<html:hidden property="content"/></td>
</tr>
<tr>
- <th>Privacy</th>
+ <th><bean:message key="labels.privacy"/></th>
<td>
-<c:if test="${secret=='F'}">Public</c:if>
-<c:if test="${secret=='T'}">Private</c:if>
+<c:if test="${secret=='F'}"><bean:message key="labels.public"/></c:if>
+<c:if test="${secret=='T'}"><bean:message key="labels.private"/></c:if>
<html:hidden property="secret"/>
</td>
</tr>
<tr>
- <th>Assigned</th>
+ <th><bean:message key="labels.assigned"/></th>
<td>
<table>
<tbody>
<tr>
- <th style="width:200px;">Name</th>
+ <th style="width:200px;"><bean:message key="labels.name"/></th>
</tr>
<c:forEach var="u" varStatus="s" items="${selectedUserItems}">
<tr>
@@ -85,12 +85,12 @@
</td>
</tr>
<tr>
- <th>Facilities</th>
+ <th><bean:message key="labels.facilities"/></th>
<td>
<table>
<tbody>
<tr>
- <th style="width:200px;">Name</th>
+ <th style="width:200px;"><bean:message key="labels.name"/></th>
</tr>
<c:forEach var="f" varStatus="s" items="${selectedFacilityItems}">
<tr>
Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/onetimeSchedule/edit.jsp
===================================================================
--- scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/onetimeSchedule/edit.jsp 2008-11-25 13:45:04 UTC (rev 1446)
+++ scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/onetimeSchedule/edit.jsp 2008-11-26 08:53:03 UTC (rev 1447)
@@ -10,9 +10,9 @@
<div class="tab-nav">
<ul>
<li class="first"></li>
- <li class="selected"><span>One time</span></li>
+ <li class="selected"><span><bean:message key="labels.one_time"/></span></li>
<li class="spacer"></li>
- <li class="selectable"><s:link href="/admin/schedule/repeatSchedule/" style="text-decoration: none;">Repeats</s:link></li>
+ <li class="selectable"><s:link href="/admin/schedule/repeatSchedule/" style="text-decoration: none;"><bean:message key="labels.repeats"/></s:link></li>
<li class="last"></li>
</ul>
</div>
@@ -28,48 +28,48 @@
<caption><bean:message key="labels.event_detail"/></caption>
<tbody>
<tr>
- <th style="width: 120px;">What</th>
+ <th style="width: 120px;"><bean:message key="labels.what"/></th>
<td><html:text property="title" size="20"/></td>
</tr>
<tr>
- <th>Where</th>
+ <th><bean:message key="labels.where"/></th>
<td><html:text property="location" size="20"/></td>
</tr>
<tr>
- <th rowspan="2">When</th>
+ <th rowspan="2"><bean:message key="labels.when"/></th>
<td>
-From:
+<bean:message key="labels.from"/>
<html:text property="startDate" size="10"/>
<html:text property="startTime" size="5"/>
</td>
</tr>
<tr>
<td>
-To:
+<bean:message key="labels.to"/>
<html:text property="endDate" size="10"/>
<html:text property="endTime" size="5"/>
</td>
</tr>
<tr>
- <th>Description</th>
+ <th><bean:message key="labels.description"/></th>
<td><html:textarea property="content" cols="20" rows="5"/></td>
</tr>
<tr>
- <th>Privacy</th>
+ <th><bean:message key="labels.privacy"/></th>
<td>
<html:select property="secret">
- <html:option value="F">Public</html:option>
- <html:option value="T">Private</html:option>
+ <html:option value="F"><bean:message key="labels.public"/></html:option>
+ <html:option value="T"><bean:message key="labels.private"/></html:option>
</html:select>
</td>
</tr>
<tr>
- <th>Assigned</th>
+ <th><bean:message key="labels.assigned"/></th>
<td>
<table>
<tbody>
<tr>
- <th style="width:200px;">Name</th>
+ <th style="width:200px;"><bean:message key="labels.name"/></th>
</tr>
<c:forEach var="u" varStatus="s" items="${selectedUserItems}">
<tr>
@@ -80,7 +80,7 @@
<tfoot>
<tr>
<td>
-<input type="submit" name="selectusers" value="Select Users"/>
+<input type="submit" name="selectusers" value="<bean:message key="labels.select_users"/>"/>
</td>
</tr>
</tfoot>
@@ -93,12 +93,12 @@
</td>
</tr>
<tr>
- <th>Facilities</th>
+ <th><bean:message key="labels.facilities"/></th>
<td>
<table>
<tbody>
<tr>
- <th style="width:200px;">Name</th>
+ <th style="width:200px;"><bean:message key="labels.name"/></th>
</tr>
<c:forEach var="f" varStatus="s" items="${selectedFacilityItems}">
<tr>
@@ -109,7 +109,7 @@
<tfoot>
<tr>
<td>
-<input type="submit" name="selectfacilities" value="Select Facilities"/>
+<input type="submit" name="selectfacilities" value="<bean:message key="labels.select_facilities"/>"/>
</td>
</tr>
</tfoot>
Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/onetimeSchedule/error.jsp
===================================================================
--- scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/onetimeSchedule/error.jsp 2008-11-25 13:45:04 UTC (rev 1446)
+++ scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/onetimeSchedule/error.jsp 2008-11-26 08:53:03 UTC (rev 1447)
@@ -9,9 +9,9 @@
<div class="tab-nav">
<ul>
<li class="first"></li>
- <li class="selected"><span>One time</span></li>
+ <li class="selected"><span><bean:message key="labels.one_time"/></span></li>
<li class="spacer"></li>
- <li class="selectable"><s:link href="/admin/schedule/repeatSchedule/" style="text-decoration: none;">Repeats</s:link></li>
+ <li class="selectable"><s:link href="/admin/schedule/repeatSchedule/" style="text-decoration: none;"><bean:message key="labels.repeats"/></s:link></li>
<li class="last"></li>
</ul>
</div>
Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/onetimeSchedule/facilitylist.jsp
===================================================================
--- scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/onetimeSchedule/facilitylist.jsp 2008-11-25 13:45:04 UTC (rev 1446)
+++ scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/onetimeSchedule/facilitylist.jsp 2008-11-26 08:53:03 UTC (rev 1447)
@@ -10,9 +10,9 @@
<div class="tab-nav">
<ul>
<li class="first"></li>
- <li class="selected"><span>One time</span></li>
+ <li class="selected"><span><bean:message key="labels.one_time"/></span></li>
<li class="spacer"></li>
- <li class="selectable"><s:link href="/admin/schedule/repeatSchedule/" style="text-decoration: none;">Repeats</s:link></li>
+ <li class="selectable"><s:link href="/admin/schedule/repeatSchedule/" style="text-decoration: none;"><bean:message key="labels.repeats"/></s:link></li>
<li class="last"></li>
</ul>
</div>
@@ -41,7 +41,7 @@
<table>
<thead>
<tr>
- <th>Facility List</th>
+ <th><bean:message key="labels.facility_list"/></th>
</tr>
</thead>
<tbody>
@@ -59,14 +59,14 @@
</table>
</div>
<div style="float:left;width: 100px;height: 200px;text-align: center;padding-top:60px;">
-<input type="submit" name="addfacilities" value="Add >>"/>
-<input type="submit" name="removefacilities" value="<< Remove"/>
+<input type="submit" name="addfacilities" value="<bean:message key="labels.add"/> >>"/>
+<input type="submit" name="removefacilities" value="<< <bean:message key="labels.remove"/>"/>
</div>
<div class="form-table" style="float:left;width: 200px;">
<table>
<thead>
<tr>
- <th>Selected Facility List</th>
+ <th><bean:message key="labels.selected_facility_list"/></th>
</tr>
</thead>
<tbody>
@@ -89,7 +89,7 @@
<tfoot>
<tr>
<td>
-<input type="submit" name="setfacilities" value="OK"/>
+<input type="submit" name="setfacilities" value="<bean:message key="labels.ok"/>"/>
</td>
</tr>
</tfoot>
Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/onetimeSchedule/index.jsp
===================================================================
--- scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/onetimeSchedule/index.jsp 2008-11-25 13:45:04 UTC (rev 1446)
+++ scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/onetimeSchedule/index.jsp 2008-11-26 08:53:03 UTC (rev 1447)
@@ -10,9 +10,9 @@
<div class="tab-nav">
<ul>
<li class="first"></li>
- <li class="selected"><span>One time</span></li>
+ <li class="selected"><span><bean:message key="labels.one_time"/></span></li>
<li class="spacer"></li>
- <li class="selectable"><s:link href="/admin/schedule/repeatSchedule/" style="text-decoration: none;">Repeats</s:link></li>
+ <li class="selectable"><s:link href="/admin/schedule/repeatSchedule/" style="text-decoration: none;"><bean:message key="labels.repeats"/></s:link></li>
<li class="last"></li>
</ul>
</div>
@@ -27,8 +27,8 @@
<table border="1">
<thead>
<tr>
- <th style="width:50px;text-align: center;">ID</th>
- <th style="width:200px;text-align: center;">Title</th>
+ <th style="width:50px;text-align: center;"><bean:message key="labels.id"/></th>
+ <th style="width:200px;text-align: center;"><bean:message key="labels.title"/></th>
<th style="width:100px;text-align: center;"> </th>
</tr>
</thead>
Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/onetimeSchedule/userlist.jsp
===================================================================
--- scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/onetimeSchedule/userlist.jsp 2008-11-25 13:45:04 UTC (rev 1446)
+++ scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/onetimeSchedule/userlist.jsp 2008-11-26 08:53:03 UTC (rev 1447)
@@ -10,9 +10,9 @@
<div class="tab-nav">
<ul>
<li class="first"></li>
- <li class="selected"><span>One time</span></li>
+ <li class="selected"><span><bean:message key="labels.one_time"/></span></li>
<li class="spacer"></li>
- <li class="selectable"><s:link href="/admin/schedule/repeatSchedule/" style="text-decoration: none;">Repeats</s:link></li>
+ <li class="selectable"><s:link href="/admin/schedule/repeatSchedule/" style="text-decoration: none;"><bean:message key="labels.repeats"/></s:link></li>
<li class="last"></li>
</ul>
</div>
@@ -41,7 +41,7 @@
<table>
<thead>
<tr>
- <th>User List</th>
+ <th><bean:message key="labels.user_list"/></th>
</tr>
</thead>
<tbody>
@@ -66,7 +66,7 @@
<table>
<thead>
<tr>
- <th>Selected User List</th>
+ <th><bean:message key="labels.selected_user_list"/></th>
</tr>
</thead>
<tbody>
@@ -89,7 +89,7 @@
<tfoot>
<tr>
<td>
-<input type="submit" name="setusers" value="OK"/>
+<input type="submit" name="setusers" value="<bean:message key="labels.ok"/>"/>
</td>
</tr>
</tfoot>
Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/repeatSchedule/confirm.jsp
===================================================================
--- scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/repeatSchedule/confirm.jsp 2008-11-25 13:45:04 UTC (rev 1446)
+++ scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/repeatSchedule/confirm.jsp 2008-11-26 08:53:03 UTC (rev 1447)
@@ -10,9 +10,9 @@
<div class="tab-nav">
<ul>
<li class="first"></li>
- <li class="selectable"><s:link href="/admin/schedule/onetimeSchedule/" style="text-decoration: none;">One Time</s:link></li>
+ <li class="selectable"><s:link href="/admin/schedule/onetimeSchedule/" style="text-decoration: none;"><bean:message key="labels.one_time"/></s:link></li>
<li class="spacer"></li>
- <li class="selected"><span>Repeats</span></li>
+ <li class="selected"><span><bean:message key="labels.repeats"/></span></li>
<li class="last"></li>
</ul>
</div>
@@ -28,60 +28,60 @@
<caption><bean:message key="labels.confirmation_of_event"/></caption>
<tbody>
<tr>
- <th style="width: 120px;">What</th>
+ <th style="width: 120px;"><bean:message key="labels.what"/></th>
<td>${f:h(title)}<html:hidden property="title"/></td>
</tr>
<tr>
- <th>Where</th>
+ <th><bean:message key="labels.where"/></th>
<td>${f:h(location)}<html:hidden property="location"/></td>
</tr>
<tr>
- <th>Repeats</th>
+ <th><bean:message key="labels.repeats"/></th>
<td>
-<c:if test="${type=='MTWTFSS'}">Daily</c:if>
-<c:if test="${type=='MTWTF'}">Every weekday (Mon-Fri)</c:if>
-<c:if test="${type=='MWF'}">Every Mon., Wed., and Fri.</c:if>
-<c:if test="${type=='TT'}">Every Tues., and Thurs.</c:if>
-<c:if test="${type=='WEEKLY'}">Weekly</c:if>
-<c:if test="${type=='MONTHLY'}">Monthly</c:if>
-<c:if test="${type=='YEARLY'}">Yearly</c:if>
+<c:if test="${type=='MTWTFSS'}"><bean:message key="labels.mtwtfss"/></c:if>
+<c:if test="${type=='MTWTF'}"><bean:message key="labels.mtwtf"/></c:if>
+<c:if test="${type=='MWF'}"><bean:message key="labels.mwf"/></c:if>
+<c:if test="${type=='TT'}"><bean:message key="labels.tt"/></c:if>
+<c:if test="${type=='WEEKLY'}"><bean:message key="labels.weekly"/></c:if>
+<c:if test="${type=='MONTHLY'}"><bean:message key="labels.monthly"/></c:if>
+<c:if test="${type=='YEARLY'}"><bean:message key="labels.yearly"/></c:if>
<html:hidden property="type"/>
</td>
</tr>
<tr>
- <th rowspan="2">When</th>
+ <th rowspan="2"><bean:message key="labels.when"/></th>
<td>
-From:
+<bean:message key="labels.from"/>
${f:h(startDate)}<html:hidden property="startDate"/>
${f:h(startTime)}<html:hidden property="startTime"/>
</td>
</tr>
<tr>
<td>
-To:
+<bean:message key="labels.to"/>
${f:h(endDate)}<html:hidden property="endDate"/>
${f:h(endTime)}<html:hidden property="endTime"/>
</td>
</tr>
<tr>
- <th>Description</th>
+ <th><bean:message key="labels.description"/></th>
<td>${f:br(f:h(content))}<html:hidden property="content"/></td>
</tr>
<tr>
- <th>Privacy</th>
+ <th><bean:message key="labels.privacy"/></th>
<td>
-<c:if test="${secret=='F'}">Public</c:if>
-<c:if test="${secret=='T'}">Private</c:if>
+<c:if test="${secret=='F'}"><bean:message key="labels.public"/></c:if>
+<c:if test="${secret=='T'}"><bean:message key="labels.private"/></c:if>
<html:hidden property="secret"/>
</td>
</tr>
<tr>
- <th>Assigned</th>
+ <th><bean:message key="labels.assigned"/></th>
<td>
<table>
<tbody>
<tr>
- <th style="width:200px;">Name</th>
+ <th style="width:200px;"><bean:message key="labels.name"/></th>
</tr>
<c:forEach var="u" varStatus="s" items="${selectedUserItems}">
<tr>
@@ -98,12 +98,12 @@
</td>
</tr>
<tr>
- <th>Facilities</th>
+ <th><bean:message key="labels.facilities"/></th>
<td>
<table>
<tbody>
<tr>
- <th style="width:200px;">Name</th>
+ <th style="width:200px;"><bean:message key="labels.name"/></th>
</tr>
<c:forEach var="f" varStatus="s" items="${selectedFacilityItems}">
<tr>
Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/repeatSchedule/edit.jsp
===================================================================
--- scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/repeatSchedule/edit.jsp 2008-11-25 13:45:04 UTC (rev 1446)
+++ scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/repeatSchedule/edit.jsp 2008-11-26 08:53:03 UTC (rev 1447)
@@ -10,9 +10,9 @@
<div class="tab-nav">
<ul>
<li class="first"></li>
- <li class="selectable"><s:link href="/admin/schedule/onetimeSchedule/" style="text-decoration: none;">One Time</s:link></li>
+ <li class="selectable"><s:link href="/admin/schedule/onetimeSchedule/" style="text-decoration: none;"><bean:message key="labels.one_time"/></s:link></li>
<li class="spacer"></li>
- <li class="selected"><span>Repeats</span></li>
+ <li class="selected"><span><bean:message key="labels.repeats"/></span></li>
<li class="last"></li>
</ul>
</div>
@@ -28,62 +28,62 @@
<caption><bean:message key="labels.event_detail"/></caption>
<tbody>
<tr>
- <th style="width: 120px;">What</th>
+ <th style="width: 120px;"><bean:message key="labels.what"/></th>
<td><html:text property="title" size="20"/></td>
</tr>
<tr>
- <th>Where</th>
+ <th><bean:message key="labels.where"/></th>
<td><html:text property="location" size="20"/></td>
</tr>
<tr>
- <th>Repeats</th>
+ <th><bean:message key="labels.repeats"/></th>
<td>
<html:select property="type">
- <html:option value="MTWTFSS">Daily</html:option>
- <html:option value="MTWTF">Every weekday (Mon-Fri)</html:option>
- <html:option value="MWF">Every Mon., Wed., and Fri.</html:option>
- <html:option value="TT">Every Tues., and Thurs.</html:option>
- <html:option value="WEEKLY">Weekly</html:option>
- <html:option value="MONTHLY">Monthly</html:option>
- <html:option value="YEARLY">Yearly</html:option>
+ <html:option value="MTWTFSS"><bean:message key="labels.mtwtfss"/></html:option>
+ <html:option value="MTWTF"><bean:message key="labels.mtwtf"/></html:option>
+ <html:option value="MWF"><bean:message key="labels.mwf"/></html:option>
+ <html:option value="TT"><bean:message key="labels.tt"/></html:option>
+ <html:option value="WEEKLY"><bean:message key="labels.weekly"/></html:option>
+ <html:option value="MONTHLY"><bean:message key="labels.monthly"/></html:option>
+ <html:option value="YEARLY"><bean:message key="labels.yearly"/></html:option>
</html:select>
</td>
</tr>
<tr>
- <th rowspan="2">When</th>
+ <th rowspan="2"><bean:message key="labels.when"/></th>
<td>
-From:
+<bean:message key="labels.from"/>
<html:text property="startDate" size="10"/>
<html:text property="startTime" size="5"/>
</td>
</tr>
<tr>
<td>
-To:
+<bean:message key="labels.to"/>
<html:text property="endDate" size="10"/>
<html:text property="endTime" size="5"/>
</td>
</tr>
<tr>
- <th>Description</th>
+ <th><bean:message key="labels.description"/></th>
<td><html:textarea property="content" cols="20" rows="5"/></td>
</tr>
<tr>
- <th>Privacy</th>
+ <th><bean:message key="labels.privacy"/></th>
<td>
<html:select property="secret">
- <html:option value="F">Public</html:option>
- <html:option value="T">Private</html:option>
+ <html:option value="F"><bean:message key="labels.public"/></html:option>
+ <html:option value="T"><bean:message key="labels.private"/></html:option>
</html:select>
</td>
</tr>
<tr>
- <th>Assigned</th>
+ <th><bean:message key="labels.assigned"/></th>
<td>
<table>
<tbody>
<tr>
- <th style="width:200px;">Name</th>
+ <th style="width:200px;"><bean:message key="labels.name"/></th>
</tr>
<c:forEach var="u" varStatus="s" items="${selectedUserItems}">
<tr>
@@ -94,7 +94,7 @@
<tfoot>
<tr>
<td>
-<input type="submit" name="selectusers" value="Select Users"/>
+<input type="submit" name="selectusers" value="<bean:message key="labels.select_users"/>"/>
</td>
</tr>
</tfoot>
@@ -107,12 +107,12 @@
</td>
</tr>
<tr>
- <th>Facilities</th>
+ <th><bean:message key="labels.facilities"/></th>
<td>
<table>
<tbody>
<tr>
- <th style="width:200px;">Name</th>
+ <th style="width:200px;"><bean:message key="labels.name"/></th>
</tr>
<c:forEach var="f" varStatus="s" items="${selectedFacilityItems}">
<tr>
@@ -123,7 +123,7 @@
<tfoot>
<tr>
<td>
-<input type="submit" name="selectfacilities" value="Select Facilities"/>
+<input type="submit" name="selectfacilities" value="<bean:message key="labels.select_facilities"/>"/>
</td>
</tr>
</tfoot>
Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/repeatSchedule/error.jsp
===================================================================
--- scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/repeatSchedule/error.jsp 2008-11-25 13:45:04 UTC (rev 1446)
+++ scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/repeatSchedule/error.jsp 2008-11-26 08:53:03 UTC (rev 1447)
@@ -9,9 +9,9 @@
<div class="tab-nav">
<ul>
<li class="first"></li>
- <li class="selectable"><s:link href="/admin/schedule/onetimeSchedule/" style="text-decoration: none;">One Time</s:link></li>
+ <li class="selectable"><s:link href="/admin/schedule/onetimeSchedule/" style="text-decoration: none;"><bean:message key="labels.one_time"/></s:link></li>
<li class="spacer"></li>
- <li class="selected"><span>Repeats</span></li>
+ <li class="selected"><span><bean:message key="labels.repeats"/></span></li>
<li class="last"></li>
</ul>
</div>
Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/repeatSchedule/facilitylist.jsp
===================================================================
--- scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/repeatSchedule/facilitylist.jsp 2008-11-25 13:45:04 UTC (rev 1446)
+++ scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/repeatSchedule/facilitylist.jsp 2008-11-26 08:53:03 UTC (rev 1447)
@@ -10,9 +10,9 @@
<div class="tab-nav">
<ul>
<li class="first"></li>
- <li class="selectable"><s:link href="/admin/schedule/onetimeSchedule/" style="text-decoration: none;">One Time</s:link></li>
+ <li class="selectable"><s:link href="/admin/schedule/onetimeSchedule/" style="text-decoration: none;"><bean:message key="labels.one_time"/></s:link></li>
<li class="spacer"></li>
- <li class="selected"><span>Repeats</span></li>
+ <li class="selected"><span><bean:message key="labels.repeats"/></span></li>
<li class="last"></li>
</ul>
</div>
@@ -41,7 +41,7 @@
<table>
<thead>
<tr>
- <th>Facility List</th>
+ <th><bean:message key="labels.facility_list"/></th>
</tr>
</thead>
<tbody>
@@ -59,14 +59,14 @@
</table>
</div>
<div style="float:left;width: 100px;height: 200px;text-align: center;padding-top:60px;">
-<input type="submit" name="addfacilities" value="Add >>"/>
-<input type="submit" name="removefacilities" value="<< Remove"/>
+<input type="submit" name="addfacilities" value="<bean:message key="labels.add"/> >>"/>
+<input type="submit" name="removefacilities" value="<< <bean:message key="labels.remove"/>"/>
</div>
<div class="form-table" style="float:left;width: 200px;">
<table>
<thead>
<tr>
- <th>Selected Facility List</th>
+ <th><bean:message key="labels.selected_facility_list"/></th>
</tr>
</thead>
<tbody>
Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/repeatSchedule/index.jsp
===================================================================
--- scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/repeatSchedule/index.jsp 2008-11-25 13:45:04 UTC (rev 1446)
+++ scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/repeatSchedule/index.jsp 2008-11-26 08:53:03 UTC (rev 1447)
@@ -10,9 +10,9 @@
<div class="tab-nav">
<ul>
<li class="first"></li>
- <li class="selectable"><s:link href="/admin/schedule/onetimeSchedule/" style="text-decoration: none;">One Time</s:link></li>
+ <li class="selectable"><s:link href="/admin/schedule/onetimeSchedule/" style="text-decoration: none;"><bean:message key="labels.one_time"/></s:link></li>
<li class="spacer"></li>
- <li class="selected"><span>Repeats</span></li>
+ <li class="selected"><span><bean:message key="labels.repeats"/></span></li>
<li class="last"></li>
</ul>
</div>
@@ -27,8 +27,8 @@
<table border="1">
<thead>
<tr>
- <th style="width:50px;text-align: center;">ID</th>
- <th style="width:200px;text-align: center;">Title</th>
+ <th style="width:50px;text-align: center;"><bean:message key="labels.id"/></th>
+ <th style="width:200px;text-align: center;"><bean:message key="labels.title"/></th>
<th style="width:100px;text-align: center;"> </th>
</tr>
</thead>
Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/repeatSchedule/userlist.jsp
===================================================================
--- scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/repeatSchedule/userlist.jsp 2008-11-25 13:45:04 UTC (rev 1446)
+++ scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/repeatSchedule/userlist.jsp 2008-11-26 08:53:03 UTC (rev 1447)
@@ -10,9 +10,9 @@
<div class="tab-nav">
<ul>
<li class="first"></li>
- <li class="selectable"><s:link href="/admin/schedule/onetimeSchedule/" style="text-decoration: none;">One Time</s:link></li>
+ <li class="selectable"><s:link href="/admin/schedule/onetimeSchedule/" style="text-decoration: none;"><bean:message key="labels.one_time"/></s:link></li>
<li class="spacer"></li>
- <li class="selected"><span>Repeats</span></li>
+ <li class="selected"><span><bean:message key="labels.repeats"/></span></li>
<li class="last"></li>
</ul>
</div>
@@ -42,7 +42,7 @@
<table>
<thead>
<tr>
- <th>User List</th>
+ <th><bean:message key="labels.user_list"/></th>
</tr>
</thead>
<tbody>
@@ -60,14 +60,14 @@
</table>
</div>
<div style="float:left;width: 100px;height: 200px;text-align: center;padding-top:60px;">
-<input type="submit" name="addusers" value="Add >>"/>
-<input type="submit" name="removeusers" value="<< Remove"/>
+<input type="submit" name="addusers" value="<bean:message key="labels.add"/> >>"/>
+<input type="submit" name="removeusers" value="<< <bean:message key="labels.remove"/>"/>
</div>
<div class="form-table" style="float:left;width: 200px;">
<table>
<thead>
<tr>
- <th>Selected User List</th>
+ <th><bean:message key="labels.selected_user_list"/></th>
</tr>
</thead>
<tbody>
Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/calendar/facilityday.jsp
===================================================================
--- scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/calendar/facilityday.jsp 2008-11-25 13:45:04 UTC (rev 1446)
+++ scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/calendar/facilityday.jsp 2008-11-26 08:53:03 UTC (rev 1447)
@@ -10,13 +10,13 @@
<div class="tab-nav">
<ul>
<li class="first"></li>
- <li class="selectable"><s:link href="/user/facility/facility/" style="text-decoration: none;">Facilities</s:link></li>
+ <li class="selectable"><s:link href="/user/facility/facility/" style="text-decoration: none;"><bean:message key="labels.facilities"/></s:link></li>
<li class="spacer"></li>
- <li class="selected"><span>Day</span></li>
+ <li class="selected"><span><bean:message key="labels.day"/></span></li>
<li class="spacer"></li>
- <li class="selectable"><s:link href="selectfacilityweek/${facilityId}/${year}/${month}/${date}" style="text-decoration: none;">Week</s:link></li>
+ <li class="selectable"><s:link href="selectfacilityweek/${facilityId}/${year}/${month}/${date}" style="text-decoration: none;"><bean:message key="labels.week"/></s:link></li>
<li class="spacer"></li>
- <li class="selectable"><s:link href="selectfacilitymonth/${facilityId}/${year}/${month}/${date}" style="text-decoration: none;">Month</s:link></li>
+ <li class="selectable"><s:link href="selectfacilitymonth/${facilityId}/${year}/${month}/${date}" style="text-decoration: none;"><bean:message key="labels.month"/></s:link></li>
<li class="last"></li>
</ul>
</div>
@@ -30,20 +30,20 @@
</div>
<div style="margin:5px 0 2px 0;text-align: center;">
<s:link href="movefacilitydayprevmonth/${facilityId}/${year}/${month}/${date}"><</s:link>
-<s:link href="movefacilitydaythismonth/${facilityId}">Today</s:link>
+<s:link href="movefacilitydaythismonth/${facilityId}"><bean:message key="labels.today"/></s:link>
<s:link href="movefacilitydaynextmonth/${facilityId}/${year}/${month}/${date}">></s:link>
</div>
<table>
<caption>${year}/${month}<!-- TODO i18n --></caption>
<thead>
<tr>
- <th style="width:13px;text-align: center;">S</th>
- <th style="width:13px;text-align: center;">M</th>
- <th style="width:13px;text-align: center;">T</th>
- <th style="width:13px;text-align: center;">W</th>
- <th style="width:13px;text-align: center;">T</th>
- <th style="width:13px;text-align: center;">F</th>
- <th style="width:13px;text-align: center;">S</th>
+ <th style="width:13px;text-align: center;"><bean:message key="labels.sun"/></th>
+ <th style="width:13px;text-align: center;"><bean:message key="labels.mon"/></th>
+ <th style="width:13px;text-align: center;"><bean:message key="labels.tue"/></th>
+ <th style="width:13px;text-align: center;"><bean:message key="labels.wed"/></th>
+ <th style="width:13px;text-align: center;"><bean:message key="labels.thu"/></th>
+ <th style="width:13px;text-align: center;"><bean:message key="labels.fri"/></th>
+ <th style="width:13px;text-align: center;"><bean:message key="labels.sat"/></th>
</tr>
</thead>
<tbody>
@@ -64,18 +64,18 @@
<caption>${f:h(facility.name)}</caption>
<thead>
<tr>
- <th style="width:50px;text-align: center;">Time</th>
- <th style="width:550px;text-align: center;" colspan="${maxCols}">Events</th>
+ <th style="width:50px;text-align: center;"><bean:message key="labels.time"/></th>
+ <th style="width:550px;text-align: center;" colspan="${maxCols}"><bean:message key="labels.events"/></th>
</tr>
</thead>
<tbody>
<tr>
- <th>All Day</th>
+ <th><bean:message key="labels.all_day"/></th>
<td colspan="${maxCols}">
<ul style="margin:0;padding:0;">
<c:forEach var="event" varStatus="s" items="${allDayEventInDayItems}">
<li style="list-style-type:none;">
-<c:if test="${event.secret=='T'}">Private</c:if>
+<c:if test="${event.secret=='T'}"><bean:message key="labels.private"/></c:if>
<c:if test="${event.secret=='F'}">
<c:if test="${event.repeat=='true'}"><s:link href="/user/facility/repeatSchedule/confirmpage/4/${event.id}/selectfacilityday/${facilityId}/${year}/${month}/${date}">${event.title}</s:link></c:if>
<c:if test="${event.repeat=='false'}"><s:link href="/user/facility/onetimeSchedule/confirmpage/4/${event.id}/selectfacilityday/${facilityId}/${year}/${month}/${date}">${event.title}</s:link></c:if>
@@ -97,7 +97,7 @@
<c:if test="${event.time!='none'}">
<ul style="margin:0;padding:0;">
<li style="list-style-type:none;">${event.time}<br/>
-<c:if test="${event.secret=='T'}">Private</c:if>
+<c:if test="${event.secret=='T'}"><bean:message key="labels.private"/></c:if>
<c:if test="${event.secret=='F'}">
<c:if test="${event.repeat=='true'}"><s:link href="/user/facility/repeatSchedule/confirmpage/4/${event.id}/selectfacilityday/${facilityId}/${year}/${month}/${date}">${event.title}</s:link></c:if>
<c:if test="${event.repeat=='false'}"><s:link href="/user/facility/onetimeSchedule/confirmpage/4/${event.id}/selectfacilityday/${facilityId}/${year}/${month}/${date}">${event.title}</s:link></c:if>
Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/calendar/facilitymonth.jsp
===================================================================
--- scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/calendar/facilitymonth.jsp 2008-11-25 13:45:04 UTC (rev 1446)
+++ scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/calendar/facilitymonth.jsp 2008-11-26 08:53:03 UTC (rev 1447)
@@ -10,13 +10,13 @@
<div class="tab-nav">
<ul>
<li class="first"></li>
- <li class="selectable"><s:link href="/user/facility/facility/" style="text-decoration: none;">Facilities</s:link></li>
+ <li class="selectable"><s:link href="/user/facility/facility/" style="text-decoration: none;"><bean:message key="labels.facilities"/></s:link></li>
<li class="spacer"></li>
- <li class="selectable"><s:link href="selectfacilityday/${facilityId}/${year}/${month}/${date}" style="text-decoration: none;">Day</s:link></li>
+ <li class="selectable"><s:link href="selectfacilityday/${facilityId}/${year}/${month}/${date}" style="text-decoration: none;"><bean:message key="labels.day"/></s:link></li>
<li class="spacer"></li>
- <li class="selectable"><s:link href="selectfacilityweek/${facilityId}/${year}/${month}/${date}" style="text-decoration: none;">Week</s:link></li>
+ <li class="selectable"><s:link href="selectfacilityweek/${facilityId}/${year}/${month}/${date}" style="text-decoration: none;"><bean:message key="labels.week"/></s:link></li>
<li class="spacer"></li>
- <li class="selected"><span>Month</span></li>
+ <li class="selected"><span><bean:message key="labels.month"/></span></li>
<li class="last"></li>
</ul>
</div>
@@ -30,20 +30,20 @@
</div>
<div style="margin:5px 0 2px 0;text-align: center;">
<s:link href="movefacilitymonthprevmonth/${facilityId}/${year}/${month}/${date}"><</s:link>
-<s:link href="movefacilitymonththismonth/${facilityId}">Today</s:link>
+<s:link href="movefacilitymonththismonth/${facilityId}"><bean:message key="labels.today"/></s:link>
<s:link href="movefacilitymonthnextmonth/${facilityId}/${year}/${month}/${date}">></s:link>
</div>
<table>
<caption>${year}/${month}<!-- TODO i18n --></caption>
<thead>
<tr>
- <th style="width:13px;text-align: center;">S</th>
- <th style="width:13px;text-align: center;">M</th>
- <th style="width:13px;text-align: center;">T</th>
- <th style="width:13px;text-align: center;">W</th>
- <th style="width:13px;text-align: center;">T</th>
- <th style="width:13px;text-align: center;">F</th>
- <th style="width:13px;text-align: center;">S</th>
+ <th style="width:13px;text-align: center;"><bean:message key="labels.sun"/></th>
+ <th style="width:13px;text-align: center;"><bean:message key="labels.mon"/></th>
+ <th style="width:13px;text-align: center;"><bean:message key="labels.tue"/></th>
+ <th style="width:13px;text-align: center;"><bean:message key="labels.wed"/></th>
+ <th style="width:13px;text-align: center;"><bean:message key="labels.tue"/></th>
+ <th style="width:13px;text-align: center;"><bean:message key="labels.fri"/></th>
+ <th style="width:13px;text-align: center;"><bean:message key="labels.sat"/></th>
</tr>
</thead>
<tbody>
@@ -63,13 +63,13 @@
<table>
<caption>${f:h(facility.name)}</caption>
<thead>
- <th style="width:80px;text-align: center;">Sun</th>
- <th style="width:80px;text-align: center;">Mon</th>
- <th style="width:80px;text-align: center;">Tue</th>
- <th style="width:80px;text-align: center;">Wed</th>
- <th style="width:80px;text-align: center;">Thu</th>
- <th style="width:80px;text-align: center;">Fri</th>
- <th style="width:80px;text-align: center;">Sat</th>
+ <th style="width:80px;text-align: center;"><bean:message key="labels.sun2"/></th>
+ <th style="width:80px;text-align: center;"><bean:message key="labels.mon2"/></th>
+ <th style="width:80px;text-align: center;"><bean:message key="labels.tue2"/></th>
+ <th style="width:80px;text-align: center;"><bean:message key="labels.wed2"/></th>
+ <th style="width:80px;text-align: center;"><bean:message key="labels.tue2"/></th>
+ <th style="width:80px;text-align: center;"><bean:message key="labels.fri2"/></th>
+ <th style="width:80px;text-align: center;"><bean:message key="labels.sat2"/></th>
</thead>
<tbody>
<tr>
@@ -79,7 +79,7 @@
<ul style="margin:0;padding:0;">
<c:forEach var="event" varStatus="s" items="${day.allDayEventItems}">
<li style="list-style-type:none;">
-<c:if test="${event.secret=='T'}">Private</c:if>
+<c:if test="${event.secret=='T'}"><bean:message key="labels.private"/></c:if>
<c:if test="${event.secret=='F'}">
<c:if test="${event.repeat=='true'}"><s:link href="/user/facility/repeatSchedule/confirmpage/4/${event.id}/selectfacilitymonth/${facilityId}/${year}/${month}/${date}">${event.title}</s:link></c:if>
<c:if test="${event.repeat=='false'}"><s:link href="/user/facility/onetimeSchedule/confirmpage/4/${event.id}/selectfacilitymonth/${facilityId}/${year}/${month}/${date}">${event.title}</s:link></c:if>
@@ -89,7 +89,7 @@
<c:forEach var="eventInTimeItems" varStatus="s" items="${day.eventItems}">
<c:forEach var="event" varStatus="s" items="${eventInTimeItems}">
<li style="list-style-type:none;">${event.time}<br/>
-<c:if test="${event.secret=='T'}">Private</c:if>
+<c:if test="${event.secret=='T'}"><bean:message key="labels.private"/></c:if>
<c:if test="${event.secret=='F'}">
<c:if test="${event.repeat=='true'}"><s:link href="/user/facility/repeatSchedule/confirmpage/4/${event.id}/selectfacilitymonth/${facilityId}/${year}/${month}/${date}">${event.title}</s:link></c:if>
<c:if test="${event.repeat=='false'}"><s:link href="/user/facility/onetimeSchedule/confirmpage/4/${event.id}/selectfacilitymonth/${facilityId}/${year}/${month}/${date}">${event.title}</s:link></c:if>
Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/calendar/facilityweek.jsp
===================================================================
--- scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/calendar/facilityweek.jsp 2008-11-25 13:45:04 UTC (rev 1446)
+++ scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/calendar/facilityweek.jsp 2008-11-26 08:53:03 UTC (rev 1447)
@@ -10,13 +10,13 @@
<div class="tab-nav">
<ul>
<li class="first"></li>
- <li class="selectable"><s:link href="/user/facility/facility/" style="text-decoration: none;">Facilities</s:link></li>
+ <li class="selectable"><s:link href="/user/facility/facility/" style="text-decoration: none;"><bean:message key="labels.facilities"/></s:link></li>
<li class="spacer"></li>
- <li class="selectable"><s:link href="selectfacilityday/${facilityId}/${year}/${month}/${date}" style="text-decoration: none;">Day</s:link></li>
+ <li class="selectable"><s:link href="selectfacilityday/${facilityId}/${year}/${month}/${date}" style="text-decoration: none;"><bean:message key="labels.day"/></s:link></li>
<li class="spacer"></li>
- <li class="selected"><span>Week</span></li>
+ <li class="selected"><span><bean:message key="labels.week"/></span></li>
<li class="spacer"></li>
- <li class="selectable"><s:link href="selectfacilitymonth/${facilityId}/${year}/${month}/${date}" style="text-decoration: none;">Month</s:link></li>
+ <li class="selectable"><s:link href="selectfacilitymonth/${facilityId}/${year}/${month}/${date}" style="text-decoration: none;"><bean:message key="labels.month"/></s:link></li>
<li class="last"></li>
</ul>
</div>
@@ -37,13 +37,13 @@
<caption>${year}/${month}<!-- TODO i18n --></caption>
<thead>
<tr>
- <th style="width:13px;text-align: center;">S</th>
- <th style="width:13px;text-align: center;">M</th>
- <th style="width:13px;text-align: center;">T</th>
- <th style="width:13px;text-align: center;">W</th>
- <th style="width:13px;text-align: center;">T</th>
- <th style="width:13px;text-align: center;">F</th>
- <th style="width:13px;text-align: center;">S</th>
+ <th style="width:13px;text-align: center;"><bean:message key="labels.sun"/></th>
+ <th style="width:13px;text-align: center;"><bean:message key="labels.mon"/></th>
+ <th style="width:13px;text-align: center;"><bean:message key="labels.tue"/></th>
+ <th style="width:13px;text-align: center;"><bean:message key="labels.wed"/></th>
+ <th style="width:13px;text-align: center;"><bean:message key="labels.thu"/></th>
+ <th style="width:13px;text-align: center;"><bean:message key="labels.fri"/></th>
+ <th style="width:13px;text-align: center;"><bean:message key="labels.sat"/></th>
</tr>
</thead>
<tbody>
@@ -64,7 +64,7 @@
<caption>${f:h(facility.name)}</caption>
<thead>
<tr>
- <th style="width:50px;text-align: center;">Time</th>
+ <th style="width:50px;text-align: center;"><bean:message key="labels.time"/></th>
<c:forEach var="day" varStatus="s" items="${weekDayItems}">
<th style="width:70px;text-align: center;font-size:xx-small;">${day.displayedDate}</th>
</c:forEach>
@@ -72,13 +72,13 @@
</thead>
<tbody>
<tr>
- <th>All Day</th>
+ <th><bean:message key="labels.all_day"/></th>
<c:forEach var="allDayEventInDayItems" varStatus="s" items="${allDayEventInWeekItems}">
<td>
<ul style="margin:0;padding:0;">
<c:forEach var="event" varStatus="s" items="${allDayEventInDayItems}">
<li style="list-style-type:none;">
-<c:if test="${event.secret=='T'}">Private</c:if>
+<c:if test="${event.secret=='T'}"><bean:message key="labels.private"/></c:if>
<c:if test="${event.secret=='F'}">
<c:if test="${event.repeat=='true'}"><s:link href="/user/facility/repeatSchedule/confirmpage/4/${event.id}/selectfacilityweek/${facilityId}/${year}/${month}/${date}">${event.title}</s:link></c:if>
<c:if test="${event.repeat=='false'}"><s:link href="/user/facility/onetimeSchedule/confirmpage/4/${event.id}/selectfacilityweek/${facilityId}/${year}/${month}/${date}">${event.title}</s:link></c:if>
@@ -90,14 +90,14 @@
</c:forEach>
</tr>
<tr>
- <th style="height: 300px;">Events</th>
+ <th style="height: 300px;"><bean:message key="labels.events"/></th>
<c:forEach var="eventInDayItems" varStatus="s" items="${eventInWeekItems}">
<td style="vertical-align: top;">
<ul style="margin:0;padding:0;">
<c:forEach var="eventInTimeItems" varStatus="s" items="${eventInDayItems}">
<c:forEach var="event" varStatus="s" items="${eventInTimeItems}">
<li style="list-style-type:none;"><span style="font-size:xx-small;">${event.time}</span><br/>
-<c:if test="${event.secret=='T'}">Private</c:if>
+<c:if test="${event.secret=='T'}"><bean:message key="labels.private"/></c:if>
<c:if test="${event.secret=='F'}">
<c:if test="${event.repeat=='true'}"><s:link href="/user/facility/repeatSchedule/confirmpage/4/${event.id}/selectfacilityweek/${facilityId}/${year}/${month}/${date}">${event.title}</s:link></c:if>
<c:if test="${event.repeat=='false'}"><s:link href="/user/facility/onetimeSchedule/confirmpage/4/${event.id}/selectfacilityweek/${facilityId}/${year}/${month}/${date}">${event.title}</s:link></c:if>
Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/calendar/groupweek.jsp
===================================================================
--- scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/calendar/groupweek.jsp 2008-11-25 13:45:04 UTC (rev 1446)
+++ scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/calendar/groupweek.jsp 2008-11-26 08:53:03 UTC (rev 1447)
@@ -10,9 +10,9 @@
<div class="tab-nav">
<ul>
<li class="first"></li>
- <li class="selectable"><s:link href="/user/facility/facility/" style="text-decoration: none;">Facility</s:link></li>
+ <li class="selectable"><s:link href="/user/facility/facility/" style="text-decoration: none;"><bean:message key="labels.facility"/></s:link></li>
<li class="spacer"></li>
- <li class="selected"><span>Facility Groups</span></li>
+ <li class="selected"><span><bean:message key="labels.facility_groups"/></span></li>
<li class="last"></li>
</ul>
</div>
@@ -26,20 +26,20 @@
</div>
<div style="margin:5px 0 2px 0;text-align: center;">
<s:link href="movegroupweekprevmonth/${year}/${month}/${date}"><</s:link>
-<s:link href="movegroupweekthismonth">Today</s:link>
+<s:link href="movegroupweekthismonth"><bean:message key="labels.today"/></s:link>
<s:link href="movegroupweeknextmonth/${year}/${month}/${date}">></s:link>
</div>
<table>
<caption>${year}/${month}<!-- TODO i18n --></caption>
<thead>
<tr>
- <th style="width:13px;text-align: center;">S</th>
- <th style="width:13px;text-align: center;">M</th>
- <th style="width:13px;text-align: center;">T</th>
- <th style="width:13px;text-align: center;">W</th>
- <th style="width:13px;text-align: center;">T</th>
- <th style="width:13px;text-align: center;">F</th>
- <th style="width:13px;text-align: center;">S</th>
+ <th style="width:13px;text-align: center;"><bean:message key="labels.sun"/></th>
+ <th style="width:13px;text-align: center;"><bean:message key="labels.mon"/></th>
+ <th style="width:13px;text-align: center;"><bean:message key="labels.tue"/></th>
+ <th style="width:13px;text-align: center;"><bean:message key="labels.wed"/></th>
+ <th style="width:13px;text-align: center;"><bean:message key="labels.thu"/></th>
+ <th style="width:13px;text-align: center;"><bean:message key="labels.fri"/></th>
+ <th style="width:13px;text-align: center;"><bean:message key="labels.sat"/></th>
</tr>
</thead>
<tbody>
@@ -61,7 +61,7 @@
<table>
<tbody>
<tr>
- <th>Facility Group</th>
+ <th><bean:message key="labels.facility_group"/></th>
<td>
<html:select property="facilityGroupId">
<c:forEach var="fg" varStatus="s" items="${facilityGroupItems}">
@@ -69,7 +69,7 @@
</c:forEach>
</html:select>
</td>
- <td><input type="submit" name="changefacilitygroup" value="Change"/></td>
+ <td><input type="submit" name="changefacilitygroup" value="<bean:message key="labels.change"/>"/></td>
</tr>
</tbody>
</table>
@@ -95,7 +95,7 @@
<ul style="margin:0;padding:0;">
<c:forEach var="event" varStatus="s3" items="${eventInDayItems}">
<li style="list-style-type:none;margin-top:2px;"><c:if test="${event.time!=''}"><span style="font-size:xx-small;">${event.time}</span><br/></c:if>
-<c:if test="${event.secret=='T'}">Private</c:if>
+<c:if test="${event.secret=='T'}"><bean:message key="labels.private"/></c:if>
<c:if test="${event.secret=='F'}">
<c:if test="${event.repeat=='true'}"><s:link href="/user/facility/repeatSchedule/confirmpage/4/${event.id}/selectgroupweek/0/${year}/${month}/${date}">${event.title}</s:link></c:if>
<c:if test="${event.repeat=='false'}"><s:link href="/user/facility/onetimeSchedule/confirmpage/4/${event.id}/selectgroupweek/0/${year}/${month}/${date}">${event.title}</s:link></c:if>
Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/facility/confirm.jsp
===================================================================
--- scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/facility/confirm.jsp 2008-11-25 13:45:04 UTC (rev 1446)
+++ scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/facility/confirm.jsp 2008-11-26 08:53:03 UTC (rev 1447)
@@ -10,9 +10,9 @@
<div class="tab-nav">
<ul>
<li class="first"></li>
- <li class="selected"><span>Facilities</span></li>
+ <li class="selected"><span><bean:message key="labels.facilities"/></span></li>
<li class="spacer"></li>
- <li class="selectable"><s:link href="/user/facility/calendar/" style="text-decoration: none;">Facility Groups</s:link></li>
+ <li class="selectable"><s:link href="/admin/facility/facilityGroup/" style="text-decoration: none;"><bean:message key="labels.facility_groups"/></s:link></li>
<li class="last"></li>
</ul>
</div>
@@ -25,14 +25,14 @@
<html:hidden property="mode"/>
<div class="form-table" style="margin-top:3px;">
<table style="width: 400px;">
- <caption>Confirmation Of Facility</caption>
+ <caption><bean:message key="labels.confirmation_of_facility"/></caption>
<tbody>
<tr>
- <th style="width: 120px;">Facility Name</th>
+ <th style="width: 120px;"><bean:message key="labels.facility_name"/></th>
<td>${f:h(name)}<html:hidden property="name"/></td>
</tr>
<tr>
- <th>Facility Group</th>
+ <th><bean:message key="labels.facility_group"/></th>
<td>
<c:forEach var="fg" varStatus="s" items="${facilityGroupItems}">
<c:if test="${fg.id==groupId}">${f:h(fg.name)}</c:if>
@@ -48,19 +48,19 @@
<tr>
<td colspan="2">
<c:if test="${mode == 1}">
- <input type="submit" name="create" value="Create"/>
- <input type="submit" name="editagain" value="Back"/>
+ <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="Update"/>
- <input type="submit" name="editagain" value="Back"/>
+ <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="Delete"/>
- <input type="submit" name="back" value="Back"/>
+ <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="Back"/>
+ <input type="submit" name="back" value="<bean:message key="labels.back"/>"/>
</c:if>
</td>
</tr>
Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/facility/index.jsp
===================================================================
--- scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/facility/index.jsp 2008-11-25 13:45:04 UTC (rev 1446)
+++ scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/facility/index.jsp 2008-11-26 08:53:03 UTC (rev 1447)
@@ -10,9 +10,9 @@
<div class="tab-nav">
<ul>
<li class="first"></li>
- <li class="selected"><span>Facilities</span></li>
+ <li class="selected"><span><bean:message key="labels.facilities"/></span></li>
<li class="spacer"></li>
- <li class="selectable"><s:link href="/user/facility/calendar/movegroupweekthismonth" style="text-decoration: none;">Facility Groups</s:link></li>
+ <li class="selectable"><s:link href="/user/facility/calendar/movegroupweekthismonth" style="text-decoration: none;"><bean:message key="labels.facility_groups"/></s:link></li>
<li class="last"></li>
</ul>
</div>
@@ -25,7 +25,7 @@
<table>
<tbody>
<tr>
- <th>Group</th>
+ <th><bean:message key="labels.group"/></th>
<td>
<html:select property="groupId">
<option value="">----</option>
@@ -35,8 +35,8 @@
</html:select>
</td>
<td>
-<input type="submit" name="search" value="Search"/>
-<input type="submit" name="reset" value="Reset"/>
+<input type="submit" name="search" value="<bean:message key="labels.search"/>"/>
+<input type="submit" name="reset" value="<bean:message key="labels.reset"/>"/>
</td>
</tr>
</tbody>
@@ -47,7 +47,7 @@
<table border="1">
<thead>
<tr>
- <th style="width:200px;text-align: center;">Facility Name</th>
+ <th style="width:200px;text-align: center;"><bean:message key="labels.facility_name"/></th>
<th style="width:100px;text-align: center;"> </th>
</tr>
</thead>
@@ -56,7 +56,7 @@
<tr class="${s.index %2 == 0 ? 'row1' : 'row2'}">
<td><s:link href="/user/facility/calendar/display/${f:u(g.id)}">${f:h(g.name)}</s:link></td>
<td align="center">
- <s:link href="confirmpage/4/${f:u(g.id)}">Details</s:link>
+ <s:link href="confirmpage/4/${f:u(g.id)}"><bean:message key="labels.details"/></s:link>
</td>
</tr>
</c:forEach>
@@ -66,7 +66,7 @@
<div style="width: 450px;text-align: center;">
<span>
<c:if test="${facilityPager.existPrePage}">
- <s:link href="list/${facilityPager.currentPageNumber - 1}">Previous</s:link>
+ <s:link href="list/${facilityPager.currentPageNumber - 1}"><bean:message key="labels.previous"/></s:link>
</c:if>
</span>
<span>
@@ -83,7 +83,7 @@
</span>
<span>
<c:if test="${facilityPager.existNextPage}">
- <s:link href="list/${facilityPager.currentPageNumber + 1}">Next</s:link>
+ <s:link href="list/${facilityPager.currentPageNumber + 1}"><bean:message key="labels.next"/></s:link>
</c:if>
</span>
</div>
Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/onetimeSchedule/confirm.jsp
===================================================================
--- scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/onetimeSchedule/confirm.jsp 2008-11-25 13:45:04 UTC (rev 1446)
+++ scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/onetimeSchedule/confirm.jsp 2008-11-26 08:53:03 UTC (rev 1447)
@@ -10,12 +10,12 @@
<div class="tab-nav">
<ul>
<li class="first"></li>
- <li class="selectable"><s:link href="/user/facility/calendar/${returnType}/${facilityId}/${year}/${month}/${date}" style="text-decoration: none;">Calendar</s:link></li>
+ <li class="selectable"><s:link href="/user/facility/calendar/${returnType}/${facilityId}/${year}/${month}/${date}" style="text-decoration: none;"><bean:message key="labels.calendar"/></s:link></li>
<li class="spacer"></li>
- <li class="selected"><span>One time</span></li>
+ <li class="selected"><span><bean:message key="labels.one_time"/></span></li>
<c:if test="${mode==1}">
<li class="spacer"></li>
- <li class="selectable"><s:link href="/user/facility/repeatSchedule/createpage/selectpersonalmonth/${facilityId}/${year}/${month}/${date}" style="text-decoration: none;">Repeats</s:link></li>
+ <li class="selectable"><s:link href="/user/facility/repeatSchedule/createpage/selectpersonalmonth/${facilityId}/${year}/${month}/${date}" style="text-decoration: none;"><bean:message key="labels.repeats"/></s:link></li>
</c:if>
<li class="last"></li>
</ul>
@@ -37,47 +37,47 @@
<caption><bean:message key="labels.confirmation_of_event"/></caption>
<tbody>
<tr>
- <th style="width: 120px;">What</th>
+ <th style="width: 120px;"><bean:message key="labels.what"/></th>
<td>${f:h(title)}<html:hidden property="title"/></td>
</tr>
<tr>
- <th>Where</th>
+ <th><bean:message key="labels.where"/></th>
<td>${f:h(location)}<html:hidden property="location"/></td>
</tr>
<tr>
- <th rowspan="2">When</th>
+ <th rowspan="2"><bean:message key="labels.when"/></th>
<td>
-From:
+<bean:message key="labels.from"/>
${f:h(startDate)}<html:hidden property="startDate"/>
${f:h(startTime)}<html:hidden property="startTime"/>
</td>
</tr>
<tr>
<td>
-To:
+<bean:message key="labels.to"/>
${f:h(endDate)}<html:hidden property="endDate"/>
${f:h(endTime)}<html:hidden property="endTime"/>
</td>
</tr>
<tr>
- <th>Description</th>
+ <th><bean:message key="labels.description"/></th>
<td>${f:br(f:h(content))}<html:hidden property="content"/></td>
</tr>
<tr>
- <th>Privacy</th>
+ <th><bean:message key="labels.privacy"/></th>
<td>
-<c:if test="${secret=='F'}">Public</c:if>
-<c:if test="${secret=='T'}">Private</c:if>
+<c:if test="${secret=='F'}"><bean:message key="labels.public"/></c:if>
+<c:if test="${secret=='T'}"><bean:message key="labels.private"/></c:if>
<html:hidden property="secret"/>
</td>
</tr>
<tr>
- <th>Assigned</th>
+ <th><bean:message key="labels.assigned"/></th>
<td>
<table>
<tbody>
<tr>
- <th style="width:200px;">Name</th>
+ <th style="width:200px;"><bean:message key="labels.name"/></th>
</tr>
<c:forEach var="u" varStatus="s" items="${selectedUserItems}">
<tr>
@@ -94,12 +94,12 @@
</td>
</tr>
<tr>
- <th>Facilities</th>
+ <th><bean:message key="labels.facilities"/></th>
<td>
<table>
<tbody>
<tr>
- <th style="width:200px;">Name</th>
+ <th style="width:200px;"><bean:message key="labels.name"/></th>
</tr>
<c:forEach var="f" varStatus="s" items="${selectedFacilityItems}">
<tr>
Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/onetimeSchedule/edit.jsp
===================================================================
--- scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/onetimeSchedule/edit.jsp 2008-11-25 13:45:04 UTC (rev 1446)
+++ scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/onetimeSchedule/edit.jsp 2008-11-26 08:53:03 UTC (rev 1447)
@@ -10,12 +10,12 @@
<div class="tab-nav">
<ul>
<li class="first"></li>
- <li class="selectable"><s:link href="/user/facility/calendar/${returnType}/${facilityId}/${year}/${month}/${date}" style="text-decoration: none;">Calendar</s:link></li>
+ <li class="selectable"><s:link href="/user/facility/calendar/${returnType}/${facilityId}/${year}/${month}/${date}" style="text-decoration: none;"><bean:message key="labels.calendar"/></s:link></li>
<li class="spacer"></li>
- <li class="selected"><span>One time</span></li>
+ <li class="selected"><span><bean:message key="labels.one_time"/></span></li>
<c:if test="${mode==1}">
<li class="spacer"></li>
- <li class="selectable"><s:link href="/user/facility/repeatSchedule/createpage/selectpersonalmonth/${facilityId}/${year}/${month}/${date}" style="text-decoration: none;">Repeats</s:link></li>
+ <li class="selectable"><s:link href="/user/facility/repeatSchedule/createpage/selectpersonalmonth/${facilityId}/${year}/${month}/${date}" style="text-decoration: none;"><bean:message key="labels.repeats"/></s:link></li>
</c:if>
<li class="last"></li>
</ul>
@@ -37,20 +37,20 @@
<caption><bean:message key="labels.event_detail"/></caption>
<tbody>
<tr>
- <th style="width: 120px;">What</th>
+ <th style="width: 120px;"><bean:message key="labels.what"/></th>
<td><html:text property="title" size="20"/></td>
</tr>
<tr>
- <th>Where</th>
+ <th><bean:message key="labels.where"/></th>
<td><html:text property="location" size="20"/></td>
</tr>
<tr>
- <th>When</th>
+ <th><bean:message key="labels.when"/></th>
<td>
<table>
<tbody>
<tr>
- <th>From</th>
+ <th><bean:message key="labels.from2"/></th>
<td style="text-align: center;">
<html:select property="startDateY">
<c:forEach var="v" varStatus="s" items="${yearItems}">
@@ -86,7 +86,7 @@
</td>
</tr>
<tr>
- <th>To</th>
+ <th><bean:message key="labels.to2"/></th>
<td style="text-align: center;">
<html:select property="endDateY">
<c:forEach var="v" varStatus="s" items="${yearItems}">
@@ -126,25 +126,25 @@
</td>
</tr>
<tr>
- <th>Description</th>
+ <th><bean:message key="labels.description"/></th>
<td><html:textarea property="content" cols="20" rows="5"/></td>
</tr>
<tr>
- <th>Privacy</th>
+ <th><bean:message key="labels.privacy"/></th>
<td>
<html:select property="secret">
- <html:option value="F">Public</html:option>
- <html:option value="T">Private</html:option>
+ <html:option value="F"><bean:message key="labels.public"/></html:option>
+ <html:option value="T"><bean:message key="labels.private"/></html:option>
</html:select>
</td>
</tr>
<tr>
- <th>Assigned</th>
+ <th><bean:message key="labels.assigned"/></th>
<td>
<table>
<tbody>
<tr>
- <th style="width:200px;">Name</th>
+ <th style="width:200px;"><bean:message key="labels.name"/></th>
</tr>
<c:forEach var="u" varStatus="s" items="${selectedUserItems}">
<tr>
@@ -155,7 +155,7 @@
<tfoot>
<tr>
<td>
-<input type="submit" name="selectusers" value="Select Users"/>
+<input type="submit" name="selectusers" value="<bean:message key="labels.select_users"/>"/>
</td>
</tr>
</tfoot>
@@ -168,12 +168,12 @@
</td>
</tr>
<tr>
- <th>Facilities</th>
+ <th><bean:message key="labels.facilities"/></th>
<td>
<table>
<tbody>
<tr>
- <th style="width:200px;">Name</th>
+ <th style="width:200px;"><bean:message key="labels.name"/></th>
</tr>
<c:forEach var="f" varStatus="s" items="${selectedFacilityItems}">
<tr>
@@ -184,7 +184,7 @@
<tfoot>
<tr>
<td>
-<input type="submit" name="selectfacilities" value="Select Facilities"/>
+<input type="submit" name="selectfacilities" value="<bean:message key="labels.select_facilities"/>"/>
</td>
</tr>
</tfoot>
Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/onetimeSchedule/error.jsp
===================================================================
--- scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/onetimeSchedule/error.jsp 2008-11-25 13:45:04 UTC (rev 1446)
+++ scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/onetimeSchedule/error.jsp 2008-11-26 08:53:03 UTC (rev 1447)
@@ -9,12 +9,12 @@
<div class="tab-nav">
<ul>
<li class="first"></li>
- <li class="selectable"><s:link href="/user/facility/calendar/${returnType}/${facilityId}/${year}/${month}/${date}" style="text-decoration: none;">Calendar</s:link></li>
+ <li class="selectable"><s:link href="/user/facility/calendar/${returnType}/${facilityId}/${year}/${month}/${date}" style="text-decoration: none;"><bean:message key="labels.calendar"/></s:link></li>
<li class="spacer"></li>
- <li class="selected"><span>One time</span></li>
+ <li class="selected"><span><bean:message key="labels.one_time"/></span></li>
<c:if test="${mode==1}">
<li class="spacer"></li>
- <li class="selectable"><s:link href="/user/facility/repeatSchedule/createpage/selectpersonalmonth/${facilityId}/${year}/${month}/${date}" style="text-decoration: none;">Repeats</s:link></li>
+ <li class="selectable"><s:link href="/user/facility/repeatSchedule/createpage/selectpersonalmonth/${facilityId}/${year}/${month}/${date}" style="text-decoration: none;"><bean:message key="labels.repeats"/></s:link></li>
</c:if>
<li class="last"></li>
</ul>
Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/onetimeSchedule/facilitylist.jsp
===================================================================
--- scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/onetimeSchedule/facilitylist.jsp 2008-11-25 13:45:04 UTC (rev 1446)
+++ scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/onetimeSchedule/facilitylist.jsp 2008-11-26 08:53:03 UTC (rev 1447)
@@ -10,12 +10,12 @@
<div class="tab-nav">
<ul>
<li class="first"></li>
- <li class="selectable"><s:link href="/facility/schedule/calendar/${returnType}/${facilityId}/${year}/${month}/${date}" style="text-decoration: none;">Calendar</s:link></li>
+ <li class="selectable"><s:link href="/facility/schedule/calendar/${returnType}/${facilityId}/${year}/${month}/${date}" style="text-decoration: none;"><bean:message key="labels.calendar"/></s:link></li>
<li class="spacer"></li>
- <li class="selected"><span>One time</span></li>
+ <li class="selected"><span><bean:message key="labels.one_time"/></span></li>
<c:if test="${mode==1}">
<li class="spacer"></li>
- <li class="selectable"><s:link href="/facility/schedule/repeatSchedule/createpage/selectpersonalmonth/${facilityId}/${year}/${month}/${date}" style="text-decoration: none;">Repeats</s:link></li>
+ <li class="selectable"><s:link href="/facility/schedule/repeatSchedule/createpage/selectpersonalmonth/${facilityId}/${year}/${month}/${date}" style="text-decoration: none;"><bean:message key="labels.repeats"/></s:link></li>
</c:if>
<li class="last"></li>
</ul>
@@ -50,7 +50,7 @@
<table style="margin-bottom: 5px;">
<thead>
<tr>
- <th>Facility Group</th>
+ <th><bean:message key="labels.facility_group"/></th>
</tr>
</thead>
<tbody>
@@ -90,14 +90,14 @@
</table>
</div>
<div style="float:left;width: 100px;text-align: center;padding-top:100px;">
-<input type="submit" name="addfacilities" value="Add >>"/>
-<input type="submit" name="removefacilities" value="<< Remove"/>
+<input type="submit" name="addfacilities" value="<bean:message key="labels.add"/> >>"/>
+<input type="submit" name="removefacilities" value="<< <bean:message key="labels.remove"/>"/>
</div>
<div class="form-table" style="float:left;width: 200px;">
<table>
<thead>
<tr>
- <th>Selected Facility List</th>
+ <th><bean:message key="labels.selected_facility_list"/></th>
</tr>
</thead>
<tbody>
@@ -120,7 +120,7 @@
<tfoot>
<tr>
<td>
-<input type="submit" name="setfacilities" value="OK"/>
+<input type="submit" name="setfacilities" value="<bean:message key="labels.OK"/>"/>
</td>
</tr>
</tfoot>
Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/onetimeSchedule/userlist.jsp
===================================================================
--- scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/onetimeSchedule/userlist.jsp 2008-11-25 13:45:04 UTC (rev 1446)
+++ scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/onetimeSchedule/userlist.jsp 2008-11-26 08:53:03 UTC (rev 1447)
@@ -10,12 +10,12 @@
<div class="tab-nav">
<ul>
<li class="first"></li>
- <li class="selectable"><s:link href="/user/facility/calendar/${returnType}/${facilityId}/${year}/${month}/${date}" style="text-decoration: none;">Calendar</s:link></li>
+ <li class="selectable"><s:link href="/user/facility/calendar/${returnType}/${facilityId}/${year}/${month}/${date}" style="text-decoration: none;"><bean:message key="labels.calendar"/></s:link></li>
<li class="spacer"></li>
- <li class="selected"><span>One time</span></li>
+ <li class="selected"><span><bean:message key="labels.one_time"/></span></li>
<c:if test="${mode==1}">
<li class="spacer"></li>
- <li class="selectable"><s:link href="/user/facility/repeatSchedule/createpage/selectpersonalmonth/${facilityId}/${year}/${month}/${date}" style="text-decoration: none;">Repeats</s:link></li>
+ <li class="selectable"><s:link href="/user/facility/repeatSchedule/createpage/selectpersonalmonth/${facilityId}/${year}/${month}/${date}" style="text-decoration: none;"><bean:message key="labels.repeats"/></s:link></li>
</c:if>
<li class="last"></li>
</ul>
@@ -50,7 +50,7 @@
<table style="margin-bottom: 5px;">
<thead>
<tr>
- <th>User Group</th>
+ <th><bean:message key="labels.user_group"/></th>
</tr>
</thead>
<tbody>
@@ -65,7 +65,7 @@
</tr>
<tr>
<td style="text-align: center;">
-<input type="submit" name="changeusergroup" value="Display"/>
+<input type="submit" name="changeusergroup" value="<bean:message key="labels.display"/>"/>
</td>
</tr>
</tbody>
@@ -73,7 +73,7 @@
<table>
<thead>
<tr>
- <th>User List</th>
+ <th><bean:message key="labels.user_list"/></th>
</tr>
</thead>
<tbody>
@@ -90,14 +90,14 @@
</table>
</div>
<div style="float:left;width: 100px;text-align: center;padding-top:100px;">
-<input type="submit" name="addusers" value="Add >>"/>
-<input type="submit" name="removeusers" value="<< Remove"/>
+<input type="submit" name="addusers" value="<bean:message key="labels.add"/> >>"/>
+<input type="submit" name="removeusers" value="<< <bean:message key="labels.remove"/>"/>
</div>
<div class="form-table" style="float:left;width: 200px;">
<table>
<thead>
<tr>
- <th>Selected User List</th>
+ <th><bean:message key="labels.selected_user_list"/></th>
</tr>
</thead>
<tbody>
@@ -120,7 +120,7 @@
<tfoot>
<tr>
<td>
-<input type="submit" name="setusers" value="OK"/>
+<input type="submit" name="setusers" value="<bean:message key="labels.ok"/>"/>
</td>
</tr>
</tfoot>
Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/repeatSchedule/confirm.jsp
===================================================================
--- scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/repeatSchedule/confirm.jsp 2008-11-25 13:45:04 UTC (rev 1446)
+++ scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/repeatSchedule/confirm.jsp 2008-11-26 08:53:03 UTC (rev 1447)
@@ -10,13 +10,13 @@
<div class="tab-nav">
<ul>
<li class="first"></li>
- <li class="selectable"><s:link href="/user/facility/calendar/${returnType}/${facilityId}/${year}/${month}/${date}" style="text-decoration: none;">Calendar</s:link></li>
+ <li class="selectable"><s:link href="/user/facility/calendar/${returnType}/${facilityId}/${year}/${month}/${date}" style="text-decoration: none;"><bean:message key="labels.calendar"/></s:link></li>
<c:if test="${mode==1}">
<li class="spacer"></li>
- <li class="selectable"><s:link href="/user/facility/onetimeSchedule/createpage/${returnType}/${facilityId}/${year}/${month}/${date}" style="text-decoration: none;">One Time</s:link></li>
+ <li class="selectable"><s:link href="/user/facility/onetimeSchedule/createpage/${returnType}/${facilityId}/${year}/${month}/${date}" style="text-decoration: none;"><bean:message key="labels.one_time"/></s:link></li>
</c:if>
<li class="spacer"></li>
- <li class="selected"><span>Repeats</span></li>
+ <li class="selected"><span><bean:message key="labels.repeats"/></span></li>
<li class="last"></li>
</ul>
</div>
@@ -37,60 +37,60 @@
<caption><bean:message key="labels.confirmation_of_event"/></caption>
<tbody>
<tr>
- <th style="width: 120px;">What</th>
+ <th style="width: 120px;"><bean:message key="labels.what"/></th>
<td>${f:h(title)}<html:hidden property="title"/></td>
</tr>
<tr>
- <th>Where</th>
+ <th><bean:message key="labels.where"/></th>
<td>${f:h(location)}<html:hidden property="location"/></td>
</tr>
<tr>
- <th>Repeats</th>
+ <th><bean:message key="labels.repeats"/></th>
<td>
-<c:if test="${type=='MTWTFSS'}">Daily</c:if>
-<c:if test="${type=='MTWTF'}">Every weekday (Mon-Fri)</c:if>
-<c:if test="${type=='MWF'}">Every Mon., Wed., and Fri.</c:if>
-<c:if test="${type=='TT'}">Every Tues., and Thurs.</c:if>
-<c:if test="${type=='WEEKLY'}">Weekly</c:if>
-<c:if test="${type=='MONTHLY'}">Monthly</c:if>
-<c:if test="${type=='YEARLY'}">Yearly</c:if>
+<c:if test="${type=='MTWTFSS'}"><bean:message key="labels.mtwtfss"/></c:if>
+<c:if test="${type=='MTWTF'}"><bean:message key="labels.mtwtf"/></c:if>
+<c:if test="${type=='MWF'}"><bean:message key="labels.mwf"/></c:if>
+<c:if test="${type=='TT'}"><bean:message key="labels.tt"/></c:if>
+<c:if test="${type=='WEEKLY'}"><bean:message key="labels.weekly"/></c:if>
+<c:if test="${type=='MONTHLY'}"><bean:message key="labels.monthly"/></c:if>
+<c:if test="${type=='YEARLY'}"><bean:message key="labels.yearly"/></c:if>
<html:hidden property="type"/>
</td>
</tr>
<tr>
- <th rowspan="2">When</th>
+ <th rowspan="2"><bean:message key="labels.when"/></th>
<td>
-From:
+<bean:message key="labels.from"/>
${f:h(startDate)}<html:hidden property="startDate"/>
${f:h(startTime)}<html:hidden property="startTime"/>
</td>
</tr>
<tr>
<td>
-To:
+<bean:message key="labels.to"/>
${f:h(endDate)}<html:hidden property="endDate"/>
${f:h(endTime)}<html:hidden property="endTime"/>
</td>
</tr>
<tr>
- <th>Description</th>
+ <th><bean:message key="labels.description"/></th>
<td>${f:br(f:h(content))}<html:hidden property="content"/></td>
</tr>
<tr>
- <th>Privacy</th>
+ <th><bean:message key="labels.privacy"/></th>
<td>
-<c:if test="${secret=='F'}">Public</c:if>
-<c:if test="${secret=='T'}">Private</c:if>
+<c:if test="${secret=='F'}"><bean:message key="labels.public"/></c:if>
+<c:if test="${secret=='T'}"><bean:message key="labels.private"/></c:if>
<html:hidden property="secret"/>
</td>
</tr>
<tr>
- <th>Assigned</th>
+ <th><bean:message key="labels.assigned"/></th>
<td>
<table>
<tbody>
<tr>
- <th style="width:200px;">Name</th>
+ <th style="width:200px;"><bean:message key="labels.name"/></th>
</tr>
<c:forEach var="u" varStatus="s" items="${selectedUserItems}">
<tr>
@@ -107,12 +107,12 @@
</td>
</tr>
<tr>
- <th>Facilities</th>
+ <th><bean:message key="labels.facilities"/></th>
<td>
<table>
<tbody>
<tr>
- <th style="width:200px;">Name</th>
+ <th style="width:200px;"><bean:message key="labels.name"/></th>
</tr>
<c:forEach var="f" varStatus="s" items="${selectedFacilityItems}">
<tr>
Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/repeatSchedule/edit.jsp
===================================================================
--- scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/repeatSchedule/edit.jsp 2008-11-25 13:45:04 UTC (rev 1446)
+++ scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/repeatSchedule/edit.jsp 2008-11-26 08:53:03 UTC (rev 1447)
@@ -10,13 +10,13 @@
<div class="tab-nav">
<ul>
<li class="first"></li>
- <li class="selectable"><s:link href="/user/facility/calendar/${returnType}/${facilityId}/${year}/${month}/${date}" style="text-decoration: none;">Calendar</s:link></li>
+ <li class="selectable"><s:link href="/user/facility/calendar/${returnType}/${facilityId}/${year}/${month}/${date}" style="text-decoration: none;"><bean:message key="labels.calendar"/></s:link></li>
<c:if test="${mode==1}">
<li class="spacer"></li>
- <li class="selectable"><s:link href="/user/facility/onetimeSchedule/createpage/${returnType}/${facilityId}/${year}/${month}/${date}" style="text-decoration: none;">One Time</s:link></li>
+ <li class="selectable"><s:link href="/user/facility/onetimeSchedule/createpage/${returnType}/${facilityId}/${year}/${month}/${date}" style="text-decoration: none;"><bean:message key="labels.one_time"/></s:link></li>
</c:if>
<li class="spacer"></li>
- <li class="selected"><span>Repeats</span></li>
+ <li class="selected"><span><bean:message key="labels.repeats"/></span></li>
<li class="last"></li>
</ul>
</div>
@@ -37,34 +37,34 @@
<caption><bean:message key="labels.event_detail"/></caption>
<tbody>
<tr>
- <th style="width: 120px;">What</th>
+ <th style="width: 120px;"><bean:message key="labels.what"/></th>
<td><html:text property="title" size="20"/></td>
</tr>
<tr>
- <th>Where</th>
+ <th><bean:message key="labels.where"/></th>
<td><html:text property="location" size="20"/></td>
</tr>
<tr>
- <th>Repeats</th>
+ <th><bean:message key="labels.repeats"/></th>
<td>
<html:select property="type">
- <html:option value="MTWTFSS">Daily</html:option>
- <html:option value="MTWTF">Every weekday (Mon-Fri)</html:option>
- <html:option value="MWF">Every Mon., Wed., and Fri.</html:option>
- <html:option value="TT">Every Tues., and Thurs.</html:option>
- <html:option value="WEEKLY">Weekly</html:option>
- <html:option value="MONTHLY">Monthly</html:option>
- <html:option value="YEARLY">Yearly</html:option>
+ <html:option value="MTWTFSS"><bean:message key="labels.mtwtfss"/></html:option>
+ <html:option value="MTWTF"><bean:message key="labels.mtwtf"/></html:option>
+ <html:option value="MWF"><bean:message key="labels.mwf"/></html:option>
+ <html:option value="TT"><bean:message key="labels.tt"/></html:option>
+ <html:option value="WEEKLY"><bean:message key="labels.weekly"/></html:option>
+ <html:option value="MONTHLY"><bean:message key="labels.monthly"/></html:option>
+ <html:option value="YEARLY"><bean:message key="labels.yearly"/></html:option>
</html:select>
</td>
</tr>
<tr>
- <th>When</th>
+ <th><bean:message key="labels.when"/></th>
<td>
<table>
<tbody>
<tr>
- <th>From</th>
+ <th><bean:message key="labels.from2"/></th>
<td style="text-align: center;">
<html:select property="startDateY">
<c:forEach var="v" varStatus="s" items="${yearItems}">
@@ -100,7 +100,7 @@
</td>
</tr>
<tr>
- <th>To</th>
+ <th><bean:message key="labels.to2"/></th>
<td style="text-align: center;">
<html:select property="endDateY">
<option value="">----</option>
@@ -143,25 +143,25 @@
</td>
</tr>
<tr>
- <th>Description</th>
+ <th><bean:message key="labels.description"/></th>
<td><html:textarea property="content" cols="20" rows="5"/></td>
</tr>
<tr>
- <th>Privacy</th>
+ <th><bean:message key="labels.privacy"/></th>
<td>
<html:select property="secret">
- <html:option value="F">Public</html:option>
- <html:option value="T">Private</html:option>
+ <html:option value="F"><bean:message key="labels.public"/></html:option>
+ <html:option value="T"><bean:message key="labels.private"/></html:option>
</html:select>
</td>
</tr>
<tr>
- <th>Assigned</th>
+ <th><bean:message key="labels.assigned"/></th>
<td>
<table>
<tbody>
<tr>
- <th style="width:200px;">Name</th>
+ <th style="width:200px;"><bean:message key="labels.name"/></th>
</tr>
<c:forEach var="u" varStatus="s" items="${selectedUserItems}">
<tr>
@@ -172,7 +172,7 @@
<tfoot>
<tr>
<td>
-<input type="submit" name="selectusers" value="Select Users"/>
+<input type="submit" name="selectusers" value="<bean:message key="labels.select_users"/>"/>
</td>
</tr>
</tfoot>
@@ -185,12 +185,12 @@
</td>
</tr>
<tr>
- <th>Facilities</th>
+ <th><bean:message key="labels.facilities"/></th>
<td>
<table>
<tbody>
<tr>
- <th style="width:200px;">Name</th>
+ <th style="width:200px;"><bean:message key="labels.name"/></th>
</tr>
<c:forEach var="f" varStatus="s" items="${selectedFacilityItems}">
<tr>
@@ -201,7 +201,7 @@
<tfoot>
<tr>
<td>
-<input type="submit" name="selectfacilities" value="Select Facilities"/>
+<input type="submit" name="selectfacilities" value="<bean:message key="labels.select_facilities"/>"/>
</td>
</tr>
</tfoot>
Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/repeatSchedule/error.jsp
===================================================================
--- scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/repeatSchedule/error.jsp 2008-11-25 13:45:04 UTC (rev 1446)
+++ scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/repeatSchedule/error.jsp 2008-11-26 08:53:03 UTC (rev 1447)
@@ -9,13 +9,13 @@
<div class="tab-nav">
<ul>
<li class="first"></li>
- <li class="selectable"><s:link href="/user/facility/calendar/${returnType}/${facilityId}/${year}/${month}/${date}" style="text-decoration: none;">Calendar</s:link></li>
+ <li class="selectable"><s:link href="/user/facility/calendar/${returnType}/${facilityId}/${year}/${month}/${date}" style="text-decoration: none;"><bean:message key="labels.calendar"/></s:link></li>
<c:if test="${mode==1}">
<li class="spacer"></li>
- <li class="selectable"><s:link href="/user/facility/onetimeSchedule/createpage/${returnType}/${facilityId}/${year}/${month}/${date}" style="text-decoration: none;">One Time</s:link></li>
+ <li class="selectable"><s:link href="/user/facility/onetimeSchedule/createpage/${returnType}/${facilityId}/${year}/${month}/${date}" style="text-decoration: none;"><bean:message key="labels.one_time"/></s:link></li>
</c:if>
<li class="spacer"></li>
- <li class="selected"><span>Repeats</span></li>
+ <li class="selected"><span><bean:message key="labels.repeats"/></span></li>
<li class="last"></li>
</ul>
</div>
Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/repeatSchedule/facilitylist.jsp
===================================================================
--- scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/repeatSchedule/facilitylist.jsp 2008-11-25 13:45:04 UTC (rev 1446)
+++ scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/repeatSchedule/facilitylist.jsp 2008-11-26 08:53:03 UTC (rev 1447)
@@ -10,13 +10,13 @@
<div class="tab-nav">
<ul>
<li class="first"></li>
- <li class="selectable"><s:link href="/user/facility/calendar/${returnType}/${facilityId}/${year}/${month}/${date}" style="text-decoration: none;">Calendar</s:link></li>
+ <li class="selectable"><s:link href="/user/facility/calendar/${returnType}/${facilityId}/${year}/${month}/${date}" style="text-decoration: none;"><bean:message key="labels.calendar"/></s:link></li>
<c:if test="${mode==1}">
<li class="spacer"></li>
- <li class="selectable"><s:link href="/user/facility/onetimeSchedule/createpage/${returnType}/${facilityId}/${year}/${month}/${date}" style="text-decoration: none;">One Time</s:link></li>
+ <li class="selectable"><s:link href="/user/facility/onetimeSchedule/createpage/${returnType}/${facilityId}/${year}/${month}/${date}" style="text-decoration: none;"><bean:message key="labels.one_time"/></s:link></li>
</c:if>
<li class="spacer"></li>
- <li class="selected"><span>Repeats</span></li>
+ <li class="selected"><span><bean:message key="labels.repeats"/></span></li>
<li class="last"></li>
</ul>
</div>
@@ -50,7 +50,7 @@
<table style="margin-bottom: 5px;">
<thead>
<tr>
- <th>Facility Group</th>
+ <th><bean:message key="labels.facility_group"/></th>
</tr>
</thead>
<tbody>
@@ -65,7 +65,7 @@
</tr>
<tr>
<td style="text-align: center;">
-<input type="submit" name="changefacilitygroup" value="Display"/>
+<input type="submit" name="changefacilitygroup" value="<bean:message key="labels.display"/>"/>
</td>
</tr>
</tbody>
@@ -73,7 +73,7 @@
<table>
<thead>
<tr>
- <th>Facility List</th>
+ <th><bean:message key="labels.facility_list"/></th>
</tr>
</thead>
<tbody>
@@ -97,7 +97,7 @@
<table>
<thead>
<tr>
- <th>Selected Facility List</th>
+ <th><bean:message key="labels.selected_facility_list"/></th>
</tr>
</thead>
<tbody>
@@ -120,7 +120,7 @@
<tfoot>
<tr>
<td>
-<input type="submit" name="setfacilities" value="OK"/>
+<input type="submit" name="setfacilities" value="<bean:message key="labels.ok"/>"/>
</td>
</tr>
</tfoot>
Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/repeatSchedule/userlist.jsp
===================================================================
--- scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/repeatSchedule/userlist.jsp 2008-11-25 13:45:04 UTC (rev 1446)
+++ scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/repeatSchedule/userlist.jsp 2008-11-26 08:53:03 UTC (rev 1447)
@@ -10,13 +10,13 @@
<div class="tab-nav">
<ul>
<li class="first"></li>
- <li class="selectable"><s:link href="/user/facility/calendar/${returnType}/${facilityId}/${year}/${month}/${date}" style="text-decoration: none;">Calendar</s:link></li>
+ <li class="selectable"><s:link href="/user/facility/calendar/${returnType}/${facilityId}/${year}/${month}/${date}" style="text-decoration: none;"><bean:message key="labels.calendar"/></s:link></li>
<c:if test="${mode==1}">
<li class="spacer"></li>
- <li class="selectable"><s:link href="/user/facility/onetimeSchedule/createpage/${returnType}/${facilityId}/${year}/${month}/${date}" style="text-decoration: none;">One Time</s:link></li>
+ <li class="selectable"><s:link href="/user/facility/onetimeSchedule/createpage/${returnType}/${facilityId}/${year}/${month}/${date}" style="text-decoration: none;"><bean:message key="labels.one_time"/></s:link></li>
</c:if>
<li class="spacer"></li>
- <li class="selected"><span>Repeats</span></li>
+ <li class="selected"><span><bean:message key="labels.repeats"/></span></li>
<li class="last"></li>
</ul>
</div>
@@ -51,7 +51,7 @@
<table style="margin-bottom: 5px;">
<thead>
<tr>
- <th>User Group</th>
+ <th><bean:message key="labels.user_group"/></th>
</tr>
</thead>
<tbody>
@@ -66,7 +66,7 @@
</tr>
<tr>
<td style="text-align: center;">
-<input type="submit" name="changeusergroup" value="Display"/>
+<input type="submit" name="changeusergroup" value="<bean:message key="labels.display"/>"/>
</td>
</tr>
</tbody>
@@ -74,7 +74,7 @@
<table>
<thead>
<tr>
- <th>User List</th>
+ <th><bean:message key="labels.user_list"/></th>
</tr>
</thead>
<tbody>
@@ -91,14 +91,14 @@
</table>
</div>
<div style="float:left;width: 100px;text-align: center;padding-top:100px;">
-<input type="submit" name="addusers" value="Add >>"/>
-<input type="submit" name="removeusers" value="<< Remove"/>
+<input type="submit" name="addusers" value="<bean:message key="labels.add"/> >>"/>
+<input type="submit" name="removeusers" value="<< <bean:message key="labels.remove"/>"/>
</div>
<div class="form-table" style="float:left;width: 200px;">
<table>
<thead>
<tr>
- <th>Selected User List</th>
+ <th><bean:message key="labels.selected_user_list"/></th>
</tr>
</thead>
<tbody>
@@ -121,7 +121,7 @@
<tfoot>
<tr>
<td>
-<input type="submit" name="setusers" value="OK"/>
+<input type="submit" name="setusers" value="<bean:message key="labels.ok"/>"/>
</td>
</tr>
</tfoot>
Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/calendar/groupweek.jsp
===================================================================
--- scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/calendar/groupweek.jsp 2008-11-25 13:45:04 UTC (rev 1446)
+++ scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/calendar/groupweek.jsp 2008-11-26 08:53:03 UTC (rev 1447)
@@ -10,13 +10,13 @@
<div class="tab-nav">
<ul>
<li class="first"></li>
- <li class="selectable"><s:link href="selectpersonalday/${year}/${month}/${date}" style="text-decoration: none;">Day</s:link></li>
+ <li class="selectable"><s:link href="selectpersonalday/${year}/${month}/${date}" style="text-decoration: none;"><bean:message key="labels.day"/></s:link></li>
<li class="spacer"></li>
- <li class="selectable"><s:link href="selectpersonalweek/${year}/${month}/${date}" style="text-decoration: none;">Week</s:link></li>
+ <li class="selectable"><s:link href="selectpersonalweek/${year}/${month}/${date}" style="text-decoration: none;"><bean:message key="labels.week"/></s:link></li>
<li class="spacer"></li>
- <li class="selectable"><s:link href="selectpersonalmonth/${year}/${month}/${date}" style="text-decoration: none;">Month</s:link></li>
+ <li class="selectable"><s:link href="selectpersonalmonth/${year}/${month}/${date}" style="text-decoration: none;"><bean:message key="labels.month"/></s:link></li>
<li class="spacer"></li>
- <li class="selected"><span>Week(Group)</span></li>
+ <li class="selected"><span><bean:message key="labels.week_group"/></span></li>
<li class="last"></li>
</ul>
</div>
@@ -30,20 +30,20 @@
</div>
<div style="margin:5px 0 2px 0;text-align: center;">
<s:link href="movegroupweekprevmonth/${year}/${month}/${date}"><</s:link>
-<s:link href="movegroupweekthismonth">Today</s:link>
+<s:link href="movegroupweekthismonth"><bean:message key="labels.today"/></s:link>
<s:link href="movegroupweeknextmonth/${year}/${month}/${date}">></s:link>
</div>
<table>
<caption>${year}/${month}<!-- TODO i18n --></caption>
<thead>
<tr>
- <th style="width:13px;text-align: center;">S</th>
- <th style="width:13px;text-align: center;">M</th>
- <th style="width:13px;text-align: center;">T</th>
- <th style="width:13px;text-align: center;">W</th>
- <th style="width:13px;text-align: center;">T</th>
- <th style="width:13px;text-align: center;">F</th>
- <th style="width:13px;text-align: center;">S</th>
+ <th style="width:13px;text-align: center;"><bean:message key="labels.sun"/></th>
+ <th style="width:13px;text-align: center;"><bean:message key="labels.mon"/></th>
+ <th style="width:13px;text-align: center;"><bean:message key="labels.tue"/></th>
+ <th style="width:13px;text-align: center;"><bean:message key="labels.wed"/></th>
+ <th style="width:13px;text-align: center;"><bean:message key="labels.thu"/></th>
+ <th style="width:13px;text-align: center;"><bean:message key="labels.fri"/></th>
+ <th style="width:13px;text-align: center;"><bean:message key="labels.sat"/></th>
</tr>
</thead>
<tbody>
@@ -65,7 +65,7 @@
<table>
<tbody>
<tr>
- <th>User Group</th>
+ <th><bean:message key="labels.user_group"/></th>
<td>
<html:select property="userGroup">
<c:forEach var="ug" varStatus="s" items="${userGroupItems}">
@@ -73,7 +73,7 @@
</c:forEach>
</html:select>
</td>
- <td><input type="submit" name="changeusergroup" value="Change"/></td>
+ <td><input type="submit" name="changeusergroup" value="<bean:message key="labels.change"/>"/></td>
</tr>
</tbody>
</table>
@@ -99,7 +99,7 @@
<ul style="margin:0;padding:0;">
<c:forEach var="event" varStatus="s3" items="${eventInDayItems}">
<li style="list-style-type:none;margin-top:2px;"><c:if test="${event.time!=''}"><span style="font-size:xx-small;">${event.time}</span><br/></c:if>
-<c:if test="${!s3.first&&event.secret=='T'}">Private</c:if>
+<c:if test="${!s3.first&&event.secret=='T'}"><bean:message key="labels.private"/></c:if>
<c:if test="${s3.first||event.secret=='F'}">
<c:if test="${event.repeat=='true'}"><s:link href="/user/schedule/repeatSchedule/confirmpage/4/${event.id}/selectgroupweek/${year}/${month}/${date}">${event.title}</s:link></c:if>
<c:if test="${event.repeat=='false'}"><s:link href="/user/schedule/onetimeSchedule/confirmpage/4/${event.id}/selectgroupweek/${year}/${month}/${date}">${event.title}</s:link></c:if>
Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/calendar/personalday.jsp
===================================================================
--- scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/calendar/personalday.jsp 2008-11-25 13:45:04 UTC (rev 1446)
+++ scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/calendar/personalday.jsp 2008-11-26 08:53:03 UTC (rev 1447)
@@ -10,13 +10,13 @@
<div class="tab-nav">
<ul>
<li class="first"></li>
- <li class="selected"><span>Day</span></li>
+ <li class="selected"><span><bean:message key="labels.day"/></span></li>
<li class="spacer"></li>
- <li class="selectable"><s:link href="selectpersonalweek/${year}/${month}/${date}" style="text-decoration: none;">Week</s:link></li>
+ <li class="selectable"><s:link href="selectpersonalweek/${year}/${month}/${date}" style="text-decoration: none;"><bean:message key="labels.week"/></s:link></li>
<li class="spacer"></li>
- <li class="selectable"><s:link href="selectpersonalmonth/${year}/${month}/${date}" style="text-decoration: none;">Month</s:link></li>
+ <li class="selectable"><s:link href="selectpersonalmonth/${year}/${month}/${date}" style="text-decoration: none;"><bean:message key="labels.month"/></s:link></li>
<li class="spacer"></li>
- <li class="selectable"><s:link href="selectgroupweek/${year}/${month}/${date}" style="text-decoration: none;">Group(Week)</s:link></li>
+ <li class="selectable"><s:link href="selectgroupweek/${year}/${month}/${date}" style="text-decoration: none;"><bean:message key="labels.group_week"/></s:link></li>
<li class="last"></li>
</ul>
</div>
@@ -30,20 +30,20 @@
</div>
<div style="margin:5px 0 2px 0;text-align: center;">
<s:link href="movepersonaldayprevmonth/${year}/${month}/${date}"><</s:link>
-<s:link href="movepersonaldaythismonth">Today</s:link>
+<s:link href="movepersonaldaythismonth"><bean:message key="labels.today"/></s:link>
<s:link href="movepersonaldaynextmonth/${year}/${month}/${date}">></s:link>
</div>
<table>
<caption>${year}/${month}<!-- TODO i18n --></caption>
<thead>
<tr>
- <th style="width:13px;text-align: center;">S</th>
- <th style="width:13px;text-align: center;">M</th>
- <th style="width:13px;text-align: center;">T</th>
- <th style="width:13px;text-align: center;">W</th>
- <th style="width:13px;text-align: center;">T</th>
- <th style="width:13px;text-align: center;">F</th>
- <th style="width:13px;text-align: center;">S</th>
+ <th style="width:13px;text-align: center;"><bean:message key="labels.sun"/></th>
+ <th style="width:13px;text-align: center;"><bean:message key="labels.mon"/></th>
+ <th style="width:13px;text-align: center;"><bean:message key="labels.tue"/></th>
+ <th style="width:13px;text-align: center;"><bean:message key="labels.wed"/></th>
+ <th style="width:13px;text-align: center;"><bean:message key="labels.thu"/></th>
+ <th style="width:13px;text-align: center;"><bean:message key="labels.fri"/></th>
+ <th style="width:13px;text-align: center;"><bean:message key="labels.sat"/></th>
</tr>
</thead>
<tbody>
@@ -63,13 +63,13 @@
<table>
<thead>
<tr>
- <th style="width:50px;text-align: center;">Time</th>
- <th style="width:550px;text-align: center;" colspan="${maxCols}">Events</th>
+ <th style="width:50px;text-align: center;"><bean:message key="labels.time"/></th>
+ <th style="width:550px;text-align: center;" colspan="${maxCols}"><bean:message key="labels.events"/></th>
</tr>
</thead>
<tbody>
<tr>
- <th>All Day</th>
+ <th><bean:message key="labels.all_day"/></th>
<td colspan="${maxCols}">
<ul style="margin:0;padding:0;">
<c:forEach var="event" varStatus="s" items="${allDayEventInDayItems}">
Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/calendar/personalmonth.jsp
===================================================================
--- scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/calendar/personalmonth.jsp 2008-11-25 13:45:04 UTC (rev 1446)
+++ scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/calendar/personalmonth.jsp 2008-11-26 08:53:03 UTC (rev 1447)
@@ -10,13 +10,13 @@
<div class="tab-nav">
<ul>
<li class="first"></li>
- <li class="selectable"><s:link href="selectpersonalday/${year}/${month}/${date}" style="text-decoration: none;">Day</s:link></li>
+ <li class="selectable"><s:link href="selectpersonalday/${year}/${month}/${date}" style="text-decoration: none;"><bean:message key="labels.day"/></s:link></li>
<li class="spacer"></li>
- <li class="selectable"><s:link href="selectpersonalweek/${year}/${month}/${date}" style="text-decoration: none;">Week</s:link></li>
+ <li class="selectable"><s:link href="selectpersonalweek/${year}/${month}/${date}" style="text-decoration: none;"><bean:message key="labels.week"/></s:link></li>
<li class="spacer"></li>
- <li class="selected"><span>Month</span></li>
+ <li class="selected"><span><bean:message key="labels.month"/></span></li>
<li class="spacer"></li>
- <li class="selectable"><s:link href="selectgroupweek/${year}/${month}/${date}" style="text-decoration: none;">Group(Week)</s:link></li>
+ <li class="selectable"><s:link href="selectgroupweek/${year}/${month}/${date}" style="text-decoration: none;"><bean:message key="labels.group_week"/></s:link></li>
<li class="last"></li>
</ul>
</div>
@@ -30,20 +30,20 @@
</div>
<div style="margin:5px 0 2px 0;text-align: center;">
<s:link href="movepersonalmonthprevmonth/${year}/${month}/${date}"><</s:link>
-<s:link href="movepersonalmonththismonth">Today</s:link>
+<s:link href="movepersonalmonththismonth"><bean:message key="labels.today"/></s:link>
<s:link href="movepersonalmonthnextmonth/${year}/${month}/${date}">></s:link>
</div>
<table>
<caption>${year}/${month}<!-- TODO i18n --></caption>
<thead>
<tr>
- <th style="width:13px;text-align: center;">S</th>
- <th style="width:13px;text-align: center;">M</th>
- <th style="width:13px;text-align: center;">T</th>
- <th style="width:13px;text-align: center;">W</th>
- <th style="width:13px;text-align: center;">T</th>
- <th style="width:13px;text-align: center;">F</th>
- <th style="width:13px;text-align: center;">S</th>
+ <th style="width:13px;text-align: center;"><bean:message key="labels.sun"/></th>
+ <th style="width:13px;text-align: center;"><bean:message key="labels.mon"/></th>
+ <th style="width:13px;text-align: center;"><bean:message key="labels.tue"/></th>
+ <th style="width:13px;text-align: center;"><bean:message key="labels.wed"/></th>
+ <th style="width:13px;text-align: center;"><bean:message key="labels.thu"/></th>
+ <th style="width:13px;text-align: center;"><bean:message key="labels.fri"/></th>
+ <th style="width:13px;text-align: center;"><bean:message key="labels.sat"/></th>
</tr>
</thead>
<tbody>
@@ -62,13 +62,13 @@
<div class="list-table" style="margin-top:3px;margin-left:10px;float:left;">
<table>
<thead>
- <th style="width:80px;text-align: center;">Sun</th>
- <th style="width:80px;text-align: center;">Mon</th>
- <th style="width:80px;text-align: center;">Tue</th>
- <th style="width:80px;text-align: center;">Wed</th>
- <th style="width:80px;text-align: center;">Thu</th>
- <th style="width:80px;text-align: center;">Fri</th>
- <th style="width:80px;text-align: center;">Sat</th>
+ <th style="width:80px;text-align: center;"><bean:message key="labels.sun2"/></th>
+ <th style="width:80px;text-align: center;"><bean:message key="labels.mon2"/></th>
+ <th style="width:80px;text-align: center;"><bean:message key="labels.tue2"/></th>
+ <th style="width:80px;text-align: center;"><bean:message key="labels.wed2"/></th>
+ <th style="width:80px;text-align: center;"><bean:message key="labels.thu2"/></th>
+ <th style="width:80px;text-align: center;"><bean:message key="labels.fri2"/></th>
+ <th style="width:80px;text-align: center;"><bean:message key="labels.sat2"/></th>
</thead>
<tbody>
<tr>
Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/calendar/personalweek.jsp
===================================================================
--- scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/calendar/personalweek.jsp 2008-11-25 13:45:04 UTC (rev 1446)
+++ scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/calendar/personalweek.jsp 2008-11-26 08:53:03 UTC (rev 1447)
@@ -10,13 +10,13 @@
<div class="tab-nav">
<ul>
<li class="first"></li>
- <li class="selectable"><s:link href="selectpersonalday/${year}/${month}/${date}" style="text-decoration: none;">Day</s:link></li>
+ <li class="selectable"><s:link href="selectpersonalday/${year}/${month}/${date}" style="text-decoration: none;"><bean:message key="labels.day"/></s:link></li>
<li class="spacer"></li>
- <li class="selected"><span>Week</span></li>
+ <li class="selected"><span><bean:message key="labels.week"/></span></li>
<li class="spacer"></li>
- <li class="selectable"><s:link href="selectpersonalmonth/${year}/${month}/${date}" style="text-decoration: none;">Month</s:link></li>
+ <li class="selectable"><s:link href="selectpersonalmonth/${year}/${month}/${date}" style="text-decoration: none;"><bean:message key="labels.month"/></s:link></li>
<li class="spacer"></li>
- <li class="selectable"><s:link href="selectgroupweek/${year}/${month}/${date}" style="text-decoration: none;">Group(Week)</s:link></li>
+ <li class="selectable"><s:link href="selectgroupweek/${year}/${month}/${date}" style="text-decoration: none;"><bean:message key="labels.group_week"/></s:link></li>
<li class="last"></li>
</ul>
</div>
@@ -30,20 +30,20 @@
</div>
<div style="margin:5px 0 2px 0;text-align: center;">
<s:link href="movepersonalweekprevmonth/${year}/${month}/${date}"><</s:link>
-<s:link href="movepersonalweekthismonth">Today</s:link>
+<s:link href="movepersonalweekthismonth"><bean:message key="labels.today"/></s:link>
<s:link href="movepersonalweeknextmonth/${year}/${month}/${date}">></s:link>
</div>
<table>
<caption>${year}/${month}<!-- TODO i18n --></caption>
<thead>
<tr>
- <th style="width:13px;text-align: center;">S</th>
- <th style="width:13px;text-align: center;">M</th>
- <th style="width:13px;text-align: center;">T</th>
- <th style="width:13px;text-align: center;">W</th>
- <th style="width:13px;text-align: center;">T</th>
- <th style="width:13px;text-align: center;">F</th>
- <th style="width:13px;text-align: center;">S</th>
+ <th style="width:13px;text-align: center;"><bean:message key="labels.sun"/></th>
+ <th style="width:13px;text-align: center;"><bean:message key="labels.mon"/></th>
+ <th style="width:13px;text-align: center;"><bean:message key="labels.tue"/></th>
+ <th style="width:13px;text-align: center;"><bean:message key="labels.wed"/></th>
+ <th style="width:13px;text-align: center;"><bean:message key="labels.thu"/></th>
+ <th style="width:13px;text-align: center;"><bean:message key="labels.fri"/></th>
+ <th style="width:13px;text-align: center;"><bean:message key="labels.sat"/></th>
</tr>
</thead>
<tbody>
@@ -63,7 +63,7 @@
<table>
<thead>
<tr>
- <th style="width:50px;text-align: center;">Time</th>
+ <th style="width:50px;text-align: center;"><bean:message key="labels.time"/></th>
<c:forEach var="day" varStatus="s" items="${weekDayItems}">
<th style="width:70px;text-align: center;font-size:xx-small;">${day.displayedDate}</th>
</c:forEach>
@@ -71,7 +71,7 @@
</thead>
<tbody>
<tr>
- <th>All Day</th>
+ <th><bean:message key="labels.all_day"/></th>
<c:forEach var="allDayEventInDayItems" varStatus="s" items="${allDayEventInWeekItems}">
<td>
<ul style="margin:0;padding:0;">
@@ -86,7 +86,7 @@
</c:forEach>
</tr>
<tr>
- <th style="height: 300px;">Events</th>
+ <th style="height: 300px;"><bean:message key="labels.events"/></th>
<c:forEach var="eventInDayItems" varStatus="s" items="${eventInWeekItems}">
<td style="vertical-align: top;">
<ul style="margin:0;padding:0;">
Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/onetimeSchedule/confirm.jsp
===================================================================
--- scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/onetimeSchedule/confirm.jsp 2008-11-25 13:45:04 UTC (rev 1446)
+++ scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/onetimeSchedule/confirm.jsp 2008-11-26 08:53:03 UTC (rev 1447)
@@ -10,12 +10,12 @@
<div class="tab-nav">
<ul>
<li class="first"></li>
- <li class="selectable"><s:link href="/user/schedule/calendar/${returnType}/${year}/${month}/${date}" style="text-decoration: none;">Calendar</s:link></li>
+ <li class="selectable"><s:link href="/user/schedule/calendar/${returnType}/${year}/${month}/${date}" style="text-decoration: none;"><bean:message key="labels.calendar"/></s:link></li>
<li class="spacer"></li>
- <li class="selected"><span>One time</span></li>
+ <li class="selected"><span><bean:message key="labels.one_time"/></span></li>
<c:if test="${mode==1}">
<li class="spacer"></li>
- <li class="selectable"><s:link href="/user/schedule/repeatSchedule/createpage/selectpersonalmonth/${year}/${month}/${date}" style="text-decoration: none;">Repeats</s:link></li>
+ <li class="selectable"><s:link href="/user/schedule/repeatSchedule/createpage/selectpersonalmonth/${year}/${month}/${date}" style="text-decoration: none;"><bean:message key="labels.repeats"/></s:link></li>
</c:if>
<li class="last"></li>
</ul>
@@ -36,47 +36,47 @@
<caption><bean:message key="labels.confirmation_of_event"/></caption>
<tbody>
<tr>
- <th style="width: 120px;">What</th>
+ <th style="width: 120px;"><bean:message key="labels.what"/></th>
<td>${f:h(title)}<html:hidden property="title"/></td>
</tr>
<tr>
- <th>Where</th>
+ <th><bean:message key="labels.where"/></th>
<td>${f:h(location)}<html:hidden property="location"/></td>
</tr>
<tr>
- <th rowspan="2">When</th>
+ <th rowspan="2"><bean:message key="labels.when"/></th>
<td>
-From:
+<bean:message key="labels.from"/>
${f:h(startDate)}<html:hidden property="startDate"/>
${f:h(startTime)}<html:hidden property="startTime"/>
</td>
</tr>
<tr>
<td>
-To:
+<bean:message key="labels.to"/>
${f:h(endDate)}<html:hidden property="endDate"/>
${f:h(endTime)}<html:hidden property="endTime"/>
</td>
</tr>
<tr>
- <th>Description</th>
+ <th><bean:message key="labels.description"/></th>
<td>${f:br(f:h(content))}<html:hidden property="content"/></td>
</tr>
<tr>
- <th>Privacy</th>
+ <th><bean:message key="labels.privacy"/></th>
<td>
-<c:if test="${secret=='F'}">Public</c:if>
-<c:if test="${secret=='T'}">Private</c:if>
+<c:if test="${secret=='F'}"><bean:message key="labels.public"/></c:if>
+<c:if test="${secret=='T'}"><bean:message key="labels.private"/></c:if>
<html:hidden property="secret"/>
</td>
</tr>
<tr>
- <th>Assigned</th>
+ <th><bean:message key="labels.assigned"/></th>
<td>
<table>
<tbody>
<tr>
- <th style="width:200px;">Name</th>
+ <th style="width:200px;"><bean:message key="labels.name"/></th>
</tr>
<c:forEach var="u" varStatus="s" items="${selectedUserItems}">
<tr>
@@ -93,12 +93,12 @@
</td>
</tr>
<tr>
- <th>Facilities</th>
+ <th><bean:message key="labels.facilities"/></th>
<td>
<table>
<tbody>
<tr>
- <th style="width:200px;">Name</th>
+ <th style="width:200px;"><bean:message key="labels.name"/></th>
</tr>
<c:forEach var="f" varStatus="s" items="${selectedFacilityItems}">
<tr>
Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/onetimeSchedule/edit.jsp
===================================================================
--- scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/onetimeSchedule/edit.jsp 2008-11-25 13:45:04 UTC (rev 1446)
+++ scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/onetimeSchedule/edit.jsp 2008-11-26 08:53:03 UTC (rev 1447)
@@ -10,12 +10,12 @@
<div class="tab-nav">
<ul>
<li class="first"></li>
- <li class="selectable"><s:link href="/user/schedule/calendar/${returnType}/${year}/${month}/${date}" style="text-decoration: none;">Calendar</s:link></li>
+ <li class="selectable"><s:link href="/user/schedule/calendar/${returnType}/${year}/${month}/${date}" style="text-decoration: none;"><bean:message key="labels.calendar"/></s:link></li>
<li class="spacer"></li>
- <li class="selected"><span>One time</span></li>
+ <li class="selected"><span><bean:message key="labels.one_time"/></span></li>
<c:if test="${mode==1}">
<li class="spacer"></li>
- <li class="selectable"><s:link href="/user/schedule/repeatSchedule/createpage/selectpersonalmonth/${year}/${month}/${date}" style="text-decoration: none;">Repeats</s:link></li>
+ <li class="selectable"><s:link href="/user/schedule/repeatSchedule/createpage/selectpersonalmonth/${year}/${month}/${date}" style="text-decoration: none;"><bean:message key="labels.repeats"/></s:link></li>
</c:if>
<li class="last"></li>
</ul>
@@ -36,20 +36,20 @@
<caption><bean:message key="labels.event_detail"/></caption>
<tbody>
<tr>
- <th style="width: 120px;">What</th>
+ <th style="width: 120px;"><bean:message key="labels.what"/></th>
<td><html:text property="title" size="20"/></td>
</tr>
<tr>
- <th>Where</th>
+ <th><bean:message key="labels.where"/></th>
<td><html:text property="location" size="20"/></td>
</tr>
<tr>
- <th>When</th>
+ <th><bean:message key="labels.when"/></th>
<td>
<table>
<tbody>
<tr>
- <th>From</th>
+ <th><bean:message key="labels.from2"/></th>
<td style="text-align: center;">
<html:select property="startDateY">
<c:forEach var="v" varStatus="s" items="${yearItems}">
@@ -85,7 +85,7 @@
</td>
</tr>
<tr>
- <th>To</th>
+ <th><bean:message key="labels.to2"/></th>
<td style="text-align: center;">
<html:select property="endDateY">
<c:forEach var="v" varStatus="s" items="${yearItems}">
@@ -125,25 +125,25 @@
</td>
</tr>
<tr>
- <th>Description</th>
+ <th><bean:message key="labels.description"/></th>
<td><html:textarea property="content" cols="20" rows="5"/></td>
</tr>
<tr>
- <th>Privacy</th>
+ <th><bean:message key="labels.privacy"/></th>
<td>
<html:select property="secret">
- <html:option value="F">Public</html:option>
- <html:option value="T">Private</html:option>
+ <html:option value="F"><bean:message key="labels.public"/></html:option>
+ <html:option value="T"><bean:message key="labels.private"/></html:option>
</html:select>
</td>
</tr>
<tr>
- <th>Assigned</th>
+ <th><bean:message key="labels.assigned"/></th>
<td>
<table>
<tbody>
<tr>
- <th style="width:200px;">Name</th>
+ <th style="width:200px;"><bean:message key="labels.name"/></th>
</tr>
<c:forEach var="u" varStatus="s" items="${selectedUserItems}">
<tr>
@@ -154,7 +154,7 @@
<tfoot>
<tr>
<td>
-<input type="submit" name="selectusers" value="Select Users"/>
+<input type="submit" name="selectusers" value="<bean:message key="labels.select_users"/>"/>
</td>
</tr>
</tfoot>
@@ -167,12 +167,12 @@
</td>
</tr>
<tr>
- <th>Facilities</th>
+ <th><bean:message key="labels.facilities"/></th>
<td>
<table>
<tbody>
<tr>
- <th style="width:200px;">Name</th>
+ <th style="width:200px;"><bean:message key="labels.name"/></th>
</tr>
<c:forEach var="f" varStatus="s" items="${selectedFacilityItems}">
<tr>
@@ -183,7 +183,7 @@
<tfoot>
<tr>
<td>
-<input type="submit" name="selectfacilities" value="Select Facilities"/>
+<input type="submit" name="selectfacilities" value="<bean:message key="labels.select_facilities"/>"/>
</td>
</tr>
</tfoot>
Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/onetimeSchedule/error.jsp
===================================================================
--- scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/onetimeSchedule/error.jsp 2008-11-25 13:45:04 UTC (rev 1446)
+++ scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/onetimeSchedule/error.jsp 2008-11-26 08:53:03 UTC (rev 1447)
@@ -9,12 +9,12 @@
<div class="tab-nav">
<ul>
<li class="first"></li>
- <li class="selectable"><s:link href="/user/schedule/calendar/${returnType}/${year}/${month}/${date}" style="text-decoration: none;">Calendar</s:link></li>
+ <li class="selectable"><s:link href="/user/schedule/calendar/${returnType}/${year}/${month}/${date}" style="text-decoration: none;"><bean:message key="labels.calendar"/></s:link></li>
<li class="spacer"></li>
- <li class="selected"><span>One time</span></li>
+ <li class="selected"><span><bean:message key="labels.one_time"/></span></li>
<c:if test="${mode==1}">
<li class="spacer"></li>
- <li class="selectable"><s:link href="/user/schedule/repeatSchedule/createpage/selectpersonalmonth/${year}/${month}/${date}" style="text-decoration: none;">Repeats</s:link></li>
+ <li class="selectable"><s:link href="/user/schedule/repeatSchedule/createpage/selectpersonalmonth/${year}/${month}/${date}" style="text-decoration: none;"><bean:message key="labels.repeats"/></s:link></li>
</c:if>
<li class="last"></li>
</ul>
Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/onetimeSchedule/facilitylist.jsp
===================================================================
--- scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/onetimeSchedule/facilitylist.jsp 2008-11-25 13:45:04 UTC (rev 1446)
+++ scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/onetimeSchedule/facilitylist.jsp 2008-11-26 08:53:03 UTC (rev 1447)
@@ -10,12 +10,12 @@
<div class="tab-nav">
<ul>
<li class="first"></li>
- <li class="selectable"><s:link href="/facility/schedule/calendar/${returnType}/${year}/${month}/${date}" style="text-decoration: none;">Calendar</s:link></li>
+ <li class="selectable"><s:link href="/facility/schedule/calendar/${returnType}/${year}/${month}/${date}" style="text-decoration: none;"><bean:message key="labels.calendar"/></s:link></li>
<li class="spacer"></li>
- <li class="selected"><span>One time</span></li>
+ <li class="selected"><span><bean:message key="labels.one_time"/></span></li>
<c:if test="${mode==1}">
<li class="spacer"></li>
- <li class="selectable"><s:link href="/facility/schedule/repeatSchedule/createpage/selectpersonalmonth/${year}/${month}/${date}" style="text-decoration: none;">Repeats</s:link></li>
+ <li class="selectable"><s:link href="/facility/schedule/repeatSchedule/createpage/selectpersonalmonth/${year}/${month}/${date}" style="text-decoration: none;"><bean:message key="labels.repeats"/></s:link></li>
</c:if>
<li class="last"></li>
</ul>
@@ -49,7 +49,7 @@
<table style="margin-bottom: 5px;">
<thead>
<tr>
- <th>Facility Group</th>
+ <th><bean:message key="labels.facility_group"/></th>
</tr>
</thead>
<tbody>
@@ -64,7 +64,7 @@
</tr>
<tr>
<td style="text-align: center;">
-<input type="submit" name="changefacilitygroup" value="Display"/>
+<input type="submit" name="changefacilitygroup" value="<bean:message key="labels.display"/>"/>
</td>
</tr>
</tbody>
@@ -72,7 +72,7 @@
<table>
<thead>
<tr>
- <th>Facility List</th>
+ <th><bean:message key="labels.facility_list"/></th>
</tr>
</thead>
<tbody>
@@ -89,14 +89,14 @@
</table>
</div>
<div style="float:left;width: 100px;text-align: center;padding-top:100px;">
-<input type="submit" name="addfacilities" value="Add >>"/>
-<input type="submit" name="removefacilities" value="<< Remove"/>
+<input type="submit" name="addfacilities" value="<bean:message key="labels.add"/> >>"/>
+<input type="submit" name="removefacilities" value="<< <bean:message key="labels.remove"/>"/>
</div>
<div class="form-table" style="float:left;width: 200px;">
<table>
<thead>
<tr>
- <th>Selected Facility List</th>
+ <th><bean:message key="labels.selected_facility_list"/></th>
</tr>
</thead>
<tbody>
@@ -119,7 +119,7 @@
<tfoot>
<tr>
<td>
-<input type="submit" name="setfacilities" value="OK"/>
+<input type="submit" name="setfacilities" value="<bean:message key="labels.ok"/>"/>
</td>
</tr>
</tfoot>
Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/onetimeSchedule/userlist.jsp
===================================================================
--- scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/onetimeSchedule/userlist.jsp 2008-11-25 13:45:04 UTC (rev 1446)
+++ scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/onetimeSchedule/userlist.jsp 2008-11-26 08:53:03 UTC (rev 1447)
@@ -10,12 +10,12 @@
<div class="tab-nav">
<ul>
<li class="first"></li>
- <li class="selectable"><s:link href="/user/schedule/calendar/${returnType}/${year}/${month}/${date}" style="text-decoration: none;">Calendar</s:link></li>
+ <li class="selectable"><s:link href="/user/schedule/calendar/${returnType}/${year}/${month}/${date}" style="text-decoration: none;"><bean:message key="labels.calendar"/></s:link></li>
<li class="spacer"></li>
- <li class="selected"><span>One time</span></li>
+ <li class="selected"><span><bean:message key="labels.one_time"/></span></li>
<c:if test="${mode==1}">
<li class="spacer"></li>
- <li class="selectable"><s:link href="/user/schedule/repeatSchedule/createpage/selectpersonalmonth/${year}/${month}/${date}" style="text-decoration: none;">Repeats</s:link></li>
+ <li class="selectable"><s:link href="/user/schedule/repeatSchedule/createpage/selectpersonalmonth/${year}/${month}/${date}" style="text-decoration: none;"><bean:message key="labels.repeats"/></s:link></li>
</c:if>
<li class="last"></li>
</ul>
@@ -64,7 +64,7 @@
</tr>
<tr>
<td style="text-align: center;">
-<input type="submit" name="changeusergroup" value="Display"/>
+<input type="submit" name="changeusergroup" value="<bean:message key="labels.display"/>"/>
</td>
</tr>
</tbody>
@@ -72,7 +72,7 @@
<table>
<thead>
<tr>
- <th>User List</th>
+ <th><bean:message key="labels.user_list"/></th>
</tr>
</thead>
<tbody>
@@ -96,7 +96,7 @@
<table>
<thead>
<tr>
- <th>Selected User List</th>
+ <th><bean:message key="labels.selected_user_list"/></th>
</tr>
</thead>
<tbody>
@@ -119,7 +119,7 @@
<tfoot>
<tr>
<td>
-<input type="submit" name="setusers" value="OK"/>
+<input type="submit" name="setusers" value="<bean:message key="labels.ok"/>"/>
</td>
</tr>
</tfoot>
Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/repeatSchedule/confirm.jsp
===================================================================
--- scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/repeatSchedule/confirm.jsp 2008-11-25 13:45:04 UTC (rev 1446)
+++ scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/repeatSchedule/confirm.jsp 2008-11-26 08:53:03 UTC (rev 1447)
@@ -10,13 +10,13 @@
<div class="tab-nav">
<ul>
<li class="first"></li>
- <li class="selectable"><s:link href="/user/schedule/calendar/${returnType}/${year}/${month}/${date}" style="text-decoration: none;">Calendar</s:link></li>
+ <li class="selectable"><s:link href="/user/schedule/calendar/${returnType}/${year}/${month}/${date}" style="text-decoration: none;"><bean:message key="labels.calendar"/></s:link></li>
<c:if test="${mode==1}">
<li class="spacer"></li>
- <li class="selectable"><s:link href="/user/schedule/onetimeSchedule/createpage/${returnType}/${year}/${month}/${date}" style="text-decoration: none;">One Time</s:link></li>
+ <li class="selectable"><s:link href="/user/schedule/onetimeSchedule/createpage/${returnType}/${year}/${month}/${date}" style="text-decoration: none;"><bean:message key="labels.one_time"/></s:link></li>
</c:if>
<li class="spacer"></li>
- <li class="selected"><span>Repeats</span></li>
+ <li class="selected"><span><bean:message key="labels.repeats"/></span></li>
<li class="last"></li>
</ul>
</div>
@@ -36,60 +36,60 @@
<caption><bean:message key="labels.confirmation_of_event"/></caption>
<tbody>
<tr>
- <th style="width: 120px;">What</th>
+ <th style="width: 120px;"><bean:message key="labels.what"/></th>
<td>${f:h(title)}<html:hidden property="title"/></td>
</tr>
<tr>
- <th>Where</th>
+ <th><bean:message key="labels.where"/></th>
<td>${f:h(location)}<html:hidden property="location"/></td>
</tr>
<tr>
- <th>Repeats</th>
+ <th><bean:message key="labels.repeats"/></th>
<td>
-<c:if test="${type=='MTWTFSS'}">Daily</c:if>
-<c:if test="${type=='MTWTF'}">Every weekday (Mon-Fri)</c:if>
-<c:if test="${type=='MWF'}">Every Mon., Wed., and Fri.</c:if>
-<c:if test="${type=='TT'}">Every Tues., and Thurs.</c:if>
-<c:if test="${type=='WEEKLY'}">Weekly</c:if>
-<c:if test="${type=='MONTHLY'}">Monthly</c:if>
-<c:if test="${type=='YEARLY'}">Yearly</c:if>
+<c:if test="${type=='MTWTFSS'}"><bean:message key="labels.mtwtfss"/></c:if>
+<c:if test="${type=='MTWTF'}"><bean:message key="labels.mtwtf"/></c:if>
+<c:if test="${type=='MWF'}"><bean:message key="labels.mwf"/></c:if>
+<c:if test="${type=='TT'}"><bean:message key="labels.tt"/></c:if>
+<c:if test="${type=='WEEKLY'}"><bean:message key="labels.weekly"/></c:if>
+<c:if test="${type=='MONTHLY'}"><bean:message key="labels.monthly"/></c:if>
+<c:if test="${type=='YEARLY'}"><bean:message key="labels.yearly"/></c:if>
<html:hidden property="type"/>
</td>
</tr>
<tr>
- <th rowspan="2">When</th>
+ <th rowspan="2"><bean:message key="labels.when"/></th>
<td>
-From:
+<bean:message key="labels.from"/>
${f:h(startDate)}<html:hidden property="startDate"/>
${f:h(startTime)}<html:hidden property="startTime"/>
</td>
</tr>
<tr>
<td>
-To:
+<bean:message key="labels.to"/>
${f:h(endDate)}<html:hidden property="endDate"/>
${f:h(endTime)}<html:hidden property="endTime"/>
</td>
</tr>
<tr>
- <th>Description</th>
+ <th><bean:message key="labels.description"/></th>
<td>${f:br(f:h(content))}<html:hidden property="content"/></td>
</tr>
<tr>
- <th>Privacy</th>
+ <th><bean:message key="labels.privacy"/></th>
<td>
-<c:if test="${secret=='F'}">Public</c:if>
-<c:if test="${secret=='T'}">Private</c:if>
+<c:if test="${secret=='F'}"><bean:message key="labels.public"/></c:if>
+<c:if test="${secret=='T'}"><bean:message key="labels.private"/></c:if>
<html:hidden property="secret"/>
</td>
</tr>
<tr>
- <th>Assigned</th>
+ <th><bean:message key="labels.assigned"/></th>
<td>
<table>
<tbody>
<tr>
- <th style="width:200px;">Name</th>
+ <th style="width:200px;"><bean:message key="labels.name"/></th>
</tr>
<c:forEach var="u" varStatus="s" items="${selectedUserItems}">
<tr>
@@ -106,12 +106,12 @@
</td>
</tr>
<tr>
- <th>Facilities</th>
+ <th><bean:message key="labels.facilities"/></th>
<td>
<table>
<tbody>
<tr>
- <th style="width:200px;">Name</th>
+ <th style="width:200px;"><bean:message key="labels.name"/></th>
</tr>
<c:forEach var="f" varStatus="s" items="${selectedFacilityItems}">
<tr>
Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/repeatSchedule/edit.jsp
===================================================================
--- scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/repeatSchedule/edit.jsp 2008-11-25 13:45:04 UTC (rev 1446)
+++ scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/repeatSchedule/edit.jsp 2008-11-26 08:53:03 UTC (rev 1447)
@@ -10,13 +10,13 @@
<div class="tab-nav">
<ul>
<li class="first"></li>
- <li class="selectable"><s:link href="/user/schedule/calendar/${returnType}/${year}/${month}/${date}" style="text-decoration: none;">Calendar</s:link></li>
+ <li class="selectable"><s:link href="/user/schedule/calendar/${returnType}/${year}/${month}/${date}" style="text-decoration: none;"><bean:message key="labels.calendar"/></s:link></li>
<c:if test="${mode==1}">
<li class="spacer"></li>
- <li class="selectable"><s:link href="/user/schedule/onetimeSchedule/createpage/${returnType}/${year}/${month}/${date}" style="text-decoration: none;">One Time</s:link></li>
+ <li class="selectable"><s:link href="/user/schedule/onetimeSchedule/createpage/${returnType}/${year}/${month}/${date}" style="text-decoration: none;"><bean:message key="labels.one_time"/></s:link></li>
</c:if>
<li class="spacer"></li>
- <li class="selected"><span>Repeats</span></li>
+ <li class="selected"><span><bean:message key="labels.repeats"/></span></li>
<li class="last"></li>
</ul>
</div>
@@ -36,34 +36,34 @@
<caption><bean:message key="labels.event_detail"/></caption>
<tbody>
<tr>
- <th style="width: 120px;">What</th>
+ <th style="width: 120px;"><bean:message key="labels.what"/></th>
<td><html:text property="title" size="20"/></td>
</tr>
<tr>
- <th>Where</th>
+ <th><bean:message key="labels.where"/></th>
<td><html:text property="location" size="20"/></td>
</tr>
<tr>
- <th>Repeats</th>
+ <th><bean:message key="labels.repeats"/></th>
<td>
<html:select property="type">
- <html:option value="MTWTFSS">Daily</html:option>
- <html:option value="MTWTF">Every weekday (Mon-Fri)</html:option>
- <html:option value="MWF">Every Mon., Wed., and Fri.</html:option>
- <html:option value="TT">Every Tues., and Thurs.</html:option>
- <html:option value="WEEKLY">Weekly</html:option>
- <html:option value="MONTHLY">Monthly</html:option>
- <html:option value="YEARLY">Yearly</html:option>
+ <html:option value="MTWTFSS"><bean:message key="labels.mtwtfss"/></html:option>
+ <html:option value="MTWTF"><bean:message key="labels.mtwtf"/></html:option>
+ <html:option value="MWF"><bean:message key="labels.mwf"/></html:option>
+ <html:option value="TT"><bean:message key="labels.tt"/></html:option>
+ <html:option value="WEEKLY"><bean:message key="labels.weekly"/></html:option>
+ <html:option value="MONTHLY"><bean:message key="labels.monthly"/></html:option>
+ <html:option value="YEARLY"><bean:message key="labels.yearly"/></html:option>
</html:select>
</td>
</tr>
<tr>
- <th>When</th>
+ <th><bean:message key="labels.when"/></th>
<td>
<table>
<tbody>
<tr>
- <th>From</th>
+ <th><bean:message key="labels.from2"/></th>
<td style="text-align: center;">
<html:select property="startDateY">
<c:forEach var="v" varStatus="s" items="${yearItems}">
@@ -99,7 +99,7 @@
</td>
</tr>
<tr>
- <th>To</th>
+ <th><bean:message key="labels.to2"/></th>
<td style="text-align: center;">
<html:select property="endDateY">
<option value="">----</option>
@@ -142,25 +142,25 @@
</td>
</tr>
<tr>
- <th>Description</th>
+ <th><bean:message key="labels.description"/></th>
<td><html:textarea property="content" cols="20" rows="5"/></td>
</tr>
<tr>
- <th>Privacy</th>
+ <th><bean:message key="labels.privacy"/></th>
<td>
<html:select property="secret">
- <html:option value="F">Public</html:option>
- <html:option value="T">Private</html:option>
+ <html:option value="F"><bean:message key="labels.public"/></html:option>
+ <html:option value="T"><bean:message key="labels.private"/></html:option>
</html:select>
</td>
</tr>
<tr>
- <th>Assigned</th>
+ <th><bean:message key="labels.assigned"/></th>
<td>
<table>
<tbody>
<tr>
- <th style="width:200px;">Name</th>
+ <th style="width:200px;"><bean:message key="labels.name"/></th>
</tr>
<c:forEach var="u" varStatus="s" items="${selectedUserItems}">
<tr>
@@ -171,7 +171,7 @@
<tfoot>
<tr>
<td>
-<input type="submit" name="selectusers" value="Select Users"/>
+<input type="submit" name="selectusers" value="<bean:message key="labels.select_users"/>"/>
</td>
</tr>
</tfoot>
@@ -184,12 +184,12 @@
</td>
</tr>
<tr>
- <th>Facilities</th>
+ <th><bean:message key="labels.facilities"/></th>
<td>
<table>
<tbody>
<tr>
- <th style="width:200px;">Name</th>
+ <th style="width:200px;"><bean:message key="labels.name"/></th>
</tr>
<c:forEach var="f" varStatus="s" items="${selectedFacilityItems}">
<tr>
@@ -200,7 +200,7 @@
<tfoot>
<tr>
<td>
-<input type="submit" name="selectfacilities" value="Select Facilities"/>
+<input type="submit" name="selectfacilities" value="<bean:message key="labels.select_facilities"/>"/>
</td>
</tr>
</tfoot>
Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/repeatSchedule/error.jsp
===================================================================
--- scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/repeatSchedule/error.jsp 2008-11-25 13:45:04 UTC (rev 1446)
+++ scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/repeatSchedule/error.jsp 2008-11-26 08:53:03 UTC (rev 1447)
@@ -9,13 +9,13 @@
<div class="tab-nav">
<ul>
<li class="first"></li>
- <li class="selectable"><s:link href="/user/schedule/calendar/${returnType}/${year}/${month}/${date}" style="text-decoration: none;">Calendar</s:link></li>
+ <li class="selectable"><s:link href="/user/schedule/calendar/${returnType}/${year}/${month}/${date}" style="text-decoration: none;"><bean:message key="labels.calendar"/></s:link></li>
<c:if test="${mode==1}">
<li class="spacer"></li>
- <li class="selectable"><s:link href="/user/schedule/onetimeSchedule/createpage/${returnType}/${year}/${month}/${date}" style="text-decoration: none;">One Time</s:link></li>
+ <li class="selectable"><s:link href="/user/schedule/onetimeSchedule/createpage/${returnType}/${year}/${month}/${date}" style="text-decoration: none;"><bean:message key="labels.one_time"/></s:link></li>
</c:if>
<li class="spacer"></li>
- <li class="selected"><span>Repeats</span></li>
+ <li class="selected"><span><bean:message key="labels.repeats"/></span></li>
<li class="last"></li>
</ul>
</div>
Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/repeatSchedule/facilitylist.jsp
===================================================================
--- scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/repeatSchedule/facilitylist.jsp 2008-11-25 13:45:04 UTC (rev 1446)
+++ scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/repeatSchedule/facilitylist.jsp 2008-11-26 08:53:03 UTC (rev 1447)
@@ -10,13 +10,13 @@
<div class="tab-nav">
<ul>
<li class="first"></li>
- <li class="selectable"><s:link href="/user/schedule/calendar/${returnType}/${year}/${month}/${date}" style="text-decoration: none;">Calendar</s:link></li>
+ <li class="selectable"><s:link href="/user/schedule/calendar/${returnType}/${year}/${month}/${date}" style="text-decoration: none;"><bean:message key="labels.calendar"/></s:link></li>
<c:if test="${mode==1}">
<li class="spacer"></li>
- <li class="selectable"><s:link href="/user/schedule/onetimeSchedule/createpage/${returnType}/${year}/${month}/${date}" style="text-decoration: none;">One Time</s:link></li>
+ <li class="selectable"><s:link href="/user/schedule/onetimeSchedule/createpage/${returnType}/${year}/${month}/${date}" style="text-decoration: none;"><bean:message key="labels.one_time"/></s:link></li>
</c:if>
<li class="spacer"></li>
- <li class="selected"><span>Repeats</span></li>
+ <li class="selected"><span><bean:message key="labels.repeats"/></span></li>
<li class="last"></li>
</ul>
</div>
@@ -49,7 +49,7 @@
<table style="margin-bottom: 5px;">
<thead>
<tr>
- <th>Facility Group</th>
+ <th><bean:message key="labels.facility_group"/></th>
</tr>
</thead>
<tbody>
@@ -64,7 +64,7 @@
</tr>
<tr>
<td style="text-align: center;">
-<input type="submit" name="changefacilitygroup" value="Display"/>
+<input type="submit" name="changefacilitygroup" value="<bean:message key="labels.display"/>"/>
</td>
</tr>
</tbody>
@@ -72,7 +72,7 @@
<table>
<thead>
<tr>
- <th>Facility List</th>
+ <th><bean:message key="labels.facility_list"/></th>
</tr>
</thead>
<tbody>
@@ -96,7 +96,7 @@
<table>
<thead>
<tr>
- <th>Selected Facility List</th>
+ <th><bean:message key="labels.selected_facility_list"/></th>
</tr>
</thead>
<tbody>
@@ -119,7 +119,7 @@
<tfoot>
<tr>
<td>
-<input type="submit" name="setfacilities" value="OK"/>
+<input type="submit" name="setfacilities" value="<bean:message key="labels.ok"/>"/>
</td>
</tr>
</tfoot>
Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/repeatSchedule/userlist.jsp
===================================================================
--- scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/repeatSchedule/userlist.jsp 2008-11-25 13:45:04 UTC (rev 1446)
+++ scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/repeatSchedule/userlist.jsp 2008-11-26 08:53:03 UTC (rev 1447)
@@ -10,13 +10,13 @@
<div class="tab-nav">
<ul>
<li class="first"></li>
- <li class="selectable"><s:link href="/user/schedule/calendar/${returnType}/${year}/${month}/${date}" style="text-decoration: none;">Calendar</s:link></li>
+ <li class="selectable"><s:link href="/user/schedule/calendar/${returnType}/${year}/${month}/${date}" style="text-decoration: none;"><bean:message key="labels.calendar"/></s:link></li>
<c:if test="${mode==1}">
<li class="spacer"></li>
- <li class="selectable"><s:link href="/user/schedule/onetimeSchedule/createpage/${returnType}/${year}/${month}/${date}" style="text-decoration: none;">One Time</s:link></li>
+ <li class="selectable"><s:link href="/user/schedule/onetimeSchedule/createpage/${returnType}/${year}/${month}/${date}" style="text-decoration: none;"><bean:message key="labels.one_time"/></s:link></li>
</c:if>
<li class="spacer"></li>
- <li class="selected"><span>Repeats</span></li>
+ <li class="selected"><span><bean:message key="labels.repeats"/></span></li>
<li class="last"></li>
</ul>
</div>
@@ -50,7 +50,7 @@
<table style="margin-bottom: 5px;">
<thead>
<tr>
- <th>User Group</th>
+ <th><bean:message key="labels.user_group"/></th>
</tr>
</thead>
<tbody>
@@ -65,7 +65,7 @@
</tr>
<tr>
<td style="text-align: center;">
-<input type="submit" name="changeusergroup" value="Display"/>
+<input type="submit" name="changeusergroup" value="<bean:message key="labels.display"/>"/>
</td>
</tr>
</tbody>
@@ -73,7 +73,7 @@
<table>
<thead>
<tr>
- <th>User List</th>
+ <th><bean:message key="labels.user_list"/></th>
</tr>
</thead>
<tbody>
@@ -90,14 +90,14 @@
</table>
</div>
<div style="float:left;width: 100px;text-align: center;padding-top:100px;">
-<input type="submit" name="addusers" value="Add >>"/>
-<input type="submit" name="removeusers" value="<< Remove"/>
+<input type="submit" name="addusers" value="<bean:message key="labels.add"/> >>"/>
+<input type="submit" name="removeusers" value="<< <bean:message key="labels.remove"/>"/>
</div>
<div class="form-table" style="float:left;width: 200px;">
<table>
<thead>
<tr>
- <th>Selected User List</th>
+ <th><bean:message key="labels.selected_user_list"/></th>
</tr>
</thead>
<tbody>
@@ -120,7 +120,7 @@
<tfoot>
<tr>
<td>
-<input type="submit" name="setusers" value="OK"/>
+<input type="submit" name="setusers" value="<bean:message key="labels.ok"/>"/>
</td>
</tr>
</tfoot>