diff --git a/admin/themes/default/template/controllers/backup/download/view.tpl b/admin/themes/default/template/controllers/backup/download/view.tpl index 711e01a5d..1731c3d36 100644 --- a/admin/themes/default/template/controllers/backup/download/view.tpl +++ b/admin/themes/default/template/controllers/backup/download/view.tpl @@ -45,8 +45,8 @@

{l s='Disclaimer before creating a new backup'}

    -
  1. {l s='PrestaShop is not responsible for your database, its backups and/or recovery.'}
  2. -
  3. {l s='PrestaShop is open-source software. You are using it at your own risk under the license agreement.'}
  4. +
  5. {l s='QloApps is not responsible for your database, its backups and/or recovery.'}
  6. +
  7. {l s='QloApps is open-source software. You are using it at your own risk under the license agreement.'}
  8. {l s='You should back up your data on a regular basis (both files and database).'}
  9. {l s='This function only backs up your database, not your files.'}
  10. {l s='By default, your existing database tables will be dropped during the backup recovery (see "Backup options" below).'}
  11. @@ -68,7 +68,7 @@

    {l s='How to restore a database backup in 10 easy steps:'}

      -
    1. {l s='Set "Enable Shop" to "No" in the "Maintenance" page under the "Preferences" menu.'}
    2. +
    3. {l s='Set "Enable Site" to "No" in the "Maintenance" page under the "Preferences" menu.'}
    4. {l s='Download the backup from the list below or from your FTP server (in the folder "admin/backups").'}
    5. {l s='Check the backup integrity: Look for errors, incomplete file, etc... Be sure to verify all of your data.'}
    6. {l s='Please ask your hosting provider for "phpMyAdmin" access to your database.'}
    7. diff --git a/admin/themes/default/template/controllers/backup/helpers/list/list_header.tpl b/admin/themes/default/template/controllers/backup/helpers/list/list_header.tpl index 3850f29ac..341197364 100644 --- a/admin/themes/default/template/controllers/backup/helpers/list/list_header.tpl +++ b/admin/themes/default/template/controllers/backup/helpers/list/list_header.tpl @@ -47,8 +47,8 @@

      {l s='Disclaimer before creating a new backup'}

        -
      1. {l s='Qloapps is not responsible for your database, its backups and/or recovery.'}
      2. -
      3. {l s='Qloapps is open-source software. You are using it at your own risk under the license agreement.'}
      4. +
      5. {l s='QloApps is not responsible for your database, its backups and/or recovery.'}
      6. +
      7. {l s='QloApps is open-source software. You are using it at your own risk under the license agreement.'}
      8. {l s='You should back up your data on a regular basis (both files and database).'}
      9. {l s='This function only backs up your database, not your files.'}
      10. {l s='By default, your existing database tables will be dropped during the backup recovery (see "Backup options" below).'}
      11. diff --git a/admin/themes/default/template/controllers/cart_rules/actions.tpl b/admin/themes/default/template/controllers/cart_rules/actions.tpl index 3b93a2d97..efe1a4d24 100644 --- a/admin/themes/default/template/controllers/cart_rules/actions.tpl +++ b/admin/themes/default/template/controllers/cart_rules/actions.tpl @@ -98,7 +98,7 @@

    diff --git a/admin/themes/default/template/controllers/customers/helpers/view/view.tpl b/admin/themes/default/template/controllers/customers/helpers/view/view.tpl index c345c3c2c..88da2734e 100644 --- a/admin/themes/default/template/controllers/customers/helpers/view/view.tpl +++ b/admin/themes/default/template/controllers/customers/helpers/view/view.tpl @@ -334,7 +334,7 @@ {if count($interested)}
    - {l s='Viewed products'} {count($interested)} + {l s='Viewed room types'} {count($interested)}
    diff --git a/admin/themes/default/template/controllers/information/helpers/view/view.tpl b/admin/themes/default/template/controllers/information/helpers/view/view.tpl index 22e36df30..d142e68a6 100644 --- a/admin/themes/default/template/controllers/information/helpers/view/view.tpl +++ b/admin/themes/default/template/controllers/information/helpers/view/view.tpl @@ -138,13 +138,13 @@

    - {l s='Store information'} + {l s='Website information'}

    - {l s='Qloapps version:'} {$shop.qloappsV|escape:'html':'UTF-8'} + {l s='QloApps version:'} {$shop.qloappsV|escape:'html':'UTF-8'}

    - {l s='Shop URL:'} {$shop.url|escape:'html':'UTF-8'} + {l s='Website URL:'} {$shop.url|escape:'html':'UTF-8'}

    {l s='Current theme in use:'} {$shop.theme|escape:'html':'UTF-8'} diff --git a/admin/themes/default/template/controllers/modules/page.tpl b/admin/themes/default/template/controllers/modules/page.tpl index d39281460..013b08fd1 100644 --- a/admin/themes/default/template/controllers/modules/page.tpl +++ b/admin/themes/default/template/controllers/modules/page.tpl @@ -24,7 +24,7 @@ *}

    -

    {l s='Explore all addon of Qloapps '} @{l s='Qloapps addons'}

    +

    {l s='Explore all QloApps addons'} {l s='QloApps addons'}

    {$kpis} diff --git a/admin/themes/default/template/controllers/translations/helpers/view/main.tpl b/admin/themes/default/template/controllers/translations/helpers/view/main.tpl index 2df953047..06f9daf54 100644 --- a/admin/themes/default/template/controllers/translations/helpers/view/main.tpl +++ b/admin/themes/default/template/controllers/translations/helpers/view/main.tpl @@ -79,7 +79,7 @@ {l s='Modify translations'}

    - {l s='Here you can modify translations for every line of text inside Qloapps.'}
    + {l s='Here you can modify translations for every line of text inside QloApps.'}
    {l s='First, select a type of translation (such as "Back office" or "Installed modules"), and then select the language you want to translate strings in.'}

    @@ -136,7 +136,7 @@

    - {l s='You can add or update a language directly from the Qloapps website here.'}
    + {l s='You can add or update a language directly from the QloApps website here.'}
    {l s='If you choose to update an existing language pack, all of your previous customizations in the theme named "hotel-reservation-theme" will be lost. This includes front office expressions and default email templates.'}

    {if $packs_to_update || $packs_to_install} @@ -161,7 +161,7 @@
    {else} -

    {l s='Cannot connect to the Qloapps website to get the language list.'}

    +

    {l s='Cannot connect to the QloApps website to get the language list.'}

    {/if}
    -

    l('Demo data are a good way to learn how to use Qloapps. You should install them if you are not familiar with it.') ?>

    +

    l('Demo data are a good way to learn how to use QloApps. You should install them if you are not familiar with it.') ?>

    diff --git a/install/theme/views/process.phtml b/install/theme/views/process.phtml index 8111f5021..30b89ebe0 100644 --- a/install/theme/views/process.phtml +++ b/install/theme/views/process.phtml @@ -35,7 +35,7 @@ var admin = '

    l('Your installation is finished!'); ?>

    -

    l('You have just finished installing Qloapps. Thank you for using Qloapps!'); ?>

    +

    l('You have just finished installing QloApps. Thank you for using QloApps!'); ?>

    l('Please remember your login information:') ?>

    @@ -82,7 +82,7 @@ var admin = '

    l('Share your experience with your friends!'); ?>

    - - + {/foreach} @@ -427,7 +427,7 @@ {addJsDefL name=qty_txt}{l s='Qty' mod='blockcart' js=1}{/addJsDefL} {addJsDefL name=duration_txt}{l s='Duration' mod='blockcart' js=1}{/addJsDefL} {addJsDefL name=capacity_txt}{l s='Capacity' mod='blockcart' js=1}{/addJsDefL} -{addJsDefL name=remove_rm_title}{l s='remove this room from my cart' mod='blockcart' js=1}{/addJsDefL} +{addJsDefL name=remove_rm_title}{l s='Remove this room from my cart' mod='blockcart' js=1}{/addJsDefL} {addJsDef rm_avail_process_lnk = $link->getModuleLink('blockcart', 'checkroomavailabilityajaxprocess')} {addJsDef pagename = $current_page} diff --git a/modules/hotelreservationsystem/classes/HotelBookingDetail.php b/modules/hotelreservationsystem/classes/HotelBookingDetail.php index f77e28d90..0eb8610cd 100644 --- a/modules/hotelreservationsystem/classes/HotelBookingDetail.php +++ b/modules/hotelreservationsystem/classes/HotelBookingDetail.php @@ -1399,7 +1399,7 @@ class HotelBookingDetail extends ObjectModel } /** - * [createQloAppsBookingByChannels create booking on Qloapps commig from different channels] + * [createQloAppsBookingByChannels create booking on QloApps commig from different channels] * @param [array] $params [array containing details of orders] * @return [boolean] [true if order is created or returns false] */ @@ -1441,7 +1441,7 @@ class HotelBookingDetail extends ObjectModel } /** - * [createQloCustomerChannelCustomerInfo create customer in Qloapps from supplied information from channel manager] + * [createQloCustomerChannelCustomerInfo create customer in QloApps from supplied information from channel manager] * @param [array] $params [array containg customer information] * @return [int|false] [return customer Id if customer created successfully else returns false] */ @@ -1473,7 +1473,7 @@ class HotelBookingDetail extends ObjectModel } /** - * [createQloCustomerAddressByChannelCustomerInfo create customer's Address in Qloapps from supplied information from channel manager] + * [createQloCustomerAddressByChannelCustomerInfo create customer's Address in QloApps from supplied information from channel manager] * @param [array] $params [array containg customer information] * @return [int|false] [return customer address Id if address created successfully else returns false] */ @@ -1502,7 +1502,7 @@ class HotelBookingDetail extends ObjectModel } /** - * [createQloCartForBookingFromChannel create cart in Qloapps from supplied cart information from channel manager] + * [createQloCartForBookingFromChannel create cart in QloApps from supplied cart information from channel manager] * @param [array] $params [array containg channel cart information] * @return [int|false] [return cart Id if cart created successfully else returns false] */ diff --git a/modules/hotelreservationsystem/classes/HotelHelper.php b/modules/hotelreservationsystem/classes/HotelHelper.php index 962498120..2a3751343 100644 --- a/modules/hotelreservationsystem/classes/HotelHelper.php +++ b/modules/hotelreservationsystem/classes/HotelHelper.php @@ -437,7 +437,7 @@ class HotelHelper public function saveDummyProductsAndRelatedInfo($id_hotel) { - $prod_arr = array('General Rooms', 'Delux Rooms', 'Executive Rooms', 'luxury Rooms'); + $prod_arr = array('General Rooms', 'Delux Rooms', 'Executive Rooms', 'Luxury Rooms'); $prod_price_arr = array(1000, 1500, 2000, 2500); foreach ($prod_arr as $key => $value_prod) { // Add Product @@ -536,7 +536,7 @@ class HotelHelper $htl_room_info_obj->id_hotel = $id_hotel; $htl_room_info_obj->room_num = 'A-10'.$k; $htl_room_info_obj->id_status = 1; - $htl_room_info_obj->floor = 'first'; + $htl_room_info_obj->floor = 'First'; $htl_room_info_obj->save(); } diff --git a/modules/hotelreservationsystem/controllers/admin/AdminOrderRefundRulesController.php b/modules/hotelreservationsystem/controllers/admin/AdminOrderRefundRulesController.php index f5aef0c37..80c64dd1d 100644 --- a/modules/hotelreservationsystem/controllers/admin/AdminOrderRefundRulesController.php +++ b/modules/hotelreservationsystem/controllers/admin/AdminOrderRefundRulesController.php @@ -240,7 +240,7 @@ class AdminOrderRefundRulesController extends ModuleAdminController } $objRefundRule = new HotelOrderRefundRules($idRefundRule); if ($cancelationDays == '') { - $this->errors[] = $this->l('Enter before how many days of check in date, rule will be applied.'); + $this->errors[] = $this->l('Enter number of days before check-in date for this rule to be applicable.'); } else if (!Validate::isUnsignedInt($cancelationDays)) { $this->errors[] = $this->l('Enter valid number of days.'); } else if ($objRefundRule->checkIfRuleExistsByCancelationdays($cancelationDays)) { diff --git a/modules/hotelreservationsystem/hotelreservationsystem.php b/modules/hotelreservationsystem/hotelreservationsystem.php index c030afdc1..0d18ff40f 100644 --- a/modules/hotelreservationsystem/hotelreservationsystem.php +++ b/modules/hotelreservationsystem/hotelreservationsystem.php @@ -427,10 +427,10 @@ class hotelreservationsystem extends Module ); //Controllers which are to be used in this modules but we have not to create tab for those ontrollers... - $this->installTab('AdminOrderRestrictSettings', 'order restrict configuration', false, false); + $this->installTab('AdminOrderRestrictSettings', 'Order Restrict Configuration', false, false); $this->installTab('AdminHotelGeneralSettings', 'Hotel General configuration', false, false); - $this->installTab('AdminHotelFeaturePricesSettings', 'feature pricing configuration', false, false); - $this->installTab('AdminRoomTypeGlobalDemand', 'Additional demand configuration', false, false); + $this->installTab('AdminHotelFeaturePricesSettings', 'Feature Pricing Configuration', false, false); + $this->installTab('AdminRoomTypeGlobalDemand', 'Additional Demand Configuration', false, false); $this->installTab('AdminAssignHotelFeatures', 'Assign Hotel Features', false, false); return true; diff --git a/modules/hotelreservationsystem/views/templates/admin/hotel_feature_prices_settings/helpers/form/form.tpl b/modules/hotelreservationsystem/views/templates/admin/hotel_feature_prices_settings/helpers/form/form.tpl index 19ebc6c7c..45459358e 100644 --- a/modules/hotelreservationsystem/views/templates/admin/hotel_feature_prices_settings/helpers/form/form.tpl +++ b/modules/hotelreservationsystem/views/templates/admin/hotel_feature_prices_settings/helpers/form/form.tpl @@ -141,7 +141,7 @@ || (isset($special_days) && $special_days && in_array('mon', $special_days))} checked="checked" {/if}/> -

    {l s='mon' mod='hotelreservationsystem'}

    +

    {l s='Mon' mod='hotelreservationsystem'}

    -

    {l s='tue' mod='hotelreservationsystem'}

    +

    {l s='Tue' mod='hotelreservationsystem'}

    -

    {l s='wed' mod='hotelreservationsystem'}

    +

    {l s='Wed' mod='hotelreservationsystem'}

    -

    {l s='thu' mod='hotelreservationsystem'}

    +

    {l s='Thu' mod='hotelreservationsystem'}

    -

    {l s='fri' mod='hotelreservationsystem'}

    +

    {l s='Fri' mod='hotelreservationsystem'}

    -

    {l s='sat' mod='hotelreservationsystem'}

    +

    {l s='Sat' mod='hotelreservationsystem'}

    -

    {l s='sun' mod='hotelreservationsystem'}

    +

    {l s='Sun' mod='hotelreservationsystem'}

    diff --git a/modules/wkhotelfilterblock/wkhotelfilterblock.php b/modules/wkhotelfilterblock/wkhotelfilterblock.php index 60552a3cc..79a6423c8 100644 --- a/modules/wkhotelfilterblock/wkhotelfilterblock.php +++ b/modules/wkhotelfilterblock/wkhotelfilterblock.php @@ -37,13 +37,14 @@ class wkhotelfilterblock extends Module $this->bootstrap = true; parent::__construct(); - $this->displayName = $this->l('layered filters and sorting block'); + $this->displayName = $this->l('Layered filters and sorting block'); $this->description = $this->l('Hotel filter and sorting block'); $this->ps_versions_compliancy = array('min' => '1.6', 'max' => _PS_VERSION_); } public function getContent() { + $this->html = ''; if (Tools::isSubmit('btnConfigSubmit')) { $this->postProcess(); } else { diff --git a/modules/wktestimonialblock/classes/WkHotelTestimonialData.php b/modules/wktestimonialblock/classes/WkHotelTestimonialData.php index 561bcbcb5..f8138c5bc 100644 --- a/modules/wktestimonialblock/classes/WkHotelTestimonialData.php +++ b/modules/wktestimonialblock/classes/WkHotelTestimonialData.php @@ -141,7 +141,7 @@ class WkHotelTestimonialData extends ObjectModel $HOTEL_TESIMONIAL_BLOCK_HEADING = array(); $HOTEL_TESIMONIAL_BLOCK_CONTENT = array(); foreach ($languages as $lang) { - $HOTEL_TESIMONIAL_BLOCK_HEADING[$lang['id_lang']] = 'What our Guest say?'; + $HOTEL_TESIMONIAL_BLOCK_HEADING[$lang['id_lang']] = 'What our guests say?'; $HOTEL_TESIMONIAL_BLOCK_CONTENT[$lang['id_lang']] = 'Fap put a bird on it next level, sustainable disrupt polaroid flannel Helvetica Kickstarter quinoa bicycle rights narwhal wolf Fap put a bird on it next level.'; } Configuration::updateValue('HOTEL_TESIMONIAL_BLOCK_NAV_LINK', 1); diff --git a/themes/hotel-reservation-theme/modules/blockcart/blockcart.tpl b/themes/hotel-reservation-theme/modules/blockcart/blockcart.tpl index cf8318dca..6192288d3 100644 --- a/themes/hotel-reservation-theme/modules/blockcart/blockcart.tpl +++ b/themes/hotel-reservation-theme/modules/blockcart/blockcart.tpl @@ -122,7 +122,7 @@ - + {/foreach} @@ -427,7 +427,7 @@ {addJsDefL name=qty_txt}{l s='Qty' mod='blockcart' js=1}{/addJsDefL} {addJsDefL name=duration_txt}{l s='Duration' mod='blockcart' js=1}{/addJsDefL} {addJsDefL name=capacity_txt}{l s='Capacity' mod='blockcart' js=1}{/addJsDefL} -{addJsDefL name=remove_rm_title}{l s='remove this room from my cart' mod='blockcart' js=1}{/addJsDefL} +{addJsDefL name=remove_rm_title}{l s='Remove this room from my cart' mod='blockcart' js=1}{/addJsDefL} {addJsDef rm_avail_process_lnk = $link->getModuleLink('blockcart', 'checkroomavailabilityajaxprocess')} {addJsDef pagename = $current_page} diff --git a/themes/hotel-reservation-theme/order-opc-new-account.tpl b/themes/hotel-reservation-theme/order-opc-new-account.tpl index 585d23055..72b596a85 100644 --- a/themes/hotel-reservation-theme/order-opc-new-account.tpl +++ b/themes/hotel-reservation-theme/order-opc-new-account.tpl @@ -45,6 +45,9 @@
    {$HOOK_CREATE_ACCOUNT_TOP} + @@ -394,9 +397,6 @@
    - diff --git a/themes/hotel-reservation-theme/order-opc.tpl b/themes/hotel-reservation-theme/order-opc.tpl index 87a357783..3a5677863 100644 --- a/themes/hotel-reservation-theme/order-opc.tpl +++ b/themes/hotel-reservation-theme/order-opc.tpl @@ -37,7 +37,7 @@ {capture name=path}{l s='Your booking cart'}{/capture}

    {l s='Your booking cart'}

    -

    {l s='The hotel is currently no accepting any bookings.'}

    +

    {l s='The hotel is currently not accepting any bookings.'}

    {else} {if $productNumber && isset($cart_htl_data)} @@ -329,7 +329,7 @@

    {l s='Your booking cart'}

    {include file="$tpl_dir./errors.tpl"} -

    {l s='Till now you did not added any room in your cart.'}

    +

    {l s='You have not added any room to your cart yet.'}

    {/if} {strip} {addJsDef imgDir=$img_dir} diff --git a/themes/hotel-reservation-theme/product.tpl b/themes/hotel-reservation-theme/product.tpl index c10f43ae4..6ddfa69e3 100644 --- a/themes/hotel-reservation-theme/product.tpl +++ b/themes/hotel-reservation-theme/product.tpl @@ -46,7 +46,7 @@ {/if} --> {if isset($adminActionDisplay) && $adminActionDisplay}
    -

    {l s='This product is not visible to your customers.'} +

    {l s='This room type is not visible to your customers.'} {l s='Publish'}

    {$data_v['num_rm']} {convertPrice price=$data_v['amount']}
    {$data_v['num_rm']} {convertPrice price=$data_v['amount']}