From 8a86c97ec523218685786195305cb4fe83ee0cbd Mon Sep 17 00:00:00 2001
From: Tony <tonyweboss@gmail.com>
Date: Sat, 13 Jul 2024 11:54:47 +0200
Subject: [PATCH 1/9] add newsletter subscribe form widget

---
 .../Newsletter/Block/Widget/Subscribe.php     | 31 +++++++++++++++
 app/code/core/Mage/Newsletter/etc/widget.xml  | 38 +++++++++++++++++++
 2 files changed, 69 insertions(+)
 create mode 100644 app/code/core/Mage/Newsletter/Block/Widget/Subscribe.php
 create mode 100644 app/code/core/Mage/Newsletter/etc/widget.xml

diff --git a/app/code/core/Mage/Newsletter/Block/Widget/Subscribe.php b/app/code/core/Mage/Newsletter/Block/Widget/Subscribe.php
new file mode 100644
index 00000000000..0312153fac1
--- /dev/null
+++ b/app/code/core/Mage/Newsletter/Block/Widget/Subscribe.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * OpenMage
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available at https://opensource.org/license/osl-3-0-php
+ *
+ * @category   Mage
+ * @package    Mage_Newsletter
+ * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
+ * @copyright  Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org)
+ * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Newsletter subscribe form Widget
+ *
+ * @category   Mage
+ * @package    Mage_Newsletter
+ * @method string getSuccessMessage()
+ * @method string getErrorMessage()
+ * @method string getFormActionUrl()
+ */
+class Mage_Newsletter_Block_Widget_Subscribe extends Mage_Newsletter_Block_Subscribe implements Mage_Widget_Block_Interface
+{
+    protected function _construct()
+    {
+        parent::_construct();
+    }
+}
\ No newline at end of file
diff --git a/app/code/core/Mage/Newsletter/etc/widget.xml b/app/code/core/Mage/Newsletter/etc/widget.xml
new file mode 100644
index 00000000000..cdd501870f1
--- /dev/null
+++ b/app/code/core/Mage/Newsletter/etc/widget.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * OpenMage
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available at https://opensource.org/license/afl-3-0-php
+ *
+ * @category   Mage
+ * @package    Mage_Newsletter
+ * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
+ * @copyright  Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org)
+ * @license    https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<widgets>
+    <newsletter_subscribe type="newsletter/widget_subscribe" translate="name description" module="newsletter">
+        <name>Newsletter Subscribe Form</name>
+        <description>Newsletter Subscribe Form</description>
+        <is_email_compatible>0</is_email_compatible>
+        <parameters>
+            <template translate="label">
+                <label>Template</label>
+                <visible>1</visible>
+                <type>select</type>
+                <value>newsletter/subscribe.phtml</value>
+                <values>
+                    <default translate="label">
+                        <value>newsletter/subscribe.phtml</value>
+                        <label>Newsletter Form Default Template</label>
+                    </default>
+                </values>
+                <sort_order>10</sort_order>
+            </template>
+        </parameters>
+    </newsletter_subscribe>
+</widgets>

From cf01dc544e44ae8590cef7ab5234d29011694f4e Mon Sep 17 00:00:00 2001
From: Tony <tonyweboss@gmail.com>
Date: Sat, 13 Jul 2024 12:09:32 +0200
Subject: [PATCH 2/9] add translation

---
 app/locale/en_US/Mage_Newsletter.csv | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/locale/en_US/Mage_Newsletter.csv b/app/locale/en_US/Mage_Newsletter.csv
index d1e8841114e..292518970cb 100644
--- a/app/locale/en_US/Mage_Newsletter.csv
+++ b/app/locale/en_US/Mage_Newsletter.csv
@@ -140,3 +140,4 @@
 "You have been unsubscribed.","You have been unsubscribed."
 "Your subscription has been confirmed.","Your subscription has been confirmed."
 "This email address is already confirmed.","This email address is already confirmed."
+"Newsletter Subscribe Form","Newsletter Subscribe Form"
\ No newline at end of file

From 387699bfcbe89353304a95167c67ae14dd034cca Mon Sep 17 00:00:00 2001
From: Tony <tonyweboss@gmail.com>
Date: Sat, 13 Jul 2024 12:49:44 +0200
Subject: [PATCH 3/9] fix php cs

---
 app/code/core/Mage/Newsletter/Block/Widget/Subscribe.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/core/Mage/Newsletter/Block/Widget/Subscribe.php b/app/code/core/Mage/Newsletter/Block/Widget/Subscribe.php
index 0312153fac1..50b3e89e571 100644
--- a/app/code/core/Mage/Newsletter/Block/Widget/Subscribe.php
+++ b/app/code/core/Mage/Newsletter/Block/Widget/Subscribe.php
@@ -28,4 +28,4 @@ protected function _construct()
     {
         parent::_construct();
     }
-}
\ No newline at end of file
+}

From 45d8502eb10db83ea6268e130712c6e0c47e2273 Mon Sep 17 00:00:00 2001
From: Tony <tonyweboss@gmail.com>
Date: Sun, 14 Jul 2024 11:52:32 +0200
Subject: [PATCH 4/9] update copyright

---
 app/code/core/Mage/Newsletter/Block/Widget/Subscribe.php | 2 +-
 app/code/core/Mage/Newsletter/etc/widget.xml             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/core/Mage/Newsletter/Block/Widget/Subscribe.php b/app/code/core/Mage/Newsletter/Block/Widget/Subscribe.php
index 50b3e89e571..2868f7c30ae 100644
--- a/app/code/core/Mage/Newsletter/Block/Widget/Subscribe.php
+++ b/app/code/core/Mage/Newsletter/Block/Widget/Subscribe.php
@@ -9,7 +9,7 @@
  * @category   Mage
  * @package    Mage_Newsletter
  * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2020-2023 The OpenMage Contributors (https://www.openmage.org)
+ * @copyright  Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org)
  * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
diff --git a/app/code/core/Mage/Newsletter/etc/widget.xml b/app/code/core/Mage/Newsletter/etc/widget.xml
index cdd501870f1..be7da743cda 100644
--- a/app/code/core/Mage/Newsletter/etc/widget.xml
+++ b/app/code/core/Mage/Newsletter/etc/widget.xml
@@ -10,7 +10,7 @@
  * @category   Mage
  * @package    Mage_Newsletter
  * @copyright  Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com)
- * @copyright  Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org)
+ * @copyright  Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org)
  * @license    https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
  */
 -->

From edb9542c907cabc268e134e09a7d78ce25a46eb2 Mon Sep 17 00:00:00 2001
From: Fabrizio Balliano <fabrizio.balliano@gmail.com>
Date: Mon, 15 Jul 2024 15:44:44 +0100
Subject: [PATCH 5/9] newline at the end

---
 app/locale/en_US/Mage_Newsletter.csv | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/locale/en_US/Mage_Newsletter.csv b/app/locale/en_US/Mage_Newsletter.csv
index 292518970cb..225161af9fa 100644
--- a/app/locale/en_US/Mage_Newsletter.csv
+++ b/app/locale/en_US/Mage_Newsletter.csv
@@ -140,4 +140,4 @@
 "You have been unsubscribed.","You have been unsubscribed."
 "Your subscription has been confirmed.","Your subscription has been confirmed."
 "This email address is already confirmed.","This email address is already confirmed."
-"Newsletter Subscribe Form","Newsletter Subscribe Form"
\ No newline at end of file
+"Newsletter Subscribe Form","Newsletter Subscribe Form"

From 2d09151c1ab6188a1af3166ee8b3621e32a3ab7d Mon Sep 17 00:00:00 2001
From: Tony <github@magemega.com>
Date: Wed, 17 Jul 2024 11:53:12 +0200
Subject: [PATCH 6/9] Update
 app/code/core/Mage/Newsletter/Block/Widget/Subscribe.php

Co-authored-by: Fabrizio Balliano <fabrizio.balliano@gmail.com>
---
 app/code/core/Mage/Newsletter/Block/Widget/Subscribe.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/app/code/core/Mage/Newsletter/Block/Widget/Subscribe.php b/app/code/core/Mage/Newsletter/Block/Widget/Subscribe.php
index 2868f7c30ae..3074f73a2fc 100644
--- a/app/code/core/Mage/Newsletter/Block/Widget/Subscribe.php
+++ b/app/code/core/Mage/Newsletter/Block/Widget/Subscribe.php
@@ -24,8 +24,4 @@
  */
 class Mage_Newsletter_Block_Widget_Subscribe extends Mage_Newsletter_Block_Subscribe implements Mage_Widget_Block_Interface
 {
-    protected function _construct()
-    {
-        parent::_construct();
-    }
 }

From 1f3d6b4405041ff2fccacd87b36fddd172771bb9 Mon Sep 17 00:00:00 2001
From: Tony <tonyweboss@gmail.com>
Date: Tue, 30 Jul 2024 08:53:25 +0200
Subject: [PATCH 7/9] update labels

---
 app/code/core/Mage/Newsletter/etc/widget.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/core/Mage/Newsletter/etc/widget.xml b/app/code/core/Mage/Newsletter/etc/widget.xml
index be7da743cda..f4415293097 100644
--- a/app/code/core/Mage/Newsletter/etc/widget.xml
+++ b/app/code/core/Mage/Newsletter/etc/widget.xml
@@ -16,7 +16,7 @@
 -->
 <widgets>
     <newsletter_subscribe type="newsletter/widget_subscribe" translate="name description" module="newsletter">
-        <name>Newsletter Subscribe Form</name>
+        <name>Newsletter Subscription Form</name>
         <description>Newsletter Subscribe Form</description>
         <is_email_compatible>0</is_email_compatible>
         <parameters>
@@ -28,7 +28,7 @@
                 <values>
                     <default translate="label">
                         <value>newsletter/subscribe.phtml</value>
-                        <label>Newsletter Form Default Template</label>
+                        <label>Default Template</label>
                     </default>
                 </values>
                 <sort_order>10</sort_order>

From 3f3b42c5b6384cceb27ad23a85648a0f79561d93 Mon Sep 17 00:00:00 2001
From: Tony <tonyweboss@gmail.com>
Date: Tue, 30 Jul 2024 08:57:44 +0200
Subject: [PATCH 8/9] update translation

---
 app/locale/en_US/Mage_Newsletter.csv | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/locale/en_US/Mage_Newsletter.csv b/app/locale/en_US/Mage_Newsletter.csv
index 225161af9fa..035b804f8ed 100644
--- a/app/locale/en_US/Mage_Newsletter.csv
+++ b/app/locale/en_US/Mage_Newsletter.csv
@@ -140,4 +140,4 @@
 "You have been unsubscribed.","You have been unsubscribed."
 "Your subscription has been confirmed.","Your subscription has been confirmed."
 "This email address is already confirmed.","This email address is already confirmed."
-"Newsletter Subscribe Form","Newsletter Subscribe Form"
+"Newsletter Subscription Form","Newsletter Subscription Form"

From d67bfc46add33e9c92b847b7f4bbf4ed51f60695 Mon Sep 17 00:00:00 2001
From: Tony <tonyweboss@gmail.com>
Date: Tue, 30 Jul 2024 08:58:23 +0200
Subject: [PATCH 9/9] add translation default template

---
 app/locale/en_US/Mage_Newsletter.csv | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/locale/en_US/Mage_Newsletter.csv b/app/locale/en_US/Mage_Newsletter.csv
index 035b804f8ed..6799bfb0b34 100644
--- a/app/locale/en_US/Mage_Newsletter.csv
+++ b/app/locale/en_US/Mage_Newsletter.csv
@@ -141,3 +141,4 @@
 "Your subscription has been confirmed.","Your subscription has been confirmed."
 "This email address is already confirmed.","This email address is already confirmed."
 "Newsletter Subscription Form","Newsletter Subscription Form"
+"Default Template","Default Template"