diff --git a/admin/themes/default/template/controllers/customer_threads/helpers/view/message.tpl b/admin/themes/default/template/controllers/customer_threads/helpers/view/message.tpl index cb3158f93..d006ce679 100644 --- a/admin/themes/default/template/controllers/customer_threads/helpers/view/message.tpl +++ b/admin/themes/default/template/controllers/customer_threads/helpers/view/message.tpl @@ -54,7 +54,7 @@ {/if}   - {dateFormat date=$message.date_add full=0} - {$message.date_add|substr:11:5} {if isset($message.file_name)}   {l s="Attachment"}{/if} - {if isset($message.product_name)}   {l s="Product:"} {$message.product_name|escape:'html':'UTF-8'} {/if} + {if isset($message.product_name)}   {l s="Room type:"} {$message.product_name|escape:'html':'UTF-8'} {/if}

{$message.message|escape:'html':'UTF-8'|nl2br}

diff --git a/admin/themes/default/template/controllers/modules/page_header_toolbar.tpl b/admin/themes/default/template/controllers/modules/page_header_toolbar.tpl index eecd802b8..614cbfe40 100644 --- a/admin/themes/default/template/controllers/modules/page_header_toolbar.tpl +++ b/admin/themes/default/template/controllers/modules/page_header_toolbar.tpl @@ -64,7 +64,7 @@
  • - {l s='Recommended Modules and Services'} + {l s='Recommendations'}
    • {if $add_permission eq '1'} diff --git a/admin/themes/default/template/controllers/modules_catalog/page.tpl b/admin/themes/default/template/controllers/modules_catalog/page.tpl index fcdd22e60..7ed4b5485 100644 --- a/admin/themes/default/template/controllers/modules_catalog/page.tpl +++ b/admin/themes/default/template/controllers/modules_catalog/page.tpl @@ -109,7 +109,7 @@
    - {l s='Explore all themes of Qloapps'}  + {l s='Explore all themes of QloApps'}  {l s='QloApps Themes'}
    {/if} diff --git a/admin/themes/default/template/controllers/normal_products/prices.tpl b/admin/themes/default/template/controllers/normal_products/prices.tpl index ecd8fbbcb..9fc108e17 100644 --- a/admin/themes/default/template/controllers/normal_products/prices.tpl +++ b/admin/themes/default/template/controllers/normal_products/prices.tpl @@ -116,20 +116,20 @@ $(document).ready(function () {
    {include file="controllers/products/multishop/checkbox.tpl" field="wholesale_price" type="default"}
    {$currency->prefix}{$currency->suffix}
    - {if isset($pack) && $pack->isPack($product->id)}

    {l s='The sum of wholesale prices of the product in the pack is %s%s%s' sprintf=[$currency->prefix,{toolsConvertPrice price=$pack->noPackWholesalePrice($product->id)|string_format:$priceDisplayPrecisionFormat},$currency->suffix]}

    {/if} + {if isset($pack) && $pack->isPack($product->id)}

    {l s='The sum of rack rates of the service in the pack is %s%s%s' sprintf=[$currency->prefix,{toolsConvertPrice price=$pack->noPackWholesalePrice($product->id)|string_format:$priceDisplayPrecisionFormat},$currency->suffix]}

    {/if}
    {include file="controllers/products/multishop/checkbox.tpl" field="price" type="price"}
    diff --git a/admin/themes/default/template/controllers/products/additionalfacilities.tpl b/admin/themes/default/template/controllers/products/additionalfacilities.tpl index 1296aa87e..c3a58eb34 100644 --- a/admin/themes/default/template/controllers/products/additionalfacilities.tpl +++ b/admin/themes/default/template/controllers/products/additionalfacilities.tpl @@ -24,7 +24,7 @@ {l s='Room Type Additional Facilities'}
    - {l s='To create new Additional facilities'} {l s='click here.'} + {l s='To create new additional facilities please visit'} {l s='Additional facilities'} {l s='page.'}
    {if isset($allDemands) && $allDemands} @@ -148,10 +148,6 @@ {l s='Save and stay'}
    - {else} -
    - {l s='No additional facilities created yet. To create please visit'} {l s='Additional facilities'} {l s='page'}. -
    {/if}
    {/if} \ No newline at end of file diff --git a/admin/themes/default/template/helpers/modules_list/list.tpl b/admin/themes/default/template/helpers/modules_list/list.tpl index de8129f0a..29f885864 100644 --- a/admin/themes/default/template/helpers/modules_list/list.tpl +++ b/admin/themes/default/template/helpers/modules_list/list.tpl @@ -54,7 +54,7 @@
    {if $controller_name == 'AdminPayment'} {l s='It seems there are no recommended payment solutions for your country.'}
    - {l s='Do you think there should be one? Let us know!'} + {l s='Do you think there should be one? Let us know!'} {else}{l s='No modules available in this section.'}{/if}
    diff --git a/classes/controller/AdminController.php b/classes/controller/AdminController.php index b5bb01281..9ee0ef05e 100644 --- a/classes/controller/AdminController.php +++ b/classes/controller/AdminController.php @@ -760,7 +760,7 @@ class AdminControllerCore extends Controller } if (count($filters)) { - return sprintf($this->l('filter by %s'), implode(', ', $filters)); + return sprintf($this->l('Filter by %s'), implode(', ', $filters)); } } } @@ -2244,7 +2244,7 @@ class AdminControllerCore extends Controller ) { $this->page_header_toolbar_btn['modules-list'] = array( 'href' => '#', - 'desc' => $this->l('Recommended Modules and Services') + 'desc' => $this->l('Recommendations') ); } } diff --git a/classes/controller/FrontController.php b/classes/controller/FrontController.php index 21aa82c4d..6378c8570 100644 --- a/classes/controller/FrontController.php +++ b/classes/controller/FrontController.php @@ -1135,9 +1135,7 @@ class FrontControllerCore extends Controller */ public function initHeader() { - /** @see P3P Policies (http://www.w3.org/TR/2002/REC-P3P-20020416/#compact_policies) */ - header('P3P: CP="IDC DSP COR CURa ADMa OUR IND PHY ONL COM STA"'); - header('Powered-By: PrestaShop'); + header('Powered-By: QloApps'); // Hooks are voluntary out the initialize array (need those variables already assigned) $this->context->smarty->assign(array( diff --git a/controllers/admin/AdminCustomerThreadsController.php b/controllers/admin/AdminCustomerThreadsController.php index 0b4709521..c7a52fc5e 100644 --- a/controllers/admin/AdminCustomerThreadsController.php +++ b/controllers/admin/AdminCustomerThreadsController.php @@ -725,7 +725,7 @@ class AdminCustomerThreadsControllerCore extends AdminController $content .= $this->l('Message to: ').' '.(!$message['id_employee'] ? $message['subject'] : $message['customer_name']).'
    '; } if (Validate::isLoadedObject($product)) { - $content .= '
    '.$this->l('Product: ').''.$product->name.'

    '; + $content .= '
    '.$this->l('Room type: ').''.$product->name.'

    '; } $content .= Tools::safeOutput($message['message']); diff --git a/controllers/admin/AdminMetaController.php b/controllers/admin/AdminMetaController.php index cb47df23b..676bd7a64 100644 --- a/controllers/admin/AdminMetaController.php +++ b/controllers/admin/AdminMetaController.php @@ -477,7 +477,7 @@ class AdminMetaControllerCore extends AdminController )); // PS Comments - fwrite($write_fd, "# robots.txt automaticaly generated by qloapps e-commerce open-source solution\n"); + fwrite($write_fd, "# robots.txt automaticaly generated by QloApps - open-source hotel management solution.\n"); fwrite($write_fd, "# https://www.qloapps.com - https://forums.qloapps.com/\n"); fwrite($write_fd, "# This file is to prevent the crawling and indexing of certain parts\n"); fwrite($write_fd, "# of your site by web crawlers and spiders run by sites like Yahoo!\n"); diff --git a/controllers/admin/AdminOrderPreferencesController.php b/controllers/admin/AdminOrderPreferencesController.php index 5f8622503..67e25d177 100644 --- a/controllers/admin/AdminOrderPreferencesController.php +++ b/controllers/admin/AdminOrderPreferencesController.php @@ -88,8 +88,8 @@ class AdminOrderPreferencesControllerCore extends AdminController 'icon' => 'icon-cogs', 'fields' => array( 'MAX_GLOBAL_BOOKING_DATE' => array( - 'title' => $this->l('Maximum Global Date to book a room'), - 'hint' => $this->l('Maximum date by which rooms of your hotels can be booked.'), + 'title' => $this->l('Maximum Global Check-out Date to book a room'), + 'hint' => $this->l('Maximum date of check-out for which rooms of your hotels can be booked.'), 'type' => 'text', 'id' => 'max_global_book_date', 'class' => 'fixed-width-xxl readonly', @@ -188,8 +188,8 @@ class AdminOrderPreferencesControllerCore extends AdminController ), 'PS_ROOM_PRICE_AUTO_ADD_BREAKDOWN' => array( 'title' => $this->l('Show room price breakdown'), - 'hint' => $this->l('Show a summary for prices of the auto added service add with room on shopping cart list.'), - 'desc' => $this->l('This breakdown is always visible on room that have cart rule applied for that specific room.'), + 'hint' => $this->l('Show price breakdown for rooms with auto added services on checkout page.'), + 'desc' => $this->l('This room price breakdown will be shown if cart rule for specific room type is applied on that room.'), 'cast' => 'intval', 'type' => 'bool' ), @@ -318,11 +318,11 @@ class AdminOrderPreferencesControllerCore extends AdminController $maxGlobalBookingDateFormatted = date('Y-m-d', strtotime($maxGlobalBookingDate)); if ($maxGlobalBookingDate == '') { - $this->errors[] = Tools::displayError('Field \'Maximum Global Date to book a room\' can not be empty.'); + $this->errors[] = Tools::displayError('Field \'Maximum Global Check-out Date to book a room\' can not be empty.'); } elseif (!Validate::isDate($maxGlobalBookingDateFormatted)) { - $this->errors[] = Tools::displayError('Field \'Maximum Global Date to book a room\' is invalid.'); + $this->errors[] = Tools::displayError('Field \'Maximum Global Check-out Date to book a room\' is invalid.'); } elseif (strtotime($maxGlobalBookingDateFormatted) < strtotime(date('Y-m-d'))) { - $this->errors[] = Tools::displayError('Field \'Maximum Global Date to book a room\' can not be a past date. Please use a future date.'); + $this->errors[] = Tools::displayError('Field \'Maximum Global Check-out Date to book a room\' can not be a past date. Please use a future date.'); } if ($globalPreparationTime === '') { diff --git a/controllers/admin/AdminPPreferencesController.php b/controllers/admin/AdminPPreferencesController.php index 4145010e5..98ec9c7eb 100644 --- a/controllers/admin/AdminPPreferencesController.php +++ b/controllers/admin/AdminPPreferencesController.php @@ -321,7 +321,8 @@ class AdminPPreferencesControllerCore extends AdminController ), 'PS_SERVICE_PRODUCT_CATEGORY_FILTER' => array( - 'title' => $this->l('Show category filter for service products'), + 'title' => $this->l('Display services by category'), + 'hint' => $this->l('If enabled, services will be grouped and displayed as per their default category. Else all services will be displayed together.'), 'validation' => 'isBool', 'cast' => 'intval', 'required' => false, diff --git a/controllers/admin/AdminPreferencesController.php b/controllers/admin/AdminPreferencesController.php index 248762512..0881b5616 100644 --- a/controllers/admin/AdminPreferencesController.php +++ b/controllers/admin/AdminPreferencesController.php @@ -95,8 +95,8 @@ class AdminPreferencesControllerCore extends AdminController $fields = array( 'PS_SSL_ENABLED' => array( 'title' => $this->l('Enable SSL'), - 'desc' => $this->l('If you own an SSL certificate for your shop\'s domain name, you can activate SSL encryption (https://) for customer account identification and order processing.'), - 'hint' => $this->l('If you want to enable SSL on all the pages of your shop, activate the "Enable on all the pages" option below.'), + 'desc' => $this->l('If you own an SSL certificate for your website\'s domain name, you can activate SSL encryption (https://) for customer account identification and order processing.'), + 'hint' => $this->l('If you want to enable SSL on all the pages of your website, activate the "Enable on all the pages" option below.'), 'validation' => 'isBool', 'cast' => 'intval', 'type' => 'bool', @@ -106,7 +106,7 @@ class AdminPreferencesControllerCore extends AdminController $fields['PS_SSL_ENABLED_EVERYWHERE'] = array( 'title' => $this->l('Enable SSL on all pages'), - 'desc' => $this->l('When enabled, all the pages of your shop will be SSL-secured.'), + 'desc' => $this->l('When enabled, all the pages of your website will be SSL-secured.'), 'validation' => 'isBool', 'cast' => 'intval', 'type' => 'bool', @@ -221,7 +221,7 @@ class AdminPreferencesControllerCore extends AdminController if (!Tools::usingSecureMode() && !Configuration::get('PS_SSL_ENABLED')) { $fields['PS_SSL_ENABLED']['type'] = 'disabled'; $fields['PS_SSL_ENABLED']['disabled'] = ''. - $this->l('Please click here to check if your shop supports HTTPS.').''; + $this->l('Please click here to check if your website supports HTTPS.').''; } $this->fields_options = array( diff --git a/modules/hotelreservationsystem/classes/HotelReservationSystemDb.php b/modules/hotelreservationsystem/classes/HotelReservationSystemDb.php index 5e8a45c1e..484311892 100644 --- a/modules/hotelreservationsystem/classes/HotelReservationSystemDb.php +++ b/modules/hotelreservationsystem/classes/HotelReservationSystemDb.php @@ -482,7 +482,7 @@ class HotelReservationSystemDb ) ENGINE="._MYSQL_ENGINE_." DEFAULT CHARSET=utf8;", "INSERT INTO `"._DB_PREFIX_."htl_settings_link_lang` (`id_settings_link`, `id_lang`, `name`, `hint`) - SELECT 1, `id_lang`, 'General Settings', 'Configure Your hotel general gettings using this option.' + SELECT 1, `id_lang`, 'General Settings', 'Configure Your hotel general settings using this option.' FROM `"._DB_PREFIX_."lang` ORDER BY `id_lang`;", diff --git a/modules/hotelreservationsystem/controllers/admin/AdminAddHotelController.php b/modules/hotelreservationsystem/controllers/admin/AdminAddHotelController.php index ef182d276..3d063bc42 100644 --- a/modules/hotelreservationsystem/controllers/admin/AdminAddHotelController.php +++ b/modules/hotelreservationsystem/controllers/admin/AdminAddHotelController.php @@ -333,19 +333,19 @@ class AdminAddHotelController extends ModuleAdminController if (!$enableUseGlobalMaxOrderDate) { $maximumBookingDateFormatted = date('Y-m-d', strtotime($maximumBookingDate)); if ($maximumBookingDate == '') { - $this->errors[] = Tools::displayError('Maximum Global Date to book a room is a required field.'); + $this->errors[] = $this->l('Maximum Check-out Date to book a room is a required field.'); } elseif (!Validate::isDate($maximumBookingDateFormatted)) { - $this->errors[] = Tools::displayError('Maximum Global Date to book a room is invalid.'); + $this->errors[] = $this->l('Maximum Check-out Date to book a room is invalid.'); } elseif (strtotime($maximumBookingDateFormatted) < strtotime(date('Y-m-d'))) { - $this->errors[] = Tools::displayError('Maximum Global Date to book a room can not be a past date. Please use a future date.'); + $this->errors[] = $this->l('Maximum Check-out Date to book a room can not be a past date. Please use a future date.'); } } if (!$enableUseGlobalPreparationTime) { if ($preparationTime === '') { - $this->errors[] = Tools::displayError('Preparation time is a required field.'); + $this->errors[] = $this->l('Preparation time is a required field.'); } elseif ($preparationTime !== '0' && !Validate::isUnsignedInt($preparationTime)) { - $this->errors[] = Tools::displayError('Preparation time is invalid.'); + $this->errors[] = $this->l('Preparation time is invalid.'); } } } diff --git a/modules/hotelreservationsystem/views/templates/admin/add_hotel/helpers/form/form.tpl b/modules/hotelreservationsystem/views/templates/admin/add_hotel/helpers/form/form.tpl index f35974978..4ef90c7d8 100644 --- a/modules/hotelreservationsystem/views/templates/admin/add_hotel/helpers/form/form.tpl +++ b/modules/hotelreservationsystem/views/templates/admin/add_hotel/helpers/form/form.tpl @@ -360,7 +360,7 @@