dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

//added russian installer and changed english strings

Browse Source
This commit is contained in:
vAugagneur
2013-03-13 16:28:19 +01:00
parent cb811a4e23 77efe4c04e
commit ee53bc4aea
645 changed files with 8683 additions and 7069 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/backup.php
+5 -5
View File
@@ -33,15 +33,15 @@ if (!Context::getContext()->employee->isLoggedBack())
$tabAccess = Profile::getProfileAccess(Context::getContext()->employee->id_profile, Tab::getIdFromClassName('AdminBackup'));
if ($tabAccess['view'] !== '1')
die (Tools::displayError('You do not have permission to view here'));
die (Tools::displayError('You do not have permission to view this.'));
$backupdir = realpath(_PS_ADMIN_DIR_ . '/backups/');
if ($backupdir === false)
die (Tools::displayError('"Backup" directory does not exist.'));
die (Tools::displayError('A "Backup" directory does not exist.'));
if (!$backupfile = Tools::getValue('filename'))
die (Tools::displayError('No file specified'));
die (Tools::displayError('No file has been specified.'));
// Check the realpath so we can validate the backup file is under the backup directory
$backupfile = realpath($backupdir.'/'.$backupfile);
@@ -58,7 +58,7 @@ else
$fp = @fopen($backupfile, 'r');
if ($fp === false)
die (Tools::displayError('Unable to open backup file').' "'.addslashes($backupfile).'"');
die (Tools::displayError('Unable to open backup file(s).').' "'.addslashes($backupfile).'"');
// Add the correct headers, this forces the file is saved
header('Content-Type: '.$contentType);
@@ -70,4 +70,4 @@ $ret = @fpassthru($fp);
fclose($fp);
if ($ret === false)
die (Tools::displayError('Unable to display backup file').' "'.addslashes($backupfile).'"');
die (Tools::displayError('Unable to display backup file(s).').' "'.addslashes($backupfile).'"');
admin-dev/functions.php
+1 -1
View File
@@ -250,7 +250,7 @@ function checkingTab($tab)
{
if (isset(AdminTab::$tabParenting[$tab]))
Tools::redirectAdmin('?tab='.AdminTab::$tabParenting[$tab].'&token='.Tools::getAdminTokenLite(AdminTab::$tabParenting[$tab]));
echo sprintf(Tools::displayError('Page %s cannot be found.'),$tab);
echo sprintf(Tools::displayError('Page %s cannot be found..'),$tab);
return false;
}
admin-dev/themes/default/template/controllers/backup/download/view.tpl
+2 -2
View File
@@ -51,7 +51,7 @@
</div>
<div class="warn width2" style="float: left;">
<p>{l s='How to restore a database Backup in 10 easy steps:'}</p>
<p>{l s='How to restore a database backup in 10 easy steps:'}</p>
<ol style="font-size: 11px; font-weight: normal; line-height: 20px;">
<li>{l s='Set "Enable Shop" to "No" in the "Maintenance" page under the "Preferences" menu.'}</li>
<li>{l s='Download the backup from the list below or from your FTP server (in the folder "admin/backups").'}</li>
@@ -61,7 +61,7 @@
<li>{l s='Unless you enabled the "Drop existing tables" option, you must delete all tables from your current database.'}</li>
<li>{l s='At the top of the screen, please select the "Import" tab'}</li>
<li>{l s='Click on the "Browse" button and select the backup file from your hard drive.'}</li>
<li>{l s='Check the max. allowed filesize (e.g. Max: 16MB)'}<br />{l s='If your backup file exceeds this limit, contact your hosting provider for assistence. '}</li>
<li>{l s='Check the maximum filesize allowed (e.g. Max: 16MB)'}<br />{l s='If your backup file exceeds this limit, contact your hosting provider for assistence. '}</li>
<li>{l s='Click on the "Go" button and please wait patiently for the import process to conclude. This may take several minutes.'}</li>
</ol>
</div>
admin-dev/themes/default/template/controllers/backup/helpers/list/list_header.tpl
+2 -2
View File
@@ -59,7 +59,7 @@
</div>
<div class="warn width2" style="float: left;">
<p>{l s='How to restore a database Backup in 10 easy steps:'}</p>
<p>{l s='How to restore a database backup in 10 easy steps:'}</p>
<ol style="font-size: 11px; font-weight: normal; line-height: 20px;">
<li>{l s='Set "Enable Shop" to "No" in the "Maintenance" page under the "Preferences" menu.'}</li>
<li>{l s='Download the backup from the list below or from your FTP server (in the folder "admin/backups").'}</li>
@@ -69,7 +69,7 @@
<li>{l s='Unless you enabled the "Drop existing tables" option, you must delete all tables from your current database.'}</li>
<li>{l s='At the top of the screen, please select the "Import" tab'}</li>
<li>{l s='Click on the "Browse" button and select the backup file from your hard drive.'}</li>
<li>{l s='Check the max. allowed filesize (e.g. Max: 16MB)'}<br />{l s='If your backup file exceeds this limit, contact your hosting provider for assistence. '}</li>
<li>{l s='Check the maximum filesize allowed (e.g. Max: 16MB)'}<br />{l s='If your backup file exceeds this limit, contact your hosting provider for assistence. '}</li>
<li>{l s='Click on the "Go" button and please wait patiently for the import process to conclude. This may take several minutes.'}</li>
</ol>
</div>
admin-dev/themes/default/template/controllers/cart_rules/conditions.tpl
+2 -2
View File
@@ -42,12 +42,12 @@
<label>{l s='Total available'}</label>
<div class="margin-form">
<input type="text" name="quantity" value="{$currentTab->getFieldValue($currentObject, 'quantity')|intval}" />
<p class="preference_description">{l s='The cart rule will be applied to the first X customers only.'}</p>
<p class="preference_description">{l s='The cart rule will be applied to the first "X" customers only.'}</p>
</div>
<label>{l s='Total available for each user.'}</label>
<div class="margin-form">
<input type="text" name="quantity_per_user" value="{$currentTab->getFieldValue($currentObject, 'quantity_per_user')|intval}" />
<p class="preference_description">{l s='A customer will only be able to use the cart rule X time(s).'}</p>
<p class="preference_description">{l s='A customer will only be able to use the cart rule "X" time(s).'}</p>
</div>
{if $countries.unselected|@count + $countries.selected|@count > 1}
<br />
admin-dev/themes/default/template/controllers/cart_rules/form.tpl
+3 -3
View File
@@ -20,17 +20,17 @@
{if $currentObject->id}<input type="hidden" name="id_cart_rule" value="{$currentObject->id|intval}" />{/if}
<input type="hidden" id="currentFormTab" name="currentFormTab" value="informations" />
<div id="cart_rule_informations" class="cart_rule_tab">
<h4>{l s='Cart rule information'}</h4>
<h4>{l s='Cart-rule information'}</h4>
<div class="separation"></div>
{include file='controllers/cart_rules/informations.tpl'}
</div>
<div id="cart_rule_conditions" class="cart_rule_tab">
<h4>{l s='Cart rule conditions'}</h4>
<h4>{l s='Cart-rule conditions'}</h4>
<div class="separation"></div>
{include file='controllers/cart_rules/conditions.tpl'}
</div>
<div id="cart_rule_actions" class="cart_rule_tab">
<h4>{l s='Cart rule actions'}</h4>
<h4>{l s='Cart-rule actions'}</h4>
<div class="separation"></div>
{include file='controllers/cart_rules/actions.tpl'}
</div>
admin-dev/themes/default/template/controllers/cart_rules/informations.tpl
+1 -1
View File
@@ -33,7 +33,7 @@
<input type="radio" name="highlight" id="highlight_off" value="0" {if !$currentTab->getFieldValue($currentObject, 'highlight')|intval}checked="checked"{/if} />
<label class="t" for="highlight_off"> <img src="../img/admin/disabled.gif" alt="{l s='No'}" title="{l s='No'}" style="cursor:pointer" /></label>
<p class="preference_description">
{l s='If the voucher is not yet in the cart, it will be displayed under the cart in the cart summary.'}
{l s='If the voucher is not yet in the cart, it will be displayed in the cart summary.'}
</p>
</div>
<label>{l s='Partial use'}</label>
admin-dev/themes/default/template/controllers/cart_rules/product_rule.tpl
+1 -1
View File
@@ -8,7 +8,7 @@
<input type="hidden" name="product_rule_{$product_rule_group_id|intval}[]" value="{$product_rule_id}" />
<input type="hidden" name="product_rule_{$product_rule_group_id|intval}_{$product_rule_id|intval}_type" value="{$product_rule_type|escape}" />
{* Everything is on a single line in order to avoid a empty space between the [ ] and the word *}
[{if $product_rule_type == 'products'}{l s='Products:'}{elseif $product_rule_type == 'categories'}{l s='Categories:'}{elseif $product_rule_type == 'manufacturers'}{l s='Manufacturers:'}{elseif $product_rule_type == 'suppliers'}{l s='Suppliers:'}{elseif $product_rule_type == 'attributes'}{l s='Attributes'}{/if}]
[{if $product_rule_type == 'products'}{l s='Products:'}{elseif $product_rule_type == 'categories'}{l s='Categories:'}{elseif $product_rule_type == 'manufacturers'}{l s='Manufacturers:'}{elseif $product_rule_type == 'suppliers'}{l s='Suppliers'}{elseif $product_rule_type == 'attributes'}{l s='Attributes'}{/if}]
</td>
<td>
{l s='The product(s) are matching on of these'}
admin-dev/themes/default/template/controllers/cart_rules/product_rule_group.tpl
+1 -1
View File
@@ -20,7 +20,7 @@
<option value="attributes">{l s='Attributes'}</option>
<option value="categories">{l s='Categories:'}</option>
<option value="manufacturers">{l s='Manufacturers:'}</option>
<option value="suppliers">{l s='Suppliers:'}</option>
<option value="suppliers">{l s='Suppliers'}</option>
</select>
<a href="javascript:addProductRule({$product_rule_group_id|intval});">
<input type="button" class="button" value="OK" />
admin-dev/themes/default/template/controllers/carts/helpers/view/view.tpl
+3 -3
View File
@@ -138,13 +138,13 @@
{/if}
{/foreach}
<tr class="cart_total_product">
<td colspan="5">{l s='Total products:'}</td>
<td colspan="5">{l s='Total cost of products:'}</td>
<td class="price bold right">{displayWtPriceWithCurrency price=$total_products currency=$currency}</td>
</tr>
{if $total_discounts != 0}
<tr class="cart_total_voucher">
<td colspan="5">{l s='Total vouchers:'}</td>
<td colspan="5">{l s='Total value of vouchers:'}</td>
<td class="price-discount bold right">{displayWtPriceWithCurrency price=$total_discounts currency=$currency}</td>
</tr>
{/if}
@@ -156,7 +156,7 @@
{/if}
{if $cart->getOrderTotal(true, Cart::ONLY_SHIPPING) > 0}
<tr class="cart_total_delivery">
<td colspan="5">{l s='Total shipping:'}</td>
<td colspan="5">{l s='Total cost of shipping:'}</td>
<td class="price bold right">{displayWtPriceWithCurrency price=$total_shipping currency=$currency}</td>
</tr>
{/if}
admin-dev/themes/default/template/controllers/customer_threads/helpers/list/list_header.tpl
+1 -1
View File
@@ -58,7 +58,7 @@
{else}
<a href="{$currentIndex}&token={$token}&id_customer_thread={$id_customer_thread}&viewcustomer_thread" class="button">
{$total_thread}
{if $total_thread > 1}{l s='new messages'}{else}{l s='new message'}{/if}
{if $total_thread > 1}{l s='New messages'}{else}{l s='New message'}{/if}
</a>
{/if}
</div>
admin-dev/themes/default/template/controllers/customer_threads/helpers/view/view.tpl
+1 -1
View File
@@ -51,7 +51,7 @@
</p>
<div id="message_forward_email" style="display:none">
<b>{l s='Email:'}</b> <input type="text" name="email" />
<b>{l s='Email'}</b> <input type="text" name="email" />
</div>
<div id="message_forward" style="display:none;margin-bottom:10px">
admin-dev/themes/default/template/controllers/customer_threads/message.tpl
+4 -4
View File
@@ -49,7 +49,7 @@
<dl>
<dt>{l s='Customer ID:'}</dd>
<dd><a href="index.php?tab=AdminCustomers&id_customer={$message.id_customer}&viewcustomer&token={getAdminToken tab='AdminCustomers'}" title="{l s='View customer'}">
{$message.id_customer} <img src="../img/admin/search.gif" alt="{l s='view'}" />
{$message.id_customer} <img src="../img/admin/search.gif" alt="{l s='View'}" />
</a>
</dd>
</dl>
@@ -73,7 +73,7 @@
<dt>{l s='File attachment'}</dt>
<dd><a href="index.php?tab=AdminCustomerThreads&id_customer_thread={$message.id_customer_thread}&viewcustomer_thread&token={getAdminToken tab='AdminCustomerThreads'}&filename={$message.file_name}"
title="{l s='View file'}">
<img src="../img/admin/search.gif" alt="{l s='view'}" />
<img src="../img/admin/search.gif" alt="{l s='View'}" />
</a>
</dd>
</dl>
@@ -83,7 +83,7 @@
<dl>
<dt>{l s='Order #'}</dt>
<dd><a href="index.php?tab=AdminOrders&id_order={$message.id_order}&vieworder&token={getAdminToken tab='AdminOrders'}" title="{l s='View order'}">
{$message.id_order} <img src="../img/admin/search.gif" alt="{l s='view'}" />
{$message.id_order} <img src="../img/admin/search.gif" alt="{l s='View'}" />
</a></dd>
</dl>
{/if}
@@ -92,7 +92,7 @@
<dl>
<dt>{l s='Product #'}</dt>
<dd><a href="index.php?tab=AdminProducts&id_product={$message.id_product}&updateproduct&token={getAdminToken tab='AdminProducts'}" title="{l s='View order'}">
{$message.id_product} <img src="../img/admin/search.gif" alt="{l s='view'}" />
{$message.id_product} <img src="../img/admin/search.gif" alt="{l s='View'}" />
</a></dd>
</dl>
{/if}
admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl
+4 -4
View File
@@ -70,7 +70,7 @@
<br /><br />
{l s='ID:'} {$customer->id|string_format:"%06d"}<br />
{l s='Registration date:'} {$registration_date}<br />
{l s='Last visit:'} {if $customer_stats['last_visit']}{$last_visit}{else}{l s='never'}{/if}<br />
{l s='Last visit:'} {if $customer_stats['last_visit']}{$last_visit}{else}{l s='Never'}{/if}<br />
{if $count_better_customers != '-'}{l s='Rank: #'} {$count_better_customers}<br />{/if}
{if $shop_is_feature_active}{l s='Shop:'} {$name_shop}<br />{/if}
</div>
@@ -84,17 +84,17 @@
{l s='Language:'} {if isset($customerLanguage)}{$customerLanguage->name}{else}{l s='undefined'}{/if}<br />
{l s='Newsletter:'} {if $customer->newsletter}<img src="../img/admin/enabled.gif" />{else}<img src="../img/admin/disabled.gif" />{/if}<br />
{l s='Opt in:'} {if $customer->optin}<img src="../img/admin/enabled.gif" />{else}<img src="../img/admin/disabled.gif" />{/if}<br />
{l s='Age:'} {$customer_stats['age']} {if isset($customer->birthday['age'])}({$customer_birthday}){else}{l s='unknown'}{/if}<br /><br />
{l s='Age:'} {$customer_stats['age']} {if isset($customer->birthday['age'])}({$customer_birthday}){else}{l s='Unknown'}{/if}<br /><br />
{l s='Last update:'} {$last_update}<br />
{l s='Status:'} {if $customer->active}<img src="../img/admin/enabled.gif" />{else}<img src="../img/admin/disabled.gif" />{/if}
{if $customer->isGuest()}
<div>
{l s='This customer is registered as.'} <b>{l s='guest'}</b>
{l s='This customer is registered as.'} <b>{l s='Guest'}</b>
{if !$customer_exists}
<form method="post" action="index.php?tab=AdminCustomers&id_customer={$customer->id}&token={getAdminToken tab='AdminCustomers'}">
<input type="hidden" name="id_lang" value="{$id_lang}" />
<p class="center"><input class="button" type="submit" name="submitGuestToCustomer" value="{l s='Transform to customer account'}" /></p>
<p class="center"><input class="button" type="submit" name="submitGuestToCustomer" value="{l s='Transform to a customer account'}" /></p>
{l s='This feature generates a random password before sending an email to your customer.'}
</form>
{else}
admin-dev/themes/default/template/controllers/images/content.tpl
+3 -3
View File
@@ -37,7 +37,7 @@
<form action="{$current}&token={$token}" method="post">
<fieldset class="width4">
<legend><img src="../img/admin/picture.gif" /> {l s='Regenerate thumbnails'}</legend><br />
<label>{l s='Select image'}</label>
<label>{l s='Select an image'}</label>
<div class="margin-form">
<select name="type" onchange="changeFormat(this)">
<option value="all">{l s='All'}</option>
@@ -48,7 +48,7 @@
</div>
{foreach $types AS $k => $type}
<label class="second-select format_{$k}" style="display:none;">{l s='Select format'}</label>
<label class="second-select format_{$k}" style="display:none;">{l s='Select a format'}</label>
<div class="second-select margin-form format_{$k}" style="display:none;">
<select class="second-select format_{$k}" name="format_{$k}">
<option value="all">{l s='All'}</option>
@@ -82,7 +82,7 @@
<br />
{if $safe_mode}
<div class="warn">
{l s='PrestaShop has detected that your server configuration is not compatible with the new storage system (directive "safe_mode" is activated). You should continue to use the existing system.'}
{l s='PrestaShop has detected that your server configuration is not compatible with the new storage system (directive "safe_mode" is activated). You should therefore continue to use the existing system.'}
</div>
{else}
<form action="{$current}&token={$token}" method="post">
admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
+5 -5
View File
@@ -50,7 +50,7 @@
console.log(truncateAuthorized);
if (truncateAuthorized)
{
if (!confirm('{l s='Are you sure you want to delete' js=1}' + ' ' + $.trim($('#entity > option:selected').text().toLowerCase()) + '{l s='?' js=1}'))
if (!confirm('{l s='Are you sure that you would like to delete this' js=1}' + ' ' + $.trim($('#entity > option:selected').text().toLowerCase()) + '{l s='?' js=1}'))
{
e.preventDefault();
}
@@ -126,7 +126,7 @@
<a href="#upload_file_import" id="upload_file_import_link" class="button"><img src="../img/admin/add.gif" alt="Uplaod" title="Upload" />{l s='Upload'}</a>
</div>
<div style="width:50%; margin: 0 auto;">
<a href="#" onclick="$('#sample_files_import').slideToggle(); return false;">{l s='Click to see our samples import csv files.'}</a>
<a href="#" onclick="$('#sample_files_import').slideToggle(); return false;">{l s='Click to view our sample import csv files.'}</a>
<ul id="sample_files_import" style="display:none">
<li><a href="../docs/csv_import/categories_import.csv">{l s='Sample Categories file'}</a></li>
<li><a href="../docs/csv_import/products_import.csv">{l s='Sample Products file'}</a></li>
@@ -190,14 +190,14 @@
</div>
<div class="space margin-form">
<input type="submit" name="submitImportFile" value="{l s='Next step'}" class="button" {if empty($files_to_import)}disabled{/if}/>
{if empty($files_to_import)}<span style="color:red;">{l s='You must upload a file for go to the next step.'}</span>{/if}
{if empty($files_to_import)}<span style="color:red;">{l s='You must upload a file in order to proceed to the next step'}</span>{/if}
</div>
<div class="warn import_products_categories" style="margin-top: 20px;">
<p>{l s='Note that the category import does not support categories of the same name.'}</p>
<p>{l s='Note that you can have several products with the same reference.'}</p>
</div>
<div class="warn import_supply_orders_details" style="margin-top: 20px; display:none">
<p>{l s='Importing Supply Order Details will first reset the products ordered, if any.'}</p>
<p>{l s='Importing Supply Order Details will reset products ordered, if there are any.'}</p>
</div>
{if !count($files_to_import)}
<div class="warn" style="margin-top: 20px;">
@@ -222,7 +222,7 @@
</div>
<div class="clear">
<br /><br />{l s='*Required field'}
<br /><br />{l s='* Required field'}
</div>
</fieldset>
admin-dev/themes/default/template/controllers/information/helpers/view/view.tpl
+2 -2
View File
@@ -70,7 +70,7 @@
</script>
<fieldset>
<legend><img src="../img/t/AdminInformation.gif" alt="" />{l s='Configuration Information'}</legend>
<legend><img src="../img/t/AdminInformation.gif" alt="" />{l s='Configuration information'}</legend>
<p>{l s='This information must be provided when you report an issue on our bug tracker or forum.'}</p>
</fieldset>
<br />
@@ -113,7 +113,7 @@
<hr />
<h3>{l s='Store information'}</h3>
<p>
<b>{l s='Prestashop version'}:</b> {$shop.ps|escape:'htmlall':'UTF-8'}
<b>{l s='PrestaShop version'}:</b> {$shop.ps|escape:'htmlall':'UTF-8'}
</p>
<p>
<b>{l s='Shop URL'}:</b> {$shop.url|escape:'htmlall':'UTF-8'}
admin-dev/themes/default/template/controllers/languages/helpers/form/form.tpl
+1 -1
View File
@@ -39,7 +39,7 @@
var langPackOk = "<img src=\"{$smarty.const._PS_IMG_}admin/information.png\" alt=\"\" /> {l s='A language pack is available for this ISO.'}";
var langPackVersion = "{l s='The Prestashop version compatible with this language and your system is:'}";
var langPackInfo = "{l s='After creating the language, you can import the content of the language pack, which you can download under "Localization -- Translations."'}";
var noLangPack = "<img src=\"{$smarty.const._PS_IMG_}admin/information.png\" alt=\"\" /> {l s='No language pack available on prestashop.com for this ISO code'}";
var noLangPack = "<img src=\"{$smarty.const._PS_IMG_}admin/information.png\" alt=\"\" /> {l s='No language pack is available on prestashop.com for this ISO code'}";
var download = "{l s='Download'}";
$(document).ready(function() {
admin-dev/themes/default/template/controllers/manufacturers/helpers/view/view.tpl
+2 -2
View File
@@ -29,7 +29,7 @@
<h2>{$manufacturer->name}</h2>
<h3>{l s='Total addresses:'} {count($addresses)}</h3>
<h3>{l s='Total addresses'} {count($addresses)}</h3>
<hr />
{if !count($addresses)}
@@ -60,7 +60,7 @@
{/foreach}
{/if}
<h3>{l s='Total products:'} {count($products)}</h3>
<h3>{l s='Total products'} {count($products)}</h3>
{foreach $products AS $product}
<hr />
{if !$product->hasAttributes()}
admin-dev/themes/default/template/controllers/modules/favorites.tpl
+1 -1
View File
@@ -27,7 +27,7 @@
<th>{l s='Description'}</th>
<th>{l s='Status'}</th>
<th>{l s='Tab'}</th>
<th>{l s='Categories:'}</th>
<th>{l s='Categories'}</th>
<th>{l s='Interest'}</th>
<th>{l s='Favorite'}</th>
<th>&nbsp;</th>
admin-dev/themes/default/template/controllers/modules/filters.tpl
+2 -2
View File
@@ -47,7 +47,7 @@
<div class="filter-module" id="addons_login_div">
<p>{l s='Do you have a %s account?' sprintf='<a href="http://addons.prestashop.com/">PrestaShop Addons</a>'}</p>
<form id="addons_login_form" method="post">
<label>{l s='Login to Addons'} :</label> <input type="text" value="" id="username_addons" autocomplete="off" class="ac_input">
<label>{l s='Addons Login'} :</label> <input type="text" value="" id="username_addons" autocomplete="off" class="ac_input">
<label>{l s= 'Password Addons'} :</label> <input type="password" value="" id="password_addons" autocomplete="off" class="ac_input">
<input type="submit" class="button" id="addons_login_button" value="{l s='Log in'}">
<br /><span id="addons_loading" style="color:red"></span>
@@ -64,7 +64,7 @@
<div class="filter-module">
<form id="filternameForm" method="post">
<input type="text" value="" name="filtername" autocomplete="off" class="ac_input">
<input type="submit" class="button" value="{l s='Search:'}">
<input type="submit" class="button" value="{l s='Search'}">
</form>
<form method="post">
<div class="select-filter">
admin-dev/themes/default/template/controllers/modules/page.tpl
+1 -1
View File
@@ -36,7 +36,7 @@
<!--start sidebar module-->
<div class="sidebar">
<div class="categorieTitle">
<h3>{l s='Categories:'}</h3>
<h3>{l s='Categories'}</h3>
<div class="subHeadline">&nbsp;</div>
<ul class="categorieList">
<li {if isset($categoryFiltered.favorites)}style="background-color:#EBEDF4"{/if} class="categoryModuleFilterLink">
admin-dev/themes/default/template/controllers/modules_positions/list_modules.tpl
+1 -1
View File
@@ -79,7 +79,7 @@
</colgroup>
<tr class="nodrag nodrop"><th colspan="5"> {if $hook['module_count'] && $can_move}
<input type="checkbox" id="Ghook{$hook['id_hook']}" style="margin-right: 2px;" onclick="hookCheckboxes({$hook['id_hook']}, 0, this)"/>
{/if}{$hook['title']} - <span style="color: red">{$hook['module_count']}</span> {if $hook['module_count'] > 1}{l s='modules'}{else}{l s='module'}{/if}
{/if}{$hook['title']} - <span style="color: red">{$hook['module_count']}</span> {if $hook['module_count'] > 1}{l s='Modules'}{else}{l s='Module'}{/if}
{if !empty($hook['description'])}
&nbsp;<span style="font-size:0.8em; font-weight: normal">[{$hook['description']}]</span>
admin-dev/themes/default/template/controllers/orders/_documents.tpl
+1 -1
View File
@@ -128,7 +128,7 @@
{foreachelse}
<tr>
<td colspan="5" class="center">
<h3>{l s='No document is available'}</h3>
<h3>{l s='No documents are available'}</h3>
{if isset($invoice_management_active) && $invoice_management_active}
<p><a class="button" href="{$current_index}&viewOrder&submitGenerateInvoice&id_order={$order->id}&token={$smarty.get.token|escape:'htmlall':'UTF-8'}">{l s='Generate invoice'}</a></p>
{/if}
admin-dev/themes/default/template/controllers/orders/_new_product.tpl
+3 -3
View File
@@ -27,10 +27,10 @@
<input type="hidden" id="add_product_product_id" name="add_product[product_id]" value="0" />
{l s='Product:'} <input type="text" id="add_product_product_name" value="" size="42" />
<div id="add_product_product_attribute_area" style="margin-top: 5px;display: none;">
{l s='Combinations:'} <select name="add_product[product_attribute_id]" id="add_product_product_attribute_id"></select>
{l s='Combinations'} <select name="add_product[product_attribute_id]" id="add_product_product_attribute_id"></select>
</div>
<div id="add_product_product_warehouse_area" style="margin-top: 5px; display: none;">
{l s='Warehouse:'} <select id="add_product_warehouse" name="add_product_warehouse">
{l s='Warehouse'} <select id="add_product_warehouse" name="add_product_warehouse">
</select>
</div>
</td>
@@ -64,7 +64,7 @@
<tr id="new_invoice" style="display:none;background-color:#e9f1f6;">
<td colspan="10">
<h3>{l s='New invoice information'}</h3>
<label>{l s='Carrier:'}</label>
<label>{l s='Carrier'}</label>
<div class="margin-form">
{$carrier->name}
</div>
admin-dev/themes/default/template/controllers/orders/_shipping.tpl
+1 -1
View File
@@ -32,7 +32,7 @@
</colgroup>
<thead>
<tr>
<th>{l s='Date:'}</th>
<th>{l s='Date'}</th>
<th>{l s='Type'}</th>
<th>{l s='Carrier'}</th>
<th>{l s='Weight'}</th>
admin-dev/themes/default/template/controllers/orders/form.tpl
+25 -25
View File
@@ -34,7 +34,7 @@
var id_currency = '';
var id_lang = '';
var txt_show_carts = '{l s='Show carts and orders for this customer.'}';
var txt_hide_carts = '{l s='Hide carts and orders for this customer'}';
var txt_hide_carts = '{l s='Hide carts and orders for this customer.'}';
var defaults_order_state = new Array();
var customization_errors = false;
var pic_dir = '{$pic_dir}';
@@ -560,7 +560,7 @@
customization_errors = false;
$('#products_found').show();
products_found += '<label>{l s='Product:'}</label><select id="id_product" onclick="display_product_attributes();display_product_customizations();">';
attributes_html += '<label>{l s='Combination:'}</label>';
attributes_html += '<label>{l s='Combination'}</label>';
$.each(res.products, function() {
products_found += '<option '+(this.combinations.length > 0 ? 'rel="'+this.qty_in_stock+'"' : '')+' value="'+this.id_product+'">'+this.name+(this.combinations.length == 0 ? ' - '+this.formatted_price : '')+'</option>';
attributes_html += '<select class="id_product_attribute" id="ipa_'+this.id_product+'" style="display:none;">';
@@ -983,7 +983,7 @@
<fieldset id="customer_part">
<legend><img src="../img/admin/tab-customers.gif" />{l s='Customer'}</legend>
<label>{l s='Search customers:'}</label>
<label>{l s='Search customers'}</label>
<div class="margin-form">
<input type="text" id="customer" value="" />
<p>{l s='Search a customer by tapping the first letters of his/her name'}</p>
@@ -997,7 +997,7 @@
<form action="{$link->getAdminLink('AdminOrders')|escape:'htmlall':'UTF-8'}&submitAdd{$table}=1" method="post" autocomplete="off">
<fieldset id="products_part" style="display:none;"><legend><img src="../img/t/AdminCatalog.gif" />{l s='Cart'}</legend>
<div>
<label>{l s='Search a product:'} </label>
<label>{l s='Search for a product'} </label>
<div class="margin-form">
<input type="hidden" value="" id="id_cart" name="id_cart" />
<input type="text" id="product" value="" />
@@ -1021,7 +1021,7 @@
</body>
</html>
</iframe>
<p><label for="qty">{l s='Quantity:'}</label><input type="text" name="qty" id="qty" value="1" />&nbsp;<b>{l s='In stock:'}</b>&nbsp;<span id="qty_in_stock"></span></p>
<p><label for="qty">{l s='Quantity:'}</label><input type="text" name="qty" id="qty" value="1" />&nbsp;<b>{l s='In stock'}</b>&nbsp;<span id="qty_in_stock"></span></p>
<div class="margin-form">
<p><input type="submit" onclick="addProduct();return false;" class="button" id="submitAddProduct" value="{l s='Add to cart'}"/></p>
</div>
@@ -1054,7 +1054,7 @@
<p><b>{l s='The prices are without taxes.'}</b></p>
</div>
<div>
<p><label for="id_currency">{l s='Currency:'}</label>
<p><label for="id_currency">{l s='Currency'}</label>
<script type="text/javascript">
{foreach from=$currencies item='currency'}
currencies['{$currency.id_currency}'] = '{$currency.sign}';
@@ -1067,7 +1067,7 @@
</select>
</p>
<p>
<label for="id_lang">{l s='Language:'}</label>
<label for="id_lang">{l s='Language'}</label>
<select id="id_lang" name="id_lang">
{foreach from=$langs item='lang'}
<option value="{$lang.id_lang}">{$lang.name}</option>
@@ -1080,7 +1080,7 @@
<p><a href="#" id="show_old_carts" class="button"></a></p>
<div id="old_carts_orders">
<div id="nonOrderedCarts">
<h3>{l s='Carts:'}</h3>
<h3>{l s='Carts'}</h3>
<table cellspacing="0" cellpadding="0" class="table width5">
<colgroup>
<col width="10px">
@@ -1101,7 +1101,7 @@
</table>
</div>
<div id="lastOrders">
<h3>{l s='Orders:'}</h3>
<h3>{l s='Orders'}</h3>
<table cellspacing="0" cellpadding="0" class="table width5">
<colgroup>
<col width="10px">
@@ -1159,14 +1159,14 @@
<legend><img src="../img/t/AdminAddresses.gif" />{l s='Addresses'}</legend>
<div id="addresses_err" class="warn" style="display:none;"></div>
<div id="address_delivery">
<h3>{l s='Delivery:'}</h3>
<h3>{l s='Delivery'}</h3>
<select id="id_address_delivery" name="id_address_delivery">
</select>
<div id="address_delivery_detail">
</div>
</div>
<div id="address_invoice">
<h3>{l s='Invoice:'}</h3>
<h3>{l s='Invoice'}</h3>
<select id="id_address_invoice" name="id_address_invoice">
</select>
<div id="address_invoice_detail">
@@ -1176,20 +1176,20 @@
</fieldset>
<br />
<fieldset id="carriers_part" style="display:none;">
<legend><img src="../img/t/AdminCarriers.gif" />{l s='Shipping:'}</legend>
<legend><img src="../img/t/AdminCarriers.gif" />{l s='Shipping'}</legend>
<div id="carriers_err" style="display:none;" class="warn"></div>
<div id="carrier_form">
<div>
<p>
<label>{l s='Delivery option:'} </label>
<label>{l s='Delivery option'} </label>
<select name="delivery_option" id="delivery_option">
</select>
</p>
<p>
<label for="shipping_price">{l s='Shipping price:'}</label> <span id="shipping_price" name="shipping_price"></span>&nbsp;<span class="currency_sign"></span>&nbsp;
<label for="shipping_price">{l s='Shipping price'}</label> <span id="shipping_price" name="shipping_price"></span>&nbsp;<span class="currency_sign"></span>&nbsp;
</p>
<p>
<label for="free_shipping">{l s='Free shipping:'}</label>
<label for="free_shipping">{l s='Free shipping'}</label>
<input type="checkbox" id="free_shipping" name="free_shipping" value="1" />
</p>
</div>
@@ -1199,7 +1199,7 @@
{/if}
{if $gift_wrapping}
<p><input type="checkbox" name="order_gift" id="order_gift" value="1" /> <label for="order_gift">{l s='Gift'}</label></p>
<p><label for="gift_message">{l s='Gift message:'}</label><textarea id="gift_message" cols="40" rows="4"></textarea></p>
<p><label for="gift_message">{l s='Gift message'}</label><textarea id="gift_message" cols="40" rows="4"></textarea></p>
{/if}
</div>
</div>
@@ -1210,16 +1210,16 @@
<div id="send_email_feedback"></div>
<div id="cart_summary" style="clear:both;float:left;">
<ul>
<li><span class="total_cart">{l s='Total products:'}</span><span id="total_products"></span><span class="currency_sign"></span></li>
<li><span class="total_cart">{l s='Total vouchers:'}</span><span id="total_vouchers"></span><span class="currency_sign"></span></li>
<li><span class="total_cart">{l s='Total shipping:'}</span><span id="total_shipping"></span><span class="currency_sign"></span></li>
<li><span class="total_cart">{l s='Total taxes:'}</span><span id="total_taxes"></span><span class="currency_sign"></span></li>
<li><span class="total_cart">{l s='Total without taxes:'}</span><span id="total_without_taxes"></span><span class="currency_sign"></span></li>
<li><span class="total_cart">{l s='Total with taxes:'}</span><span id="total_with_taxes"></span><span class="currency_sign"></span></li>
<li><span class="total_cart">{l s='Total products'}</span><span id="total_products"></span><span class="currency_sign"></span></li>
<li><span class="total_cart">{l s='Total vouchers'}</span><span id="total_vouchers"></span><span class="currency_sign"></span></li>
<li><span class="total_cart">{l s='Total shipping'}</span><span id="total_shipping"></span><span class="currency_sign"></span></li>
<li><span class="total_cart">{l s='Total taxes'}</span><span id="total_taxes"></span><span class="currency_sign"></span></li>
<li><span class="total_cart">{l s='Total without taxes'}</span><span id="total_without_taxes"></span><span class="currency_sign"></span></li>
<li><span class="total_cart">{l s='Total with taxes'}</span><span id="total_with_taxes"></span><span class="currency_sign"></span></li>
</ul>
</div>
<div class="order_message_right">
<label for="order_message">{l s='Order message:'}</label>
<label for="order_message">{l s='Order message'}</label>
<div class="margin-form">
<textarea name="order_message" id="order_message" rows="3" cols="45"></textarea>
</div>
@@ -1229,7 +1229,7 @@
<div class="margin-form">
<a target="_blank" id="go_order_process" href="" class="button">{l s='Go on payment page to process the payment.'}</a>
</div>
<label>{l s='Payment:'}</label>
<label>{l s='Payment'}</label>
<div class="margin-form">
<select name="payment_module_name" id="payment_module_name">
{foreach from=$payment_modules item='module'}
@@ -1237,7 +1237,7 @@
{/foreach}
</select>
</div>
<label>{l s='Order status:'}</label>
<label>{l s='Order status'}</label>
<div class="margin-form">
<select name="id_order_state" id="id_order_state">
{foreach from=$order_states item='order_state'}
admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
+21 -21
View File
@@ -84,7 +84,7 @@
</div>
<div class="metadata-command">
<dl>
<dt>{l s='Date:'} </dt>
<dt>{l s='Date'} </dt>
<dd>{dateFormat date=$order->date_add full=true}</dd>
|</dl>
<dl>
@@ -100,7 +100,7 @@
<dd id="product_number">{sizeof($products)}</dd>
|</dl>
<dl>
<dt>{l s='Total:'}</dt>
<dt>{l s='Total'}</dt>
<dd class="total_paid">{displayPrice price=$order->total_paid_tax_incl currency=$currency->id}</dd>
</dl>
<div class="clear"></div>
@@ -162,7 +162,7 @@
{if (!Customer::customerExists($customer->email))}
<form method="post" action="index.php?tab=AdminCustomers&id_customer={$customer->id}&token={getAdminToken tab='AdminCustomers'}">
<input type="hidden" name="id_lang" value="{$order->id_lang}" />
<p class="center"><input class="button" type="submit" name="submitGuestToCustomer" value="{l s='Transform guest into customer'}" /></p>
<p class="center"><input class="button" type="submit" name="submitGuestToCustomer" value="{l s='Transform a guest into a customer'}" /></p>
{l s='This feature will generate a random password and send an email to the customer.'}
</form>
{else}
@@ -185,9 +185,9 @@
{foreach from=$sources item=source}
<li>
{dateFormat date=$source['date_add'] full=true}<br />
<b>{l s='From:'}</b>{if $source['http_referer'] != ''}<a href="{$source['http_referer']}">{parse_url($source['http_referer'], $smarty.const.PHP_URL_HOST)|regex_replace:'/^www./':''}</a>{else}-{/if}<br />
<b>{l s='To:'}</b> <a href="http://{$source['request_uri']}">{$source['request_uri']|truncate:100:'...'}</a><br />
{if $source['keywords']}<b>{l s='Keywords:'}</b> {$source['keywords']}<br />{/if}<br />
<b>{l s='From'}</b>{if $source['http_referer'] != ''}<a href="{$source['http_referer']}">{parse_url($source['http_referer'], $smarty.const.PHP_URL_HOST)|regex_replace:'/^www./':''}</a>{else}-{/if}<br />
<b>{l s='To'}</b> <a href="http://{$source['request_uri']}">{$source['request_uri']|truncate:100:'...'}</a><br />
{if $source['keywords']}<b>{l s='Keywords'}</b> {$source['keywords']}<br />{/if}<br />
</li>
{/foreach}
</ul>
@@ -266,8 +266,8 @@
{if (!$order->valid && sizeof($currencies) > 1)}
<form method="post" action="{$currentIndex}&vieworder&id_order={$order->id}&token={$smarty.get.token|escape:'htmlall':'UTF-8'}">
<p class="warn">{l s='Don\'t forget to update your conversion rate before make this change.'}</p>
<label>{l s='Don\'t forget to update your conversion rate before make this change.'}</label>
<p class="warn">{l s='Don\'t forget to update your conversion rate before making this change.'}</p>
<label>{l s='Don\'t forget to update your conversion rate before making this change.'}</label>
<select name="new_currency">
{foreach from=$currencies item=currency_change}
{if $currency_change['id_currency'] != $order->id_currency}
@@ -282,13 +282,13 @@
{if count($order->getOrderPayments()) > 0}
<p class="error" style="{if round($orders_total_paid_tax_incl, 2) == round($total_paid, 2) || $currentState->id == 6}display: none;{/if}">
{l s='Warning:'} {displayPrice price=$total_paid currency=$currency->id}
{l s='Warning'} {displayPrice price=$total_paid currency=$currency->id}
{l s='paid instead of'} <span class="total_paid">{displayPrice price=$orders_total_paid_tax_incl currency=$currency->id}</span>
{foreach $order->getBrother() as $brother_order}
{if $brother_order@first}
{if count($order->getBrother()) == 1}
<br />{l s='This warning also concerns the order '}
<br />{l s='This warning also concerns order '}
{else}
<br />{l s='This warning also concerns the next orders:'}
{/if}
@@ -339,7 +339,7 @@
<tr class="payment_information" style="display: none;">
<td colspan="6">
<p>
<b>{l s='Card Number:'}</b>&nbsp;
<b>{l s='Card Number'}</b>&nbsp;
{if $payment->card_number}
{$payment->card_number}
{else}
@@ -348,7 +348,7 @@
</p>
<p>
<b>{l s='Card Brand:'}</b>&nbsp;
<b>{l s='Card Brand'}</b>&nbsp;
{if $payment->card_brand}
{$payment->card_brand}
{else}
@@ -357,7 +357,7 @@
</p>
<p>
<b>{l s='Card Expiration:'}</b>&nbsp;
<b>{l s='Card Expiration'}</b>&nbsp;
{if $payment->card_expiration}
{$payment->card_expiration}
{else}
@@ -366,7 +366,7 @@
</p>
<p>
<b>{l s='Card Holder:'}</b>&nbsp;
<b>{l s='Card Holder'}</b>&nbsp;
{if $payment->card_holder}
{$payment->card_holder}
{else}
@@ -378,7 +378,7 @@
{foreachelse}
<tr>
<td colspan="6" class="center">
<h3>{l s='No payment available'}</h3>
<h3>{l s='No payments are available'}</h3>
</td>
</tr>
{/foreach}
@@ -422,10 +422,10 @@
<!-- Shipping block -->
{if !$order->isVirtual()}
<fieldset>
<legend><img src="../img/admin/delivery.gif" /> {l s='Shipping:'}</legend>
<legend><img src="../img/admin/delivery.gif" /> {l s='Shipping'}</legend>
<div class="clear" style="float: left; margin-right: 10px;">
<span>{l s='Recycled packaging:'}</span>
<span>{l s='Recycled packaging'}</span>
{if $order->recyclable}
<img src="../img/admin/enabled.gif" />
{else}
@@ -433,13 +433,13 @@
{/if}
</div>
<div style="float: left;">
<span>{l s='Gift-wrapping:'}</span>
<span>{l s='Gift wrapping'}</span>
{if $order->gift}
<img src="../img/admin/enabled.gif" />
</div>
<div style="clear: left; margin: 0px 42px 0px 42px; padding-top: 2px;">
{if $order->gift_message}
<div style="border: 1px dashed #999; padding: 5px; margin-top: 8px;"><b>{l s='Message:'}</b><br />{$order->gift_message|nl2br}</div>
<div style="border: 1px dashed #999; padding: 5px; margin-top: 8px;"><b>{l s='Message'}</b><br />{$order->gift_message|nl2br}</div>
{/if}
{else}
<img src="../img/admin/disabled.gif" />
@@ -661,7 +661,7 @@
<td class="partial_refund_fields current-edit" style="display:none;">&nbsp;</td>
</tr>
<tr id="total_shipping">
<td><b>{l s='Shipping:'}</b></td>
<td><b>{l s='Shipping'}</b></td>
<td class="amount" align="right">{displayPrice price=$order->total_shipping_tax_incl currency=$currency->id}</td>
<td class="partial_refund_fields current-edit" style="display:none;">{$currency->prefix}<input type="text" size="3" name="partialRefundShippingCost" value="0" />{$currency->suffix}</td>
</tr>
@@ -780,7 +780,7 @@
{/if}
{l s='At'} <i>{dateFormat date=$message['date_add']}
</i> {l s='from'} <b>{if ($message['elastname']|escape:'htmlall':'UTF-8')}{$message['efirstname']|escape:'htmlall':'UTF-8'} {$message['elastname']|escape:'htmlall':'UTF-8'}{else}{$message['cfirstname']|escape:'htmlall':'UTF-8'} {$message['clastname']|escape:'htmlall':'UTF-8'}{/if}</b>
{if ($message['private'] == 1)}<span style="color:red; font-weight:bold;">{l s='Private:'}</span>{/if}
{if ($message['private'] == 1)}<span style="color:red; font-weight:bold;">{l s='Private'}</span>{/if}
<p>{$message['message']|escape:'htmlall':'UTF-8'|nl2br}</p>
</div>
<br />
admin-dev/themes/default/template/controllers/products/attachments.tpl
+1 -1
View File
@@ -48,7 +48,7 @@
{/foreach}
</div>
<div class="clear">&nbsp;</div>
<label>{l s='File'}</label>
<label>{l s='File:'}</label>
<div class="margin-form">
<p><input type="file" name="attachment_file" /></p>
<p class="preference_description">{l s='Upload a file from your computer'} ({$PS_ATTACHMENT_MAXIMUM_SIZE|string_format:"%.2f"} {l s='MB max.'})</p>
admin-dev/themes/default/template/controllers/products/combinations.tpl
+3 -3
View File
@@ -46,9 +46,9 @@
{/foreach}
</script>
<h4>{l s='Add or modify combinations for this product.'}</h4>
<div class="separation"></div> {l s='or use the'}
<div class="separation"></div> {l s='Or use the'}
&nbsp;<a class="button bt-icon confirm_leave" href="index.php?tab=AdminAttributeGenerator&id_product={$product->id}&attributegenerator&token={$token_generator}"><img src="../img/admin/appearance.gif" alt="combinations_generator" class="middle" title="{l s='Product combinations generator'}" /><span>{l s='Product combinations generator'}</span></a>
{l s='in order to automatically create a set of combinations'}
{l s='in order to automatically create a set of combinations.'}
{if $combination_exists}
<div class="warn" style="display:block">
<ul>
@@ -131,7 +131,7 @@
<td style="padding-bottom:5px;">
{if $currency->format % 2 != 0}{$currency->sign}{/if}
<input type="text" size="6" name="attribute_wholesale_price" id="attribute_wholesale_price" value="" onKeyUp="if (isArrowKey(event)) return ;this.value = this.value.replace(/,/g, '.');" />
{if $currency->format % 2 == 0} {$currency->sign} {/if}<span id="attribute_wholesale_price_blank">({l s='leave blank if the price does not change'})</span>
{if $currency->format % 2 == 0} {$currency->sign} {/if}<span id="attribute_wholesale_price_blank">({l s='Leave blank if the price does not change'})</span>
<span style="display:none" id="attribute_wholesale_price_full">({l s='Overrides wholesale price on "Information" tab'})</span>
</td>
</tr>
admin-dev/themes/default/template/controllers/products/seo.tpl
+1 -1
View File
@@ -84,7 +84,7 @@
<p class="clear" style="padding:10px 0 0 0">
<a style="cursor:pointer" class="button"
onmousedown="updateFriendlyURLByName();">{l s='Generate'}</a>&nbsp;
{l s='Friendly URL. From the product name.'}<br /><br />
{l s='friendly URL from the product name.'}<br /><br />
{l s='The product link will look like this:'}
{$curent_shop_url|escape:'htmlall':'UTF-8'}lang/{if isset($product->id)}{$product->id}{else}<b>id_product</b>{/if}-<span id="friendly-url">{$product->link_rewrite[$default_language]}</span>.html</p>
</td>
admin-dev/themes/default/template/controllers/products/shipping.tpl
+1 -1
View File
@@ -25,7 +25,7 @@
<input type="hidden" name="submitted_tabs[]" value="Shipping" />
<h4 class="tab">1. {l s='Info.'}</h4>
<h4>{l s='Shipping:'}</h4>
<h4>{l s='Shipping'}</h4>
{if isset($display_common_field) && $display_common_field}
<div class="hint" style="display: block">{l s='Warning, if you change the value of fields with an orange bullet %s, the value will be changed for all other shops for this product' sprintf=$bullet_common_field}</div>
admin-dev/themes/default/template/controllers/products/suppliers.tpl
+1 -1
View File
@@ -36,7 +36,7 @@
</div>
<p>{l s='Please choose the suppliers associated with this product. Please select a default supplier, as well.'}</p>
<a class="button bt-icon confirm_leave" href="{$link->getAdminLink('AdminSuppliers')|escape:'htmlall':'UTF-8'}&addsupplier">
<img src="../img/admin/add.gif" alt="{l s='Create a new supplier.'}" title="{l s='Create a new supplier.'}" /><span>{l s='Create a new supplier.'}</span>
<img src="../img/admin/add.gif" alt="{l s='Create a new supplier'}" title="{l s='Create a new supplier'}" /><span>{l s='Create a new supplier'}</span>
</a>
<table cellpadding="5" style="width:100%">
<tbody>
admin-dev/themes/default/template/controllers/referrers/helpers/view/view.tpl
+1 -1
View File
@@ -116,7 +116,7 @@
</select>
</div>
<br class="clear" />
<label>{l s='Search:'}</label>
<label>{l s='Search'}</label>
<div class="margin-left">
<input type="text" size="34" id="filterProduct" name="filterProduct" onkeyup="fillProducts();" />
</div>
admin-dev/themes/default/template/controllers/specific_price_rule/helpers/form/form.tpl
+5 -5
View File
@@ -37,7 +37,7 @@
<div id="condition_list">
<h3>{l s='Conditions'}</h3>
<div class="row">
<label for="id_category">{l s='Category:'}</label>
<label for="id_category">{l s='Category'}</label>
<div class="margin-form">
<select id="id_category" name="id_category">
{foreach from=$categories item='category'}
@@ -52,7 +52,7 @@
</div>
<div class="row">
<label for="id_manufacturer">{l s='Manufacturer:'}</label>
<label for="id_manufacturer">{l s='Manufacturer'}</label>
<div class="margin-form">
<select id="id_manufacturer" name="id_manufacturer">
{foreach from=$manufacturers item='manufacturer'}
@@ -67,7 +67,7 @@
</div>
<div class="row">
<label for="id_supplier">{l s='Supplier:'}</label>
<label for="id_supplier">{l s='Supplier'}</label>
<div class="margin-form">
<select id="id_supplier" name="id_supplier">
{foreach from=$suppliers item='supplier'}
@@ -82,7 +82,7 @@
</div>
<div class="row">
<label for="id_attribute">{l s='Attributes:'}</label>
<label for="id_attribute">{l s='Attributes'}</label>
<div class="margin-form">
<select id="id_attribute_group">
{foreach from=$attributes_group item='attribute_group'}
@@ -105,7 +105,7 @@
</div>
<div class="row">
<label for="id_attribute">{l s='Features:'}</label>
<label for="id_attribute">{l s='Features'}</label>
<div class="margin-form">
<select id="id_feature">
{foreach from=$features item='feature'}
admin-dev/themes/default/template/controllers/suppliers/helpers/view/view.tpl
+1 -1
View File
@@ -35,7 +35,7 @@
{if !$product->hasAttributes()}
<table border="0" cellpadding="0" cellspacing="0" class="table" style="">
<tr>
<th width="450">{l s='Name:'} {$product->name}</th>
<th width="450">{l s='Name'} {$product->name}</th>
{if !empty($product->product_supplier_reference)}<th width="190">{l s='Supplier Reference:'} {$product->product_supplier_reference}</th>{/if}
{if !empty($product->product_supplier_price_te)}<th width="190">{l s='Wholesale price:'} {$product->product_supplier_price_te}</th>{/if}
{if !empty($product->reference)}<th width="150">{l s='Reference:'} {$product->reference}</th>{/if}
admin-dev/themes/default/template/controllers/translations/helpers/view/main.tpl
+3 -3
View File
@@ -55,8 +55,8 @@
<fieldset>
<legend><img src="../img/admin/translation.gif" />{l s='Modify translations'}</legend>
{l s='Here you can modify translations for every line of copy inside PrestaShop.'}<br />
{l s='First, select a section (such as Back Office or Modules), then click the flag representing the language you want to edit.'}<br /><br />
{l s='Here you can modify translations for every line of code inside PrestaShop.'}<br />
{l s='First, select a section (such as Back Office or Installed modules), and then click the flag representing the language you want to edit.'}<br /><br />
<form method="get" action="index.php" id="typeTranslationForm">
<input type="hidden" name="controller" value="AdminTranslations" />
<input type="hidden" name="lang" id="translation_lang" value="0" />
@@ -117,7 +117,7 @@
<form action="{$url_submit}" method="post" enctype="multipart/form-data">
<fieldset>
<legend>
<img src="../img/admin/import.gif" />{l s='Import a language pack manually.'}
<img src="../img/admin/import.gif" />{l s='Import a language pack manually'}
</legend>
<div id="submitImportContent">
<p>
admin-dev/themes/default/template/controllers/translations/helpers/view/translation_errors.tpl
+1 -1
View File
@@ -34,7 +34,7 @@
<b>{$limit_warning['post.max_vars']}</b> {l s='for suhosin.post.max_vars.'}<br/>
<b>{$limit_warning['request.max_vars']}</b> {l s='for suhosin.request.max_vars.'}<br/>
{l s='Please ask your hosting provider to increase the suhosin post and request a limit of'}
{l s='Please ask your hosting provider to increase the suhosin limit to'}
{else}
{l s='Warning! Your PHP configuration limits the maximum number of fields allowed in a form:'}<br/>
<b>{$limit_warning['max_input_vars']}</b> {l s='for max_input_vars.'}<br/>
admin-dev/themes/default/template/controllers/translations/helpers/view/translation_form.tpl
+2 -2
View File
@@ -34,7 +34,7 @@
<b>{$limit_warning['post.max_vars']}</b> {l s='for suhosin.post.max_vars.'}<br/>
<b>{$limit_warning['request.max_vars']}</b> {l s='for suhosin.request.max_vars.'}<br/>
{l s='Please ask your hosting provider to increase the suhosin post and request a limit of'}
{l s='Please ask your hosting provider to increase the suhosin limit to'}
{else}
{l s='Warning! Your PHP configuration limits the maximum number of fields allowed in a form:'}
<b>{$limit_warning['max_input_vars']}</b> {l s='for max_input_vars.'}<br/>
@@ -46,7 +46,7 @@
<div class="hint" style="display:block;">
<ul style="margin-left:30px;list-style-type:disc;">
<li>{l s='Click on the titles to open fieldsets'}.</li>
<li>{l s='Click on titles to open fieldsets'}.</li>
<li>{l s='Some sentences to translate use this syntax: %s... These are variables, and PrestaShop take care of replacing them before displaying your translation. You must leave these in your translations, and place them appropriately in your sentence.' sprintf='%d, %s, %1$s, %2$d'}</li>
</ul>
</div><br /><br />
admin-dev/themes/default/template/controllers/translations/helpers/view/translation_mails.tpl
+2 -2
View File
@@ -36,7 +36,7 @@
<b>{$limit_warning['post.max_vars']}</b> {l s='for suhosin.post.max_vars.'}<br/>
<b>{$limit_warning['request.max_vars']}</b> {l s='for suhosin.request.max_vars.'}<br/>
{l s='Please ask your hosting provider to increase the suhosin post and request a limit of'}
{l s='Please ask your hosting provider to increase the suhosin limit to'}
{else}
{l s='Warning! Your PHP configuration limits the maximum number of fields allowed in a form:'}<br/>
<b>{$limit_warning['max_input_vars']}</b> {l s='for max_input_vars.'}<br/>
@@ -48,7 +48,7 @@
<div class="hint" style="display:block;">
<ul style="margin-left:30px;list-style-type:disc;">
<li>{l s='Click on the titles to open fieldsets'}.</li>
<li>{l s='Click on titles to open fieldsets'}.</li>
<li>{l s='Some sentences to translate use this syntax: %s... These are variables, and PrestaShop take care of replacing them before displaying your translation. You must leave these in your translations, and place them appropriately in your sentence.' sprintf='%d, %s, %1$s, %2$d'}</li>
</ul>
</div><br /><br />
admin-dev/themes/default/template/controllers/translations/helpers/view/translation_modules.tpl
+2 -2
View File
@@ -34,7 +34,7 @@
<b>{$limit_warning['post.max_vars']}</b> {l s='for suhosin.post.max_vars.'}<br/>
<b>{$limit_warning['request.max_vars']}</b> {l s='for suhosin.request.max_vars.'}<br/>
{l s='Please ask your hosting provider to increase the suhosin post and request a limit of'}
{l s='Please ask your hosting provider to increase the suhosin limit to'}
{else}
{l s='Warning! Your PHP configuration limits the maximum number of fields allowed in a form:'}<br/>
<b>{$limit_warning['max_input_vars']}</b> {l s='for max_input_vars.'}<br/>
@@ -46,7 +46,7 @@
<div class="hint" style="display:block;">
<ul style="margin-left:30px;list-style-type:disc;">
<li>{l s='Click on the titles to open fieldsets'}.</li>
<li>{l s='Click on titles to open fieldsets'}.</li>
<li>{l s='Some sentences to translate use this syntax: %s... These are variables, and PrestaShop take care of replacing them before displaying your translation. You must leave these in your translations, and place them appropriately in your sentence.' sprintf='%d, %s, %1$s, %2$d'}</li>
</ul>
</div><br /><br />
admin-dev/themes/default/template/controllers/warehouses/helpers/view/view.tpl
+1 -1
View File
@@ -59,7 +59,7 @@
<td>{$currency->name} ({$currency->sign})</td>
</tr>
<tr>
<td>{l s='Products:'}</td>
<td>{l s='Products'}</td>
<td>{$warehouse_num_products} {l s='References:'}</td>
</tr>
<tr>