update

iadmin/themes/default/template/layout.tpl

@@ -1,10 +1,11 @@
 {**
- * 2007-2018 PrestaShop
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
  *
  * NOTICE OF LICENSE
  *
  * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
+ * that is bundled with this package in the file LICENSE.md.
  * It is also available through the world-wide-web at this URL:
  * https://opensource.org/licenses/OSL-3.0
  * If you did not receive a copy of the license and are unable to
@@ -15,12 +16,11 @@
  *
  * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
  * versions in the future. If you wish to customize PrestaShop for your
- * needs please refer to http://www.prestashop.com for more information.
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
  *
- * @author    PrestaShop SA <contact@prestashop.com>
- * @copyright 2007-2018 PrestaShop SA
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
  * @license   https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
- * International Registered Trademark & Property of PrestaShop SA
  *}
 {$header}
 {if isset($conf)}
@@ -31,11 +31,11 @@
 		</div>
 	</div>
 {/if}
-{if isset($error)}
+{if !empty($error)}
   <div class="bootstrap">
     <div class="alert alert-danger">
       <button type="button" class="close" data-dismiss="alert">&times;</button>
-      {$error|escape:'html':'UTF-8'}
+      {$error}
     </div>
   </div>
 {/if}
@@ -45,13 +45,13 @@
 		<div class="alert alert-danger">
 			<button type="button" class="close" data-dismiss="alert">&times;</button>
 		{if count($errors) == 1}
-			{reset($errors)|escape:'html':'UTF-8'}
+			{reset($errors)}
 		{else }
-			{l s='%d errors' sprintf=[$errors|count]}
+			{l s='There are %d errors.' sprintf=[$errors|count] d='Admin.Notifications.Error'}
 			<br/>
 			<ol>
 				{foreach $errors as $error}
-					<li>{$error|escape:'html':'UTF-8'}</li>
+					<li>{$error}</li>
 				{/foreach}
 			</ol>
 		{/if}