From f12f6655ad97c7ca245fc9d55517c4c667664049 Mon Sep 17 00:00:00 2001 From: olysenko <olysenko@magento.com> Date: Tue, 23 Jan 2018 17:30:18 +0200 Subject: [PATCH] MAGETWO-86452: [Backport for 2.2.x] Update copyright year --- COPYING.txt | 2 +- app/code/Magento/Theme/etc/config.xml | 2 +- app/code/Magento/Theme/i18n/en_US.csv | 2 +- .../Controller/Adminhtml/System/Design/Config/SaveTest.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/COPYING.txt b/COPYING.txt index 2ba7d78d58a..040bdd5f3ce 100644 --- a/COPYING.txt +++ b/COPYING.txt @@ -1,4 +1,4 @@ -Copyright © 2013-2018 Magento, Inc. +Copyright © 2013-present Magento, Inc. Each Magento source file included in this distribution is licensed under OSL 3.0 or the Magento Enterprise Edition (MEE) license diff --git a/app/code/Magento/Theme/etc/config.xml b/app/code/Magento/Theme/etc/config.xml index 8b740bc8d09..a6984b449d9 100644 --- a/app/code/Magento/Theme/etc/config.xml +++ b/app/code/Magento/Theme/etc/config.xml @@ -45,7 +45,7 @@ Disallow: /*SID= <welcome>Default welcome msg!</welcome> </header> <footer translate="copyright"> - <copyright>Copyright © 2013-2018 Magento, Inc. All rights reserved.</copyright> + <copyright>Copyright © 2013-present Magento, Inc. All rights reserved.</copyright> </footer> </design> <theme> diff --git a/app/code/Magento/Theme/i18n/en_US.csv b/app/code/Magento/Theme/i18n/en_US.csv index daa5c27e75f..b454b7222bd 100644 --- a/app/code/Magento/Theme/i18n/en_US.csv +++ b/app/code/Magento/Theme/i18n/en_US.csv @@ -142,7 +142,7 @@ Empty,Empty "1 column","1 column" Configuration,Configuration "Default welcome msg!","Default welcome msg!" -"Copyright © 2013-2018 Magento, Inc. All rights reserved.","Copyright © 2013-2018 Magento, Inc. All rights reserved." +"Copyright © 2013-present Magento, Inc. All rights reserved.","Copyright © 2013-present Magento, Inc. All rights reserved." "Design Config Grid","Design Config Grid" "Rebuild design config grid index","Rebuild design config grid index" "Admin empty","Admin empty" diff --git a/dev/tests/integration/testsuite/Magento/Theme/Controller/Adminhtml/System/Design/Config/SaveTest.php b/dev/tests/integration/testsuite/Magento/Theme/Controller/Adminhtml/System/Design/Config/SaveTest.php index 333ffb01b24..1ea2b28986d 100644 --- a/dev/tests/integration/testsuite/Magento/Theme/Controller/Adminhtml/System/Design/Config/SaveTest.php +++ b/dev/tests/integration/testsuite/Magento/Theme/Controller/Adminhtml/System/Design/Config/SaveTest.php @@ -67,7 +67,7 @@ class SaveTest extends AbstractBackendController 'header_logo_height' => '', 'header_logo_alt' => '', 'header_welcome' => 'Default welcome msg!', - 'footer_copyright' => 'Copyright © 2013-2018 Magento, Inc. All rights reserved.', + 'footer_copyright' => 'Copyright © 2013-present Magento, Inc. All rights reserved.', 'footer_absolute_footer' => '', 'default_robots' => 'INDEX,FOLLOW', 'custom_instructions' => '', -- GitLab