Merge pull request #823 from abhishek-webkul/text-changes-2

rohit053 · web-flow · commit 38bc04101a68 · 2024-03-18T13:41:52.000+05:30
Text changes
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
@@ -54,7 +54,7 @@
 		{/if}
 		<span class="message-date">&nbsp;<i class="icon-calendar"></i> - {dateFormat date=$message.date_add full=0} - <i class="icon-time"></i> {$message.date_add|substr:11:5}</span>
 		{if isset($message.file_name)} <span class="message-product">&nbsp;<i class="icon-link"></i> <a href="{$message.file_name|escape:'html':'UTF-8'}" class="_blank">{l s="Attachment"}</a></span>{/if}
-		{if isset($message.product_name)} <span class="message-attachment">&nbsp;<i class="icon-book"></i> <a href="{$message.product_link|escape:'html':'UTF-8'}" class="_blank">{l s="Product:"} {$message.product_name|escape:'html':'UTF-8'} </a></span>{/if}
+		{if isset($message.product_name)} <span class="message-attachment">&nbsp;<i class="icon-book"></i> <a href="{$message.product_link|escape:'html':'UTF-8'}" class="_blank">{l s="Room type:"} {$message.product_name|escape:'html':'UTF-8'} </a></span>{/if}
 		<p class="message-item-text">{$message.message|escape:'html':'UTF-8'|nl2br}</p>
 	</div>
 </div>
diff --git 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 @@
 			<li>
 				<a id="desc-module-catalog" class="toolbar_btn anchor" href="{$link->getAdminLink('AdminModulesCatalog')}" title="{l s='Recommended Modules and Services'}">
 					<i class="process-icon-modules-list"></i>
-					<span>{l s='Recommended Modules and Services'}</span>
+					<span>{l s='Recommendations'}</span>
 				</a>
 			</li>
 			{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
@@ -109,7 +109,7 @@
             </div>
         </div>
         <div class="panel explore-panel text-center">
-            {l s='Explore all themes of Qloapps'}&nbsp;
+            {l s='Explore all themes of QloApps'}&nbsp;
             <a href="https://store.webkul.com/Qloapps/responsive.html" class="btn btn-primary btn-lg">{l s='QloApps Themes'}</a>
         </div>
     {/if}
diff --git 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 () {
 	<div class="form-group">
 		<div class="col-lg-1"><span class="pull-right">{include file="controllers/products/multishop/checkbox.tpl" field="wholesale_price" type="default"}</span></div>
 		<label class="control-label col-lg-2" for="wholesale_price">
-			<span class="label-tooltip" data-toggle="tooltip" title="{l s='The price is the price you paid for the product. Do not include the tax.'}">{if !$country_display_tax_label || $tax_exclude_taxe_option}{l s='Wholesale price'}{else}{l s='Pre-tax wholesale price'}{/if}</span>
+			<span class="label-tooltip" data-toggle="tooltip" title="{l s='The price is the price you paid for the service. Do not include the tax.'}">{if !$country_display_tax_label || $tax_exclude_taxe_option}{l s='Rack rate'}{else}{l s='Pre-tax rack rate'}{/if}</span>
 		</label>
 		<div class="col-lg-2">
 			<div class="input-group">
 				<span class="input-group-addon">{$currency->prefix}{$currency->suffix}</span>
 				<input maxlength="27" name="wholesale_price" id="wholesale_price" type="text" value="{{toolsConvertPrice price=$product->wholesale_price}|string_format:$priceDisplayPrecisionFormat}" onchange="this.value = this.value.replace(/,/g, '.');" />
 			</div>
-			{if isset($pack) && $pack->isPack($product->id)}<p class="help-block">{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]}</p>{/if}
+			{if isset($pack) && $pack->isPack($product->id)}<p class="help-block">{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]}</p>{/if}
 		</div>
 	</div>
 	<div class="form-group">
 		<div class="col-lg-1"><span class="pull-right">{include file="controllers/products/multishop/checkbox.tpl" field="price" type="price"}</span></div>
 		<label class="control-label col-lg-2" for="priceTE">
-			<span class="label-tooltip" data-toggle="tooltip" title="{l s='The pre-tax retail price is the price for which you intend sell this product to your customers. It should be higher than the pre-tax wholesale price: the difference between the two will be your margin.'}">{if !$country_display_tax_label || $tax_exclude_taxe_option}{l s='Retail price'}{else}{l s='Pre-tax retail price'}{/if}</span>
+			<span class="label-tooltip" data-toggle="tooltip" title="{l s='The pre-tax retail price is the price for which you intend sell this service to your customers. It should be higher than the pre-tax rack rate: the difference between the two will be your margin.'}">{if !$country_display_tax_label || $tax_exclude_taxe_option}{l s='Retail price'}{else}{l s='Pre-tax retail price'}{/if}</span>
 		</label>
 		<div class="col-lg-2">
 			<div class="input-group">
diff --git a/admin/themes/default/template/controllers/products/additionalfacilities.tpl b/admin/themes/default/template/controllers/products/additionalfacilities.tpl
@@ -24,7 +24,7 @@
             <i class="icon-user"></i> {l s='Room Type Additional Facilities'}
         </div>
         <div class="alert alert-info">
-            {l s='To create new Additional facilities'} <a target="_blank" href="{$link->getAdminLink('AdminRoomTypeGlobalDemand')}">{l s='click here.'}</a>
+            {l s='To create new additional facilities please visit'} <a target="_blank" href="{$link->getAdminLink('AdminRoomTypeGlobalDemand')}">{l s='Additional facilities'}</a> {l s='page.'}
         </div>
         {if isset($allDemands) && $allDemands}
 
@@ -148,10 +148,6 @@
                         {l s='Save and stay'}
                 </button>
             </div>
-        {else}
-            <div class="alert alert-warning">
-                {l s='No additional facilities created yet. To create please visit'} <a target="_blank" href="{$link->getAdminLink('AdminRoomTypeGlobalDemand')}">{l s='Additional facilities'}</a> {l s='page'}.
-            </div>
         {/if}
     </div>
 {/if}
diff --git a/admin/themes/default/template/helpers/modules_list/list.tpl b/admin/themes/default/template/helpers/modules_list/list.tpl
@@ -54,7 +54,7 @@
 							<div class="alert alert-warning">
 							{if $controller_name == 'AdminPayment'}
 							{l s='It seems there are no recommended payment solutions for your country.'}<br />
-							<a class="_blank" href="https://www.prestashop.com/en/contact-us">{l s='Do you think there should be one? Let us know!'}</a>
+							<a class="_blank" href="https://qloapps.com/contact/">{l s='Do you think there should be one? Let us know!'}</a>
 							{else}{l s='No modules available in this section.'}{/if}</div>
 						</td>
 					</tr>
diff --git a/classes/controller/AdminController.php b/classes/controller/AdminController.php
@@ -760,7 +760,7 @@ public function addFiltersToBreadcrumbs()
             }
 
             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 @@ protected function addPageHeaderToolBarModulesListButton()
         ) {
             $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
@@ -1135,9 +1135,7 @@ public function setMedia()
      */
     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
@@ -725,7 +725,7 @@ public function getTimeline($messages, $id_order)
                 $content .= $this->l('Message to: ').' <span class="badge">'.(!$message['id_employee'] ? $message['subject'] : $message['customer_name']).'</span><br/>';
             }
             if (Validate::isLoadedObject($product)) {
-                $content .= '<br/>'.$this->l('Product: ').'<span class="label label-info">'.$product->name.'</span><br/><br/>';
+                $content .= '<br/>'.$this->l('Room type: ').'<span class="label label-info">'.$product->name.'</span><br/><br/>';
             }
             $content .= Tools::safeOutput($message['message']);
 
diff --git a/controllers/admin/AdminMetaController.php b/controllers/admin/AdminMetaController.php
@@ -477,7 +477,7 @@ public function generateRobotsFile()
             ));
 
             // 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
@@ -88,8 +88,8 @@ public function __construct()
                 '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 @@ public function __construct()
                     ),
                     '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 @@ public function beforeUpdateOptions()
         $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
@@ -321,7 +321,8 @@ public function __construct()
                     ),
 
                     '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
@@ -95,8 +95,8 @@ public function __construct()
             $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 @@ public function __construct()
 
             $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 @@ public function __construct()
             if (!Tools::usingSecureMode() && !Configuration::get('PS_SSL_ENABLED')) {
                 $fields['PS_SSL_ENABLED']['type'] = 'disabled';
                 $fields['PS_SSL_ENABLED']['disabled'] = '<a class="btn btn-link" href="https://'.Tools::getShopDomainSsl().Tools::safeOutput($_SERVER['REQUEST_URI']).'">'.
-                    $this->l('Please click here to check if your shop supports HTTPS.').'</a>';
+                    $this->l('Please click here to check if your website supports HTTPS.').'</a>';
             }
 
             $this->fields_options = array(
diff --git a/modules/hotelreservationsystem/classes/HotelReservationSystemDb.php b/modules/hotelreservationsystem/classes/HotelReservationSystemDb.php
@@ -482,7 +482,7 @@ public function getModuleSql()
             ) 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
@@ -333,19 +333,19 @@ public function processSave()
             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
@@ -360,7 +360,7 @@
 							</div>
 						</div>
 						<div class="form-group" {if isset($smarty.post.enable_use_global_max_order_date)}{if !$smarty.post.enable_use_global_max_order_date}style="display:block;"{else}style="display:none;"{/if}{elseif isset($order_restrict_date_info.use_global_max_order_date) && !$order_restrict_date_info.use_global_max_order_date}style="display:block;" {else} style="display:none;" {/if}>
-							<label class="control-label col-sm-3 required" for="maximum_booking_date">{l s='Maximum Date to book a room :' mod='hotelreservationsystem'}</label>
+							<label class="control-label col-sm-3 required" for="maximum_booking_date">{l s='Maximum Check-out Date to book a room :' mod='hotelreservationsystem'}</label>
 							<div class="col-sm-2">
 								<input type="text" class="form-control" id="maximum_booking_date" name="maximum_booking_date" value="{if isset($smarty.post.maximum_booking_date)}{$smarty.post.maximum_booking_date|escape:'html':'UTF-8'}{elseif isset($edit) && isset($order_restrict_date_info.max_order_date)}{$order_restrict_date_info.max_order_date|escape:'htmlall':'UTF-8'}{/if}" />
 							</div>

Original file line number	Diff line number	Diff line change
`@@ -760,7 +760,7 @@ public function addFiltersToBreadcrumbs()`
`760`	`760`	`}`
`761`	`761`
`762`	`762`	`if (count($filters)) {`
`763`		`- return sprintf($this->l('filter by %s'), implode(', ', $filters));`
	`763`	`+ return sprintf($this->l('Filter by %s'), implode(', ', $filters));`
`764`	`764`	`}`
`765`	`765`	`}`
`766`	`766`	`}`
`@@ -2244,7 +2244,7 @@ protected function addPageHeaderToolBarModulesListButton()`
`2244`	`2244`	`) {`
`2245`	`2245`	`$this->page_header_toolbar_btn['modules-list'] = array(`
`2246`	`2246`	`'href' => '#',`
`2247`		`- 'desc' => $this->l('Recommended Modules and Services')`
	`2247`	`+ 'desc' => $this->l('Recommendations')`
`2248`	`2248`	`);`
`2249`	`2249`	`}`
`2250`	`2250`	`}`
Original file line number	Diff line number	Diff line change
`@@ -725,7 +725,7 @@ public function getTimeline($messages, $id_order)`
`725`	`725`	`$content .= $this->l('Message to: ').' <span class="badge">'.(!$message['id_employee'] ? $message['subject'] : $message['customer_name']).'</span><br/>';`
`726`	`726`	`}`
`727`	`727`	`if (Validate::isLoadedObject($product)) {`
`728`		`- $content .= '<br/>'.$this->l('Product: ').'<span class="label label-info">'.$product->name.'</span><br/><br/>';`
	`728`	`+ $content .= '<br/>'.$this->l('Room type: ').'<span class="label label-info">'.$product->name.'</span><br/><br/>';`
`729`	`729`	`}`
`730`	`730`	`$content .= Tools::safeOutput($message['message']);`
`731`	`731`
Original file line number	Diff line number	Diff line change
`@@ -333,19 +333,19 @@ public function processSave()`
`333`	`333`	`if (!$enableUseGlobalMaxOrderDate) {`
`334`	`334`	`$maximumBookingDateFormatted = date('Y-m-d', strtotime($maximumBookingDate));`
`335`	`335`	`if ($maximumBookingDate == '') {`
`336`		`- $this->errors[] = Tools::displayError('Maximum Global Date to book a room is a required field.');`
	`336`	`+ $this->errors[] = $this->l('Maximum Check-out Date to book a room is a required field.');`
`337`	`337`	`} elseif (!Validate::isDate($maximumBookingDateFormatted)) {`
`338`		`- $this->errors[] = Tools::displayError('Maximum Global Date to book a room is invalid.');`
	`338`	`+ $this->errors[] = $this->l('Maximum Check-out Date to book a room is invalid.');`
`339`	`339`	`} elseif (strtotime($maximumBookingDateFormatted) < strtotime(date('Y-m-d'))) {`
`340`		`- $this->errors[] = Tools::displayError('Maximum Global Date to book a room can not be a past date. Please use a future date.');`
	`340`	`+ $this->errors[] = $this->l('Maximum Check-out Date to book a room can not be a past date. Please use a future date.');`
`341`	`341`	`}`
`342`	`342`	`}`
`343`	`343`
`344`	`344`	`if (!$enableUseGlobalPreparationTime) {`
`345`	`345`	`if ($preparationTime === '') {`
`346`		`- $this->errors[] = Tools::displayError('Preparation time is a required field.');`
	`346`	`+ $this->errors[] = $this->l('Preparation time is a required field.');`
`347`	`347`	`} elseif ($preparationTime !== '0' && !Validate::isUnsignedInt($preparationTime)) {`
`348`		`- $this->errors[] = Tools::displayError('Preparation time is invalid.');`
	`348`	`+ $this->errors[] = $this->l('Preparation time is invalid.');`
`349`	`349`	`}`
`350`	`350`	`}`
`351`	`351`	`}`