diff --git a/admin/themes/default/template/controllers/access/helpers/form/form.tpl b/admin/themes/default/template/controllers/access/helpers/form/form.tpl index d3f2a73f8..6d07fe6ee 100644 --- a/admin/themes/default/template/controllers/access/helpers/form/form.tpl +++ b/admin/themes/default/template/controllers/access/helpers/form/form.tpl @@ -261,11 +261,11 @@
{if isset($hotels) && $hotels}
-

{l s='Hotel Permissions'}

+

{l s='Property Permissions'}

- + - + diff --git a/controllers/admin/AdminImagesController.php b/controllers/admin/AdminImagesController.php index 9298fa147..68631940d 100644 --- a/controllers/admin/AdminImagesController.php +++ b/controllers/admin/AdminImagesController.php @@ -86,7 +86,7 @@ class AdminImagesControllerCore extends AdminController 'orderby' => false ), 'hotels' => array( - 'title' => $this->l('Hotels'), + 'title' => $this->l('Properties'), 'align' => 'center', 'type' => 'bool', 'active' => 'hotels', @@ -301,7 +301,7 @@ class AdminImagesControllerCore extends AdminController ), array( 'type' => 'switch', - 'label' => $this->l('Hotels'), + 'label' => $this->l('Properties'), 'name' => 'hotels', 'required' => false, 'is_bool' => true, @@ -503,7 +503,7 @@ class AdminImagesControllerCore extends AdminController $types = array( 'categories' => $this->l('Categories'), 'products' => $this->l('Room Types/Products'), - 'hotels' => $this->l('Hotels'), + 'hotels' => $this->l('Properties'), // 'manufacturers' => $this->l('Manufacturers'), // 'suppliers' => $this->l('Suppliers'), // 'scenes' => $this->l('Scenes'), diff --git a/controllers/admin/AdminImportController.php b/controllers/admin/AdminImportController.php index fec2fd096..7345f0afe 100644 --- a/controllers/admin/AdminImportController.php +++ b/controllers/admin/AdminImportController.php @@ -78,7 +78,7 @@ class AdminImportControllerCore extends AdminController { $this->bootstrap = true; $this->entities = array( - $this->l('Hotels'), + $this->l('Properties'), $this->l('Room Types'), $this->l('Stays'), $this->l('Categories'), @@ -108,7 +108,7 @@ class AdminImportControllerCore extends AdminController 'parent' => Configuration::get('PS_HOME_CATEGORY'), ); break; - case $this->entities[$this->l('Hotels')]: + case $this->entities[$this->l('Properties')]: $this->required_fields = array( 'hotel_name', 'phone', @@ -132,7 +132,7 @@ class AdminImportControllerCore extends AdminController 'no' => array('label' => $this->l('Ignore this column')), 'id' => array('label' => $this->l('ID')), 'active' => array('label' => $this->l('Active (0/1)')), - 'hotel_name' => array('label' => $this->l('Hotel Name *')), + 'hotel_name' => array('label' => $this->l('Property Name *')), 'short_description' => array('label' => $this->l('Short Description')), 'description' => array('label' => $this->l('Description')), 'phone' => array('label' => $this->l('Mobile phone *')), @@ -146,7 +146,7 @@ class AdminImportControllerCore extends AdminController 'city' => array('label' => $this->l('City *')), 'postcode' => array('label' => $this->l('Zip Code *')), 'fax' => array('label' => $this->l('Fax')), - 'policies' => array('label' => $this->l('Hotel Policies')), + 'policies' => array('label' => $this->l('Property Policies')), 'active_refund' => array('label' => $this->l('Allow Refund (0 = No, 1 = Yes)')), 'refund_ids' => array('label' => $this->l('Refund IDs (x,y,z...)')), 'max_checkout_offset' => array('label' => $this->l('Maximum checkout offset')), @@ -169,7 +169,7 @@ class AdminImportControllerCore extends AdminController 'id' => array('label' => $this->l('ID')), 'active' => array('label' => $this->l('Active (0/1)')), 'name' => array('label' => $this->l('Name *')), - 'id_hotel' => array('label' => $this->l('Hotel ID *')), + 'id_hotel' => array('label' => $this->l('Property ID *')), 'price' => array('label' => $this->l('Pre-tax retail price')), 'wholesale_price' => array('label' => $this->l('Pre-tax operating cost')), 'id_tax_rules_group' => array('label' => $this->l('Tax rule ID')), @@ -1479,8 +1479,8 @@ class AdminImportControllerCore extends AdminController } } } else { - $this->warnings[] = $this->l('Hotel creation for the ').$objCountry->name. - $this->l(' is currently unavailable. Kindly activate the country for hotel creation.'); + $this->warnings[] = $this->l('Property creation for the ').$objCountry->name. + $this->l(' is currently unavailable. Kindly activate the country for property creation.'); } } } @@ -3297,7 +3297,7 @@ class AdminImportControllerCore extends AdminController } } break; - case $this->entities[$this->l('Hotels')]: + case $this->entities[$this->l('Properties')]: Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'htl_branch_info_lang`'); Db::getInstance()->execute('DELETE c, cl FROM `'._DB_PREFIX_.'category` c LEFT JOIN `'._DB_PREFIX_.'category_lang` cl ON c.id_category = cl.id_category @@ -3494,7 +3494,7 @@ class AdminImportControllerCore extends AdminController $import_type = false; Db::getInstance()->disableCache(); switch ((int)Tools::getValue('entity')) { - case $this->entities[$import_type = $this->l('Hotels')]: + case $this->entities[$import_type = $this->l('Properties')]: $this->hotelImport(); $this->clearSmartyCache(); break; diff --git a/controllers/admin/AdminOrderPreferencesController.php b/controllers/admin/AdminOrderPreferencesController.php index d3000dea1..d16123ec9 100644 --- a/controllers/admin/AdminOrderPreferencesController.php +++ b/controllers/admin/AdminOrderPreferencesController.php @@ -330,7 +330,7 @@ class AdminOrderPreferencesControllerCore extends AdminController ), array( 'value' => Product::STANDARD_PRODUCT_ADDRESS_PREFERENCE_HOTEL, - 'name' => $this->l('Hotel Address') + 'name' => $this->l('Property Address') ), array( 'value' => Product::STANDARD_PRODUCT_ADDRESS_PREFERENCE_CUSTOM, @@ -374,8 +374,8 @@ class AdminOrderPreferencesControllerCore extends AdminController 'identifier' => 'value', 'js' => "changeStandardProductAddressType()", 'hint' => $this->l('Select address for standard product tax calculation, this will be used to calculate the tax for the standard product price.'), - 'desc' => $this->l('The selected address will be used to calculate tax for standard products. To change the hotel address, update the "Primary Hotel" in the'). - ' '.$this->l('Hotel General Configuration.').'' + 'desc' => $this->l('The selected address will be used to calculate tax for standard products. To change the property address, update the "Primary Property" in the'). + ' '.$this->l('Property General Configuration.').'' ), 'PS_STANDARD_PRODUCT_ORDER_ADDRESS' => array( 'title' => $this->l('Custom address for tax calculation'), diff --git a/mails/en/bookings_refund_request_detail_admin.tpl b/mails/en/bookings_refund_request_detail_admin.tpl index 15746d490..7c437554e 100644 --- a/mails/en/bookings_refund_request_detail_admin.tpl +++ b/mails/en/bookings_refund_request_detail_admin.tpl @@ -7,7 +7,7 @@ - + diff --git a/mails/en/bookings_refund_request_detail_customer.tpl b/mails/en/bookings_refund_request_detail_customer.tpl index 52a0fa435..6f6f70f03 100644 --- a/mails/en/bookings_refund_request_detail_customer.tpl +++ b/mails/en/bookings_refund_request_detail_customer.tpl @@ -6,7 +6,7 @@ - + diff --git a/mails/en/bookings_refund_request_detail_customer_text.tpl b/mails/en/bookings_refund_request_detail_customer_text.tpl index 6dd5f585e..0b81bbaea 100644 --- a/mails/en/bookings_refund_request_detail_customer_text.tpl +++ b/mails/en/bookings_refund_request_detail_customer_text.tpl @@ -5,7 +5,7 @@ {l s="Room Type"} -{l s="Hotel"} +{l s="Property Name"} {l s="Stays Qty"} diff --git a/mails/en/order_hotel_detail.tpl b/mails/en/order_hotel_detail.tpl index 97c314cca..7def2f0e4 100644 --- a/mails/en/order_hotel_detail.tpl +++ b/mails/en/order_hotel_detail.tpl @@ -1,12 +1,12 @@ {if isset($list['hotel_name']) && $list['hotel_name']}

- {l s='Hotel details'}: + {l s='Property details'}:

- {l s='Hotel Name'}: {$list['hotel_name']}
- {l s='Hotel Phone'}: {$list['hotel_phone']}
- {l s='Hotel Email'}: {$list['hotel_email']}
+ {l s='Property Name'}: {$list['hotel_name']}
+ {l s='Property Phone'}: {$list['hotel_phone']}
+ {l s='Property Email'}: {$list['hotel_email']}
{l s='Total Stays'}: {$list['num_rooms']}

 diff --git a/mails/en/order_hotel_detail_text.tpl b/mails/en/order_hotel_detail_text.tpl index b44866e10..7dc951483 100644 --- a/mails/en/order_hotel_detail_text.tpl +++ b/mails/en/order_hotel_detail_text.tpl @@ -1,9 +1,9 @@ {if isset($list['hotel_name']) && $list['hotel_name']} -{l s='Hotel details'}: +{l s='Property details'}: -{l s='Hotel Name'}: {$list['hotel_name']} -{l s='Hotel Phone'}: {$list['hotel_phone']} -{l s='Hotel Email'}: {$list['hotel_email']} +{l s='Property Name'}: {$list['hotel_name']} +{l s='Property Phone'}: {$list['hotel_phone']} +{l s='Property Email'}: {$list['hotel_email']} {l s='Total Stays'}: {$list['num_rooms']} {/if} \ No newline at end of file diff --git a/modules/blockcart/blockcart.tpl b/modules/blockcart/blockcart.tpl index fa9a8051b..ca1901956 100644 --- a/modules/blockcart/blockcart.tpl +++ b/modules/blockcart/blockcart.tpl @@ -215,7 +215,7 @@
- {l s='Hotel Name' mod='blockcart'}  -  + {l s='Property Name' mod='blockcart'}  - 
diff --git a/modules/dashinsights/dashinsights.php b/modules/dashinsights/dashinsights.php index b15ea49c4..e9c99498c 100644 --- a/modules/dashinsights/dashinsights.php +++ b/modules/dashinsights/dashinsights.php @@ -58,7 +58,7 @@ class DashInsights extends Module { if (Tools::getValue('controller') == 'AdminDashboard') { Media::addJsDef(array( - 'hotel_txt' => $this->l('Hotel'), + 'hotel_txt' => $this->l('Property'), 'nights_booked_txt' => $this->l('Nights Booked'), 'room_booked_txt' => $this->l('Stays Booked'), 'length_of_stay_txt' => $this->l('Length Of Stay'), diff --git a/modules/dashproducts/dashproducts.php b/modules/dashproducts/dashproducts.php index d26b71a68..a72bcd91e 100644 --- a/modules/dashproducts/dashproducts.php +++ b/modules/dashproducts/dashproducts.php @@ -146,7 +146,7 @@ class DashProducts extends Module array('title' => $this->l('Customer Name'), 'class' => 'text-left'), array('title' => $this->l('Total Stays'), 'class' => 'text-left'), array('title' => $this->l('Order'), 'class' => 'text-left'), - array('title' => $this->l('Hotel'), 'class' => 'text-left'), + array('title' => $this->l('Property'), 'class' => 'text-left'), array('title' => $this->l('Total').' '.$this->l('Tax excl.'), 'class' => 'text-left'), array('title' => $this->l('Date'), 'class' => 'text-left'), array('title' => $this->l('Status'), 'class' => 'text-left'), @@ -235,7 +235,7 @@ class DashProducts extends Module ), array( 'id' => 'category', - 'title' => $this->l('Hotel'), + 'title' => $this->l('Property'), 'class' => 'text-center', ), array( @@ -339,7 +339,7 @@ class DashProducts extends Module ), array( 'id' => 'hotel', - 'title' => $this->l('Hotel'), + 'title' => $this->l('Property'), 'class' => 'text-center', ), array( @@ -448,7 +448,7 @@ class DashProducts extends Module ), array( 'id' => 'reference', - 'title' => $this->l('Hotel'), + 'title' => $this->l('Property'), 'class' => 'text-center' ), array( diff --git a/modules/hotelreservationsystem/controllers/admin/AdminHotelConfigurationSettingController.php b/modules/hotelreservationsystem/controllers/admin/AdminHotelConfigurationSettingController.php index f44afd8f7..f235e6c8a 100644 --- a/modules/hotelreservationsystem/controllers/admin/AdminHotelConfigurationSettingController.php +++ b/modules/hotelreservationsystem/controllers/admin/AdminHotelConfigurationSettingController.php @@ -122,7 +122,7 @@ class AdminHotelConfigurationSettingController extends ModuleAdminController { parent::initToolbar(); if ($this->display == 'view') { - $this->toolbar_title = $this->l('Hotel Settings'); + $this->toolbar_title = $this->l('Property Settings'); $this->page_header_toolbar_btn['manage_links'] = array( 'icon' => 'process-icon-cogs', 'href' => self::$currentIndex.'&display=list&token='.$this->token, diff --git a/modules/hotelreservationsystem/controllers/admin/AdminHotelFeaturePricesSettings.php b/modules/hotelreservationsystem/controllers/admin/AdminHotelFeaturePricesSettings.php index d5731d87f..0f7bc7c40 100644 --- a/modules/hotelreservationsystem/controllers/admin/AdminHotelFeaturePricesSettings.php +++ b/modules/hotelreservationsystem/controllers/admin/AdminHotelFeaturePricesSettings.php @@ -113,7 +113,7 @@ class AdminHotelFeaturePricesSettingsController extends ModuleAdminController 'class' => 'chosen', ), 'hotel_name' => array( - 'title' => $this->l('Hotel'), + 'title' => $this->l('Property'), 'align' => 'center', 'type' => 'select', 'filter_key' => 'hrt!id_hotel', diff --git a/modules/hotelreservationsystem/controllers/admin/AdminHotelGeneralSettingsController.php b/modules/hotelreservationsystem/controllers/admin/AdminHotelGeneralSettingsController.php index e18ab1f4a..f11e57fc0 100644 --- a/modules/hotelreservationsystem/controllers/admin/AdminHotelGeneralSettingsController.php +++ b/modules/hotelreservationsystem/controllers/admin/AdminHotelGeneralSettingsController.php @@ -112,11 +112,11 @@ class AdminHotelGeneralSettingsController extends ModuleAdminController 'hint' => $this->l('Enable if you want the next booking search field to be focused automatically after setting value for a field.'), ), 'WK_HOTEL_NAME_SEARCH_THRESHOLD' => array( - 'title' => $this->l('Hotel name search threshold'), + 'title' => $this->l('Property name search threshold'), 'type' => 'text', 'required' => true, 'validation' => 'isUnsignedInt', - 'hint' => $this->l('Enter the number of hotels after which user can search hotel by name.'), + 'hint' => $this->l('Enter the number of properties after which user can search property by name.'), 'desc' => $this->l('Set to 0 to always show the search box.'), 'class' => 'fixed-width-xxl', ), @@ -129,34 +129,34 @@ class AdminHotelGeneralSettingsController extends ModuleAdminController 'title' => $this->l('Website Configuration'), 'fields' => array( 'WK_HTL_CHAIN_NAME' => array( - 'title' => $this->l('Hotel Name'), + 'title' => $this->l('Property Name'), 'type' => 'textLang', 'lang' => true, 'required' => true, 'validation' => 'isGenericName', - 'hint' => $this->l('Enter Hotel name in case of single hotel or enter your hotels chain name in case of multiple hotels.'), + 'hint' => $this->l('Enter Property name in case of single property or enter your properties chain name in case of multiple properties.'), ), 'WK_HTL_TAG_LINE' => array( - 'title' => $this->l('Hotel Tag Line'), + 'title' => $this->l('Property Tag Line'), 'type' => 'textareaLang', 'lang' => true, 'required' => true, 'validation' => 'isGenericName', - 'hint' => $this->l('This will display hotel tag line in hotel page.'), + 'hint' => $this->l('This will display property tag line in property page.'), ), 'WK_HTL_SHORT_DESC' => array( - 'title' => $this->l('Hotel Short Description'), + 'title' => $this->l('Property Short Description'), 'type' => 'textareaLang', 'lang' => true, 'required' => true, 'rows' => '4', 'cols' => '2', 'validation' => 'isGenericName', - 'hint' => $this->l('This will display hotel short description in footer. Note: number of letters must be less than 220.'), + 'hint' => $this->l('This will display property short description in footer. Note: number of letters must be less than 220.'), ), 'WK_PRIMARY_HOTEL' => array( - 'title' => $this->l('Primary hotel'), - 'hint' => $this->l('Primary hotel is used to default address for your business. The hotel address will be considered as your registered business address.'), + 'title' => $this->l('Primary property'), + 'hint' => $this->l('Primary property is used to default address for your business. The property address will be considered as your registered business address.'), 'type' => 'select', 'identifier' => 'id', 'list' => $hotelsInfo, @@ -541,41 +541,41 @@ class AdminHotelGeneralSettingsController extends ModuleAdminController // End occupancy fields validation if (!$hotelNameSearchThreshold && $hotelNameSearchThreshold !== '0') { - $this->errors[] = $this->l('Hotel name search threshold field is required.'); + $this->errors[] = $this->l('Property name search threshold field is required.'); } elseif (!Validate::isUnsignedInt($hotelNameSearchThreshold)) { - $this->errors[] = $this->l('Hotel name search threshold field is invalid.'); + $this->errors[] = $this->l('Property name search threshold field is invalid.'); } if (!trim(Tools::getValue('WK_HTL_CHAIN_NAME_'.$defaultLangId))) { - $this->errors[] = $this->l('Hotel chain name is required at least in ').$objDefaultLanguage['name']; + $this->errors[] = $this->l('Property chain name is required at least in ').$objDefaultLanguage['name']; } else { foreach ($languages as $lang) { if (trim(Tools::getValue('WK_HTL_CHAIN_NAME_'.$lang['id_lang']))) { if (!Validate::isGenericName(Tools::getValue('WK_HTL_CHAIN_NAME_'.$lang['id_lang']))) { - $this->errors[] = $this->l('Invalid hotel chain name in ').$lang['name']; + $this->errors[] = $this->l('Invalid property chain name in ').$lang['name']; } } } } if (!trim(Tools::getValue('WK_HTL_TAG_LINE_'.$defaultLangId))) { - $this->errors[] = $this->l('Hotel tag line is required at least in ').$objDefaultLanguage['name']; + $this->errors[] = $this->l('Property tag line is required at least in ').$objDefaultLanguage['name']; } else { foreach ($languages as $lang) { if (trim(Tools::getValue('WK_HTL_TAG_LINE_'.$lang['id_lang']))) { if (!Validate::isGenericName(Tools::getValue('WK_HTL_TAG_LINE_'.$lang['id_lang']))) { - $this->errors[] = $this->l('Invalid Hotel tag line in ').$lang['name']; + $this->errors[] = $this->l('Invalid Property tag line in ').$lang['name']; } } } } if (!trim(Tools::getValue('WK_HTL_SHORT_DESC_'.$defaultLangId))) { - $this->errors[] = $this->l('Hotel short description is required at least in '). + $this->errors[] = $this->l('Property short description is required at least in '). $objDefaultLanguage['name']; } else { foreach ($languages as $lang) { if (trim(Tools::getValue('WK_HTL_SHORT_DESC_'.$lang['id_lang']))) { if (!Validate::isGenericName(Tools::getValue('WK_HTL_SHORT_DESC_'.$lang['id_lang']))) { - $this->errors[] = $this->l('Invalid hotel short description in ').$lang['name']; + $this->errors[] = $this->l('Invalid property short description in ').$lang['name']; } } } diff --git a/modules/hotelreservationsystem/controllers/admin/AdminHotelRoomsBookingController.php b/modules/hotelreservationsystem/controllers/admin/AdminHotelRoomsBookingController.php index 78eb518db..d3c728c63 100644 --- a/modules/hotelreservationsystem/controllers/admin/AdminHotelRoomsBookingController.php +++ b/modules/hotelreservationsystem/controllers/admin/AdminHotelRoomsBookingController.php @@ -644,7 +644,7 @@ class AdminHotelRoomsBookingController extends ModuleAdminController if (validate::isLoadedObject($objHotelBranch = new HotelBranchInformation($id_hotel))) { $hotelIdAddress = $objHotelBranch->getHotelIdAddress(); } else { - $this->errrors[] = $this->l('Hotel not found'); + $this->errrors[] = $this->l('Property not found'); } } @@ -985,11 +985,11 @@ class AdminHotelRoomsBookingController extends ModuleAdminController 'rooms_reallocation_url' => $this->context->link->getAdminLink('AdminHotelRoomsBooking'), 'rooms_booking_url' => $this->context->link->getAdminLink('AdminHotelRoomsBooking'), 'opt_select_all' => $this->l('All Types', null, true), - 'slt_another_htl' => $this->l('Select Another Hotel', null, true), + 'slt_another_htl' => $this->l('Select Another Property', null, true), 'product_type_cond' => $this->l('Product type is required', null, true), 'from_date_cond' => $this->l('From date is required', null, true), 'to_date_cond' => $this->l('To date is required', null, true), - 'hotel_name_cond' => $this->l('Hotel Name is required', null, true), + 'hotel_name_cond' => $this->l('Property Name is required', null, true), 'num_rooms_cond' => $this->l('Number of Rooms is required', null, true), 'add_to_cart' => $this->l('Add To Cart', null, true), 'remove' => $this->l('Remove', null, true), diff --git a/modules/hotelreservationsystem/views/templates/admin/assign_hotel_features/helpers/form/form.tpl b/modules/hotelreservationsystem/views/templates/admin/assign_hotel_features/helpers/form/form.tpl index c5b09363c..122b130cc 100644 --- a/modules/hotelreservationsystem/views/templates/admin/assign_hotel_features/helpers/form/form.tpl +++ b/modules/hotelreservationsystem/views/templates/admin/assign_hotel_features/helpers/form/form.tpl @@ -33,7 +33,7 @@
{if isset($edit)} {else}
@@ -51,7 +51,7 @@ {/foreach} {else} - {l s='No hotels available' mod='hotelreservationsystem'} + {l s='No properties available' mod='hotelreservationsystem'} {/if} @@ -209,7 +209,7 @@ {else}
- {l s='No Hotels' mod='hotelreservationsystem'} + {l s='No Properties Available' mod='hotelreservationsystem'}
diff --git a/modules/qlohotelreview/controllers/admin/AdminHotelReviewHotelReview.php b/modules/qlohotelreview/controllers/admin/AdminHotelReviewHotelReview.php index a8e7d9284..79fbb9058 100644 --- a/modules/qlohotelreview/controllers/admin/AdminHotelReviewHotelReview.php +++ b/modules/qlohotelreview/controllers/admin/AdminHotelReviewHotelReview.php @@ -72,8 +72,8 @@ class AdminHotelReviewHotelReviewController extends ModuleAdminController 'class' => 'fixed-width-xs', ), 'hotel_name' => array( - 'title' => $this->l('Hotel'), - 'hint' => $this->l('Name of the hotel for which this review has been added.'), + 'title' => $this->l('Property Name'), + 'hint' => $this->l('Name of the property for which this review has been added.'), 'align' => 'left', 'callback' => 'getHotelLink', ), diff --git a/modules/statsbestcategories/statsbestcategories.php b/modules/statsbestcategories/statsbestcategories.php index c3eb94abf..781e28908 100644 --- a/modules/statsbestcategories/statsbestcategories.php +++ b/modules/statsbestcategories/statsbestcategories.php @@ -56,7 +56,7 @@ class StatsBestCategories extends ModuleGrid $this->columns = array( array( 'id' => 'name', - 'header' => $this->l('Hotel name'), + 'header' => $this->l('Property Name'), 'dataIndex' => 'hotel_name', 'align' => 'center' ), @@ -65,14 +65,14 @@ class StatsBestCategories extends ModuleGrid 'header' => $this->l('Room nights booked'), 'dataIndex' => 'totalRoomsBooked', 'align' => 'center', - 'tooltip' => $this->l('The room nights booked for the hotel.'), + 'tooltip' => $this->l('The room nights booked for the property.'), ), array( 'id' => 'availableRooms', 'header' => $this->l('Available room nights'), 'dataIndex' => 'availableRooms', 'align' => 'center', - 'tooltip' => $this->l('The total room nights available for booking for the hotel.'), + 'tooltip' => $this->l('The total room nights available for booking for the property.'), ), array( 'id' => 'totalOrders', diff --git a/modules/statsbestproducts/statsbestproducts.php b/modules/statsbestproducts/statsbestproducts.php index 74d0f8603..3128f5386 100644 --- a/modules/statsbestproducts/statsbestproducts.php +++ b/modules/statsbestproducts/statsbestproducts.php @@ -64,7 +64,7 @@ class StatsBestProducts extends ModuleGrid ), array( 'id' => 'hotelName', - 'header' => $this->l('Hotel name'), + 'header' => $this->l('Property Name'), 'dataIndex' => 'hotelName', 'align' => 'center', ), diff --git a/modules/statscatalog/statscatalog.php b/modules/statscatalog/statscatalog.php index aeb179514..4244a2f7c 100644 --- a/modules/statscatalog/statscatalog.php +++ b/modules/statscatalog/statscatalog.php @@ -46,7 +46,7 @@ class StatsCatalog extends Module parent::__construct(); - $this->displayName = $this->l('Hotel statistics'); + $this->displayName = $this->l('Property statistics'); $this->description = $this->l('Adds a tab containing general statistics about your catalog to the Stats dashboard.'); $this->ps_versions_compliancy = array('min' => '1.6', 'max' => '1.7.0.99'); } @@ -278,7 +278,7 @@ class StatsCatalog extends Module
  • '.$this->returnLine($this->l('Available room types'), ''.(int)$total).'
  • '.$this->returnLine($this->l('Average base price'), ''.Tools::displayPrice($average_price, $this->context->currency)).'
    • -
  • '.$this->returnLine($this->l('Hotel page views'), ''.(int)$total_hotel_page_viewed).'
    • +
  • '.$this->returnLine($this->l('Property page views'), ''.(int)$total_hotel_page_viewed).'
  • '.$this->returnLine($this->l('Room type page views'), ''.(int)$total_room_type_page_viewed).'
  • '.$this->returnLine($this->l('Booked room nights'), ''.(int)$total_booked_rooms).'
  • '.$this->returnLine($this->l('Average number of page visits'), ''.number_format((float)$average_viewed, 2, '.', '')).'
    • diff --git a/modules/statscheckup/statscheckup.php b/modules/statscheckup/statscheckup.php index 073b5aae2..f65446750 100644 --- a/modules/statscheckup/statscheckup.php +++ b/modules/statscheckup/statscheckup.php @@ -167,7 +167,7 @@ class StatsCheckUp extends Module
- + '; foreach ($languages as $language) { $hotelsHtml .= ''; diff --git a/modules/wkabouthotelblock/controllers/admin/AdminAboutHotelBlockSettingController.php b/modules/wkabouthotelblock/controllers/admin/AdminAboutHotelBlockSettingController.php index 133fc0bac..351d9fc48 100644 --- a/modules/wkabouthotelblock/controllers/admin/AdminAboutHotelBlockSettingController.php +++ b/modules/wkabouthotelblock/controllers/admin/AdminAboutHotelBlockSettingController.php @@ -36,7 +36,7 @@ class AdminAboutHotelBlockSettingController extends ModuleAdminController $this->fields_options = array( 'global' => array( - 'title' => $this->l('Hotel Interior Description'), + 'title' => $this->l('Property Interior Description'), 'icon' => 'icon-cogs', 'fields' => array( 'HOTEL_INTERIOR_HEADING' => array( @@ -188,7 +188,7 @@ class AdminAboutHotelBlockSettingController extends ModuleAdminController $this->fields_form = array( 'legend' => array( - 'title' => $this->l('Add New Hotel Interior Image'), + 'title' => $this->l('Add New Property Interior Image'), 'icon' => 'icon-list-ul' ), 'input' => array( @@ -200,7 +200,7 @@ class AdminAboutHotelBlockSettingController extends ModuleAdminController ), array( 'type' => 'file', - 'label' => $this->l('Hotel Interior Image'), + 'label' => $this->l('Property Interior Image'), 'name' => 'interior_img', 'required' => true, 'display_image' => true, @@ -252,7 +252,7 @@ class AdminAboutHotelBlockSettingController extends ModuleAdminController } if (!(Tools::getValue("id_interior_image") && !$file['size'])) { if (!$file['size']) { - $this->errors[] = $this->l('Hotel Interior Image Required.'); + $this->errors[] = $this->l('Property Interior Image Required.'); } elseif ($error = ImageManager::validateUpload($file, Tools::getMaxUploadSize())) { $this->errors[] = $error; } diff --git a/modules/wkhotelfeaturesblock/controllers/admin/AdminFeaturesModuleSettingController.php b/modules/wkhotelfeaturesblock/controllers/admin/AdminFeaturesModuleSettingController.php index e4f6608a1..c53dc6fa5 100644 --- a/modules/wkhotelfeaturesblock/controllers/admin/AdminFeaturesModuleSettingController.php +++ b/modules/wkhotelfeaturesblock/controllers/admin/AdminFeaturesModuleSettingController.php @@ -42,7 +42,7 @@ class AdminFeaturesModuleSettingController extends ModuleAdminController // field options for global fields $this->fields_options = array( 'global' => array( - 'title' => $this->l('Hotel Amenity Setting'), + 'title' => $this->l('Property Amenity Setting'), 'icon' => 'icon-cogs', 'fields' => array( 'HOTEL_AMENITIES_HEADING' => array( @@ -278,7 +278,7 @@ class AdminFeaturesModuleSettingController extends ModuleAdminController } if (!$hotelAmenityId || $file['size']) { if (!$file['size']) { - $this->errors[] = $this->l('Hotel Amenity Image Required.'); + $this->errors[] = $this->l('Property Amenity Image Required.'); } elseif ($error = ImageManager::validateUpload($file, Tools::getMaxUploadSize())) { $this->errors[] = $error; } diff --git a/modules/wkhotelfeaturesblock/wkhotelfeaturesblock.php b/modules/wkhotelfeaturesblock/wkhotelfeaturesblock.php index 5538dcc1e..7f02b3c0b 100644 --- a/modules/wkhotelfeaturesblock/wkhotelfeaturesblock.php +++ b/modules/wkhotelfeaturesblock/wkhotelfeaturesblock.php @@ -40,8 +40,8 @@ class WkHotelFeaturesBlock extends Module $this->bootstrap = true; parent::__construct(); - $this->displayName = $this->l('Hotel Features'); - $this->description = $this->l('Show Hotel Amenities on the home page using this module.'); + $this->displayName = $this->l('Property Features'); + $this->description = $this->l('Show Property Amenities on the home page using this module.'); $this->ps_versions_compliancy = array('min' => '1.6', 'max' => _PS_VERSION_); } diff --git a/modules/wkhotelfilterblock/wkhotelfilterblock.php b/modules/wkhotelfilterblock/wkhotelfilterblock.php index 17226b9a2..2acc75b23 100644 --- a/modules/wkhotelfilterblock/wkhotelfilterblock.php +++ b/modules/wkhotelfilterblock/wkhotelfilterblock.php @@ -41,7 +41,7 @@ class wkhotelfilterblock extends Module parent::__construct(); $this->displayName = $this->l('Layered filters and sorting block'); - $this->description = $this->l('Hotel filter and sorting block'); + $this->description = $this->l('Property filter and sorting block'); $this->ps_versions_compliancy = array('min' => '1.6', 'max' => _PS_VERSION_); } diff --git a/modules/wkhotelroom/controllers/admin/AdminHotelRoomModuleSettingController.php b/modules/wkhotelroom/controllers/admin/AdminHotelRoomModuleSettingController.php index 90528dfb1..bbc4f5292 100644 --- a/modules/wkhotelroom/controllers/admin/AdminHotelRoomModuleSettingController.php +++ b/modules/wkhotelroom/controllers/admin/AdminHotelRoomModuleSettingController.php @@ -43,26 +43,26 @@ class AdminHotelRoomModuleSettingController extends ModuleAdminController $this->fields_options = array( 'global' => array( - 'title' => $this->l('Hotel Room Display Setting'), + 'title' => $this->l('Property Room Display Setting'), 'icon' => 'icon-cogs', 'fields' => array( 'HOTEL_ROOM_DISPLAY_HEADING' => array( - 'title' => $this->l('Hotel Room Block Title'), + 'title' => $this->l('Property Room Block Title'), 'type' => 'textLang', 'lang' => true, 'required' => true, 'validation' => 'isGenericName', - 'hint' => $this->l('Enter a title for the hotel rooms block.'), + 'hint' => $this->l('Enter a title for the property rooms block.'), ), 'HOTEL_ROOM_DISPLAY_DESCRIPTION' => array( - 'title' => $this->l('Hotel room block description'), + 'title' => $this->l('Property room block description'), 'type' => 'textareaLang', 'lang' => true, 'required' => true, 'validation' => 'isGenericName', 'rows' => '4', 'cols' => '2', - 'hint' => $this->l('Enter a description for the hotel rooms block.'), + 'hint' => $this->l('Enter a description for the property rooms block.'), ), ), 'submit' => array('title' => $this->l('Save')) @@ -91,7 +91,7 @@ class AdminHotelRoomModuleSettingController extends ModuleAdminController 'orderby' => false, ), 'hotel_name' => array( - 'title' => $this->l('Hotel'), + 'title' => $this->l('Property'), 'align' => 'center', 'orderby' => false, ), @@ -335,25 +335,25 @@ class AdminHotelRoomModuleSettingController extends ModuleAdminController $objDefaultLanguage = Language::getLanguage((int) $defaultLangId); $languages = Language::getLanguages(false); if (!trim(Tools::getValue('HOTEL_ROOM_DISPLAY_HEADING_'.$defaultLangId))) { - $this->errors[] = $this->l('Hotel rooms block title is required at least in '). + $this->errors[] = $this->l('Property rooms block title is required at least in '). $objDefaultLanguage['name']; } else { foreach ($languages as $lang) { if (trim(Tools::getValue('HOTEL_ROOM_DISPLAY_HEADING_'.$lang['id_lang']))) { if (!Validate::isGenericName(Tools::getValue('HOTEL_ROOM_DISPLAY_HEADING_'.$lang['id_lang']))) { - $this->errors[] = $this->l('Invalid hotel rooms block title in ').$lang['name']; + $this->errors[] = $this->l('Invalid property rooms block title in ').$lang['name']; } } } } if (!trim(Tools::getValue('HOTEL_ROOM_DISPLAY_DESCRIPTION_'.$defaultLangId))) { - $this->errors[] = $this->l('Hotel rooms block description is required at least in '). + $this->errors[] = $this->l('Property rooms block description is required at least in '). $objDefaultLanguage['name']; } else { foreach ($languages as $lang) { if (trim(Tools::getValue('HOTEL_ROOM_DISPLAY_DESCRIPTION_'.$lang['id_lang']))) { if (!Validate::isGenericName(Tools::getValue('HOTEL_ROOM_DISPLAY_DESCRIPTION_'.$lang['id_lang']))) { - $this->errors[] = $this->l('Invalid hotel rooms block description in ').$lang['name']; + $this->errors[] = $this->l('Invalid property rooms block description in ').$lang['name']; } } } diff --git a/modules/wkroomsearchblock/wkroomsearchblock.php b/modules/wkroomsearchblock/wkroomsearchblock.php index 7629e3aac..a47a38ec2 100644 --- a/modules/wkroomsearchblock/wkroomsearchblock.php +++ b/modules/wkroomsearchblock/wkroomsearchblock.php @@ -71,13 +71,13 @@ class WkRoomSearchBlock extends Module 'autocompletesearch' ), 'no_results_found_cond' => $this->l('No results found for this search', false, true), - 'hotel_name_cond' => $this->l('Please select a hotel name', false, true), + 'hotel_name_cond' => $this->l('Please select a property name', false, true), 'check_in_time_cond' => $this->l('Please enter Check In time', false, true), 'check_out_time_cond' => $this->l('Please enter Check Out time', false, true), 'less_checkin_date' => $this->l('Check In date can not be before current date.', false, true), 'more_checkout_date' => $this->l('Check Out date must be greater than Check In date.', false, true), - 'hotel_location_txt' => $this->l('Hotel Location', false, true), - 'select_htl_txt' => $this->l('Select Hotel', false, true), + 'hotel_location_txt' => $this->l('Property Location', false, true), + 'select_htl_txt' => $this->l('Select Property', false, true), 'select_age_txt' => $this->l('Select age', false, true), 'under_1_age' => $this->l('Under 1', false, true), 'room_txt' => $this->l('Stay', false, true), diff --git a/modules/wktestimonialblock/controllers/admin/AdminTestimonialsModuleSettingController.php b/modules/wktestimonialblock/controllers/admin/AdminTestimonialsModuleSettingController.php index 7c3ad8a2c..2d4feac9d 100644 --- a/modules/wktestimonialblock/controllers/admin/AdminTestimonialsModuleSettingController.php +++ b/modules/wktestimonialblock/controllers/admin/AdminTestimonialsModuleSettingController.php @@ -37,7 +37,7 @@ class AdminTestimonialsModuleSettingController extends ModuleAdminController $this->fields_options = array( 'modulesetting' => array( - 'title' => $this->l('Hotel Testimonials Setting'), + 'title' => $this->l('Property Testimonials Setting'), 'fields' => array( 'HOTEL_TESIMONIAL_BLOCK_HEADING' => array( 'title' => $this->l('Testimonial block title'), @@ -154,7 +154,7 @@ class AdminTestimonialsModuleSettingController extends ModuleAdminController $this->fields_form = array( 'legend' => array( - 'title' => $this->l('Hotel Testimonial Configuration'), + 'title' => $this->l('Property Testimonial Configuration'), 'icon' => 'icon-globe' ), 'input' => array( diff --git a/modules/wktestimonialblock/wktestimonialblock.php b/modules/wktestimonialblock/wktestimonialblock.php index bdf04f06c..8305910a9 100644 --- a/modules/wktestimonialblock/wktestimonialblock.php +++ b/modules/wktestimonialblock/wktestimonialblock.php @@ -42,8 +42,8 @@ class WkTestimonialBlock extends Module $this->bootstrap = true; parent::__construct(); - $this->displayName = $this->l('Hotel Testimonial'); - $this->description = $this->l('Show Hotel testimonials on home page using this module.'); + $this->displayName = $this->l('Property Testimonial'); + $this->description = $this->l('Show Property testimonials on home page using this module.'); $this->ps_versions_compliancy = array('min' => '1.6', 'max' => _PS_VERSION_); } diff --git a/pdf/order-slip.product-tab.tpl b/pdf/order-slip.product-tab.tpl index 67a02f0e0..b0e382a29 100644 --- a/pdf/order-slip.product-tab.tpl +++ b/pdf/order-slip.product-tab.tpl @@ -31,7 +31,7 @@ - + diff --git a/themes/hotel-reservation-theme/modules/blockcart/blockcart.tpl b/themes/hotel-reservation-theme/modules/blockcart/blockcart.tpl index fa9a8051b..ca1901956 100644 --- a/themes/hotel-reservation-theme/modules/blockcart/blockcart.tpl +++ b/themes/hotel-reservation-theme/modules/blockcart/blockcart.tpl @@ -215,7 +215,7 @@
- {l s='Hotel Name' mod='blockcart'}  -  + {l s='Property Name' mod='blockcart'}  - 
diff --git a/themes/hotel-reservation-theme/order-detail.tpl b/themes/hotel-reservation-theme/order-detail.tpl index f7f03580a..682198561 100644 --- a/themes/hotel-reservation-theme/order-detail.tpl +++ b/themes/hotel-reservation-theme/order-detail.tpl @@ -121,7 +121,7 @@
{else} -
{l s='Hotel details not available.'}
+
{l s='Property details not available.'}
{/if} diff --git a/themes/hotel-reservation-theme/product.tpl b/themes/hotel-reservation-theme/product.tpl index 8453e6e82..364fe2c31 100644 --- a/themes/hotel-reservation-theme/product.tpl +++ b/themes/hotel-reservation-theme/product.tpl @@ -329,7 +329,7 @@
- {l s='Hotel Images'} + {l s='Property Images'}
{l s='Hotel'}{l s='Property'} {l s='All'} diff --git a/admin/themes/default/template/controllers/orders/modals/_cancel_room_bookings.tpl b/admin/themes/default/template/controllers/orders/modals/_cancel_room_bookings.tpl index 6335b7549..5cdf0462c 100644 --- a/admin/themes/default/template/controllers/orders/modals/_cancel_room_bookings.tpl +++ b/admin/themes/default/template/controllers/orders/modals/_cancel_room_bookings.tpl @@ -45,7 +45,7 @@ {l s='Stay No.'} {l s='Room Type'}{l s='Hotel Name'}{l s='Property Name'} {l s='Duration'} {l s='Total Price (Tax incl.)'}
{l s="Stay Num"} {l s="Room Type"}{l s="Hotel"}{l s="Property Name"} {l s="Duration"}
{l s="Room Type"}{l s="Hotel"}{l s="Property Name"} {l s="Stays Qty"} {l s="Duration"}
'.$this->l('ID').''.(!$this->id_hotel ? $this->l('Hotel') : $this->l('Room type')).''.(!$this->id_hotel ? $this->l('Property') : $this->l('Room type')).' '.$this->l('Active').''.$this->l('Desc.').' ('.Tools::strtoupper($language['iso_code']).')
{l s='Room Type / Reference' pdf='true'}{l s='Hotel' pdf='true'}{l s='Property Name' pdf='true'} {l s='Duration' pdf='true'} {l s='Num stays' pdf='true'} {l s='Total Price' pdf='true'}
{if $tax_excluded_display}{l s='(Tax Excl.)' pdf='true'}{else}{l s='(Tax Incl.)' pdf='true'}{/if}