diff --git a/app/views/property_hires/hire.html.erb b/app/views/property_hires/hire.html.erb
index 53589c6..4afb489 100644
--- a/app/views/property_hires/hire.html.erb
+++ b/app/views/property_hires/hire.html.erb
@@ -802,7 +802,7 @@ $(document).ready(function(){
     $("#p_hire_end_time").datepicker('option', 'minDate', new Date("<%= property.p_open_start_time.strftime("%Y-%m-%d") %>"));
     $("#p_hire_recurring_end_date").datepicker('option', 'minDate', new Date("<%= property.p_open_start_time.strftime("%Y-%m-%d") %>"));
   <% end %>
-  <% if property.p_open_end_time %>
+  <% if property.p_hire_end_time && property.p_open_end_time %>
     $("#p_hire_start_time").datepicker('option', 'maxDate', new Date("<%= property.p_open_end_time.strftime("%Y-%m-%d") %>"));
     $("#p_hire_end_time").datepicker('option', 'maxDate', new Date("<%= property.p_open_end_time.strftime("%Y-%m-%d") %>"));
     $("#p_hire_recurring_end_date").datepicker('option', 'maxDate', new Date("<%= property.p_open_end_time.strftime("%Y-%m-%d") %>"));
diff --git a/config/locales/en.yml b/config/locales/en.yml
index a62c4fa..bc69776 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -15,8 +15,9 @@ en:
     the_reservation_was_successfully_sent: "The reservation was successfully sent!Please see email to get more information"
     go_to_infos_page: Go to infos page
     display_in_reason_for_hire: "Display in reason for hire"
-    need_hire_before: "How late does the user need to hire?"
+    need_hire_before: "How late does the user need to reserve?"
     _month: Month
+    _week: Week
     _day: Day
     _hour: Hour
     _minute: Minute
@@ -111,7 +112,7 @@ en:
         week: Week
     recurring_end_date: Recurring End Date
     save: Save
-    property_hire: Property Reservation
+    property_hire: Reservation
     my_bookings: My Bookings
     settings: Settings
     auto_approve: Auto approve
@@ -186,4 +187,10 @@ en:
     owner_email_rules:
       '0': 'Only Owners'
       '1': 'Only Owner Email'
-      '2': 'Owners and Owner Email'
\ No newline at end of file
+      '2': 'Owners and Owner Email'
+    p_display_start_time: Display in front-page
+    p_display_end_time: Remove from front-page
+    hours_restriction: Limit reservation hours for single user
+    hours_restriction_message: "This property can only be hired for %{no_of_hours} hours every %{duration}"
+    time_period_note: Time period user can use reservation service
+    available_time_note: Available time period
diff --git a/config/locales/zh_tw.yml b/config/locales/zh_tw.yml
index 8d8b2d6..30f2a42 100644
--- a/config/locales/zh_tw.yml
+++ b/config/locales/zh_tw.yml
@@ -15,8 +15,9 @@ zh_tw:
     the_reservation_was_successfully_sent: "預約成功送出，請查看Email確認預約資訊!"
     go_to_infos_page: 前往資訊頁面
     display_in_reason_for_hire: "顯示於使用用途"
-    need_hire_before: "需提早多久借用"
+    need_hire_before: "需提早多久預約"
     _month: 個月
+    _week: 週
     _day: 天
     _hour: 個小時
     _minute: 分鐘
@@ -137,7 +138,7 @@ zh_tw:
     save: Save
     my_bookings: My Bookings
     settings: 設定
-    property_hire: 場地設備預約
+    property_hire: 預約
     manage_locations: Manage Locations
     location: 位置
     auto_approve: Auto approve
@@ -165,10 +166,10 @@ zh_tw:
     weekdays: 每週不開放預約日
     start_date: 套用限制開始日期
     end_date: 套用限制結束日期
-    p_hire_start_time: 上架日期
-    p_hire_end_time: 下架日期
+    p_hire_start_time: 開始日期
+    p_hire_end_time: 截止日期
     p_open_start_time: 開放日期
-    p_open_end_time: 截止日期
+    p_open_end_time: 結束日期
     description: Unavailability Description
     unavailibility_note: Unavailability Note
     property_location: Property Location
@@ -208,4 +209,10 @@ zh_tw:
     owner_email_rules:
       '0': '僅管理人'
       '1': '僅管理人Email'
-      '2': '管理人+管理人Email'
\ No newline at end of file
+      '2': '管理人+管理人Email'
+    p_display_start_time: 呈現於網頁前台
+    p_display_end_time: 於網頁前台下架
+    hours_restriction: 限制單一使用者預約時數
+    hours_restriction_message: "每 %{duration}限制僅能預約 %{no_of_hours}"
+    time_period_note: 使用者可以進行預約
+    available_time_note: 可供預約的日期區間