Version 1.1.1, Add: 'template/email/admin_new_user_notification.html'

MaWoScha · Aug 13, 2019 · 54a9e22 · 54a9e22
1 parent 8d7481c
commit 54a9e22
Show file tree

Hide file tree

Showing 20 changed files with 56 additions and 29 deletions.
diff --git a/app/code/community/German/LocalePackPt/Block/System/Config/Form/Fieldset/Extensions.php b/app/code/community/German/LocalePackPt/Block/System/Config/Form/Fieldset/Extensions.php
@@ -2,8 +2,8 @@
 /**
  * @category  German
  * @package   German_LocalePack
- * @authors   MaWoScha <mawoscha@siempro.co, http://www.siempro.co/>
- * @developer MaWoScha <mawoscha@siempro.co, http://www.siempro.co/>
+ * @authors   MaWoScha
+ * @developer MaWoScha
  * @version   0.2.0
  * @license   http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */

diff --git a/app/code/community/German/LocalePackPt/Block/System/Config/Form/Fieldset/Instructions.php b/app/code/community/German/LocalePackPt/Block/System/Config/Form/Fieldset/Instructions.php
@@ -2,8 +2,8 @@
 /**
  * @category  German
  * @package   German_LocalePack
- * @authors   MaWoScha <mawoscha@siempro.co, http://www.siempro.co/>
- * @developer MaWoScha <mawoscha@siempro.co, http://www.siempro.co/>
+ * @authors   MaWoScha
+ * @developer MaWoScha
  * @version   0.1.0
  * @license   http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */

diff --git a/...community/German/LocalePackPt/Block/System/Config/Form/Fieldset/Magentoconnectmanager.php b/...community/German/LocalePackPt/Block/System/Config/Form/Fieldset/Magentoconnectmanager.php
@@ -2,8 +2,8 @@
 /**
  * @category  German
  * @package   German_LocalePack
- * @authors   MaWoScha <mawoscha@siempro.co, http://www.siempro.co/>
- * @developer MaWoScha <mawoscha@siempro.co, http://www.siempro.co/>
+ * @authors   MaWoScha
+ * @developer MaWoScha
  * @version   0.2.0
  * @license   http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */

diff --git a/app/code/community/German/LocalePackPt/Helper/Data.php b/app/code/community/German/LocalePackPt/Helper/Data.php
@@ -2,8 +2,8 @@
 /**
  * @category  German
  * @package   German_LocalePack
- * @authors   MaWoScha <mawoscha@siempro.co, http://www.siempro.co/>, Rico Neitzel <rico@buro71a.de, http://www.buro71a.de/>
- * @developer MaWoScha <mawoscha@siempro.co, http://www.siempro.co/>, Rico Neitzel <rico@buro71a.de, http://www.buro71a.de/>
+ * @authors   MaWoScha, Rico Neitzel <rico@buro71a.de, http://www.buro71a.de/>
+ * @developer MaWoScha, Rico Neitzel <rico@buro71a.de, http://www.buro71a.de/>
  * @version   0.1.0
  * @license   http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */

diff --git a/app/code/community/German/LocalePackPt/Model/Observer.php b/app/code/community/German/LocalePackPt/Model/Observer.php
@@ -2,8 +2,8 @@
 /**
  * @category  German
  * @package   German_LocalePack
- * @authors   MaWoScha <mawoscha@siempro.co, http://www.siempro.co/>, Rico Neitzel <rico@buro71a.de, http://www.buro71a.de/>
- * @developer MaWoScha <mawoscha@siempro.co, http://www.siempro.co/>, Rico Neitzel <rico@buro71a.de, http://www.buro71a.de/>
+ * @authors   MaWoScha, Rico Neitzel <rico@buro71a.de, http://www.buro71a.de/>
+ * @developer MaWoScha, Rico Neitzel <rico@buro71a.de, http://www.buro71a.de/>
  * @version   0.1.0
  * @license   http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */

diff --git a/app/code/community/German/LocalePackPt/etc/config.xml b/app/code/community/German/LocalePackPt/etc/config.xml
@@ -3,8 +3,8 @@
 /**
  * @category  German
  * @package   German_LocalePack
- * @authors   MaWoScha <mawoscha@siempro.co, http://www.siempro.co/>
- * @developer MaWoScha <mawoscha@siempro.co, http://www.siempro.co/>
+ * @authors   MaWoScha
+ * @developer MaWoScha
  * @license   http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
  -->

diff --git a/app/code/community/German/LocalePackPt/etc/system.xml b/app/code/community/German/LocalePackPt/etc/system.xml
@@ -3,8 +3,8 @@
 /**
  * @category  German
  * @package   German_LocalePack
- * @authors   MaWoScha <mawoscha@siempro.co, http://www.siempro.co/>
- * @developer MaWoScha <mawoscha@siempro.co, http://www.siempro.co/>
+ * @authors   MaWoScha
+ * @developer MaWoScha
  * @version   0.3.0
  * @license   http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */

diff --git a/app/code/community/German/LocalePackPt/sql/localepackpt_setup/mysql4-install-0.4.0.php b/app/code/community/German/LocalePackPt/sql/localepackpt_setup/mysql4-install-0.4.0.php
@@ -2,8 +2,8 @@
 /**
  * @category  German
  * @package   German_LocalePack
- * @authors   MaWoScha <mawoscha@siempro.co, http://www.siempro.co/>
- * @developer MaWoScha <mawoscha@siempro.co, http://www.siempro.co/>  
+ * @authors   MaWoScha
+ * @developer MaWoScha
  * @version   0.4.0.
  * @license   http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */

diff --git a/app/design/adminhtml/default/default/layout/localepackpt.xml b/app/design/adminhtml/default/default/layout/localepackpt.xml
@@ -3,8 +3,8 @@
 /**
  * @category  German
  * @package   German_LocalePack
- * @authors   MaWoScha <mawoscha@siempro.co, http://www.siempro.co/>, Rico Neitzel <rico@buro71a.de, http://www.buro71a.de/>
- * @developer MaWoScha <mawoscha@siempro.co, http://www.siempro.co/>, Rico Neitzel <rico@buro71a.de, http://www.buro71a.de/>
+ * @authors   MaWoScha, Rico Neitzel <rico@buro71a.de, http://www.buro71a.de/>
+ * @developer MaWoScha, Rico Neitzel <rico@buro71a.de, http://www.buro71a.de/>
  * @version   0.3.0
  * @license   http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)  
  */

diff --git a/app/etc/modules/German_LocalePackPt.xml b/app/etc/modules/German_LocalePackPt.xml
@@ -3,8 +3,8 @@
 /**
  * @category  German
  * @package   German_LocalePack
- * @authors   MaWoScha <mawoscha@siempro.co, http://www.siempro.co/>, Rico Neitzel <rico@buro71a.de, http://www.buro71a.de/>
- * @developer MaWoScha <mawoscha@siempro.co, http://www.siempro.co/>, Rico Neitzel <rico@buro71a.de, http://www.buro71a.de/>
+ * @authors   MaWoScha, Rico Neitzel <rico@buro71a.de, http://www.buro71a.de/>
+ * @developer MaWoScha, Rico Neitzel <rico@buro71a.de, http://www.buro71a.de/>
  * @version   0.1.0
  * @license   http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)  
  */

diff --git a/app/locale/pt_PT/template/email/account_new_confirmation.html b/app/locale/pt_PT/template/email/account_new_confirmation.html
@@ -21,7 +21,7 @@
             <h1>{{block type="cms/block" block_id="email_template_say_hello"}} {{htmlescape var=$customer.name}}</h1>
             <p>O seu email {{var customer.email}} tem que ser confirmado antes que posso ser utilizado na nossa loja.</p>
             <p>Para confirmar o email e iniciar sessão clique nesta hiperligação de confirmação (esta ligação apenas é válida uma vez):</p>
-            <table cellspacing="0" cellpadding="0" class="action-button" >
+            <table cellspacing="0" cellpadding="0" class="action-button">
                 <tr>
                     <td>
                         <a href="{{store url="customer/account/confirm/" _query_id=$customer.id _query_key=$customer.confirmation _query_back_url=$back_url}}"><span>Confirme conta</span></a>

diff --git a/app/locale/pt_PT/template/email/account_password_reset_confirmation.html b/app/locale/pt_PT/template/email/account_password_reset_confirmation.html
@@ -4,7 +4,7 @@
 "var logo_url":"Email Logo Image Url",
 "var logo_alt":"Email Logo Image Alt",
 "htmlescape var=$customer.name":"Customer Name",
-"store url=\"customer/account/resetpassword/\" _query_id=$customer.id _query_token=$customer.rp_token":"Reset Password URL"}
+"store url=\"customer/account/resetpassword/\" _query_id=$customer.rp_customer_id _query_token=$customer.rp_token":"Reset Password URL"}
 @-->
 
 <!--@styles
@@ -19,7 +19,7 @@
             <h1>{{block type="cms/block" block_id="email_template_say_hello"}} {{htmlescape var=$customer.name}}</h1>
             <p>Houve um pedido para alterar a senha da sua conta.</p>
             <p>Se você. Você solicitado este de alteração de senha, por favor siga o link para redefinir sua senha:</p>
-            <table cellspacing="0" cellpadding="0" class="action-button" >
+            <table cellspacing="0" cellpadding="0" class="action-button">
                 <tr>
                     <td>
                         <a href="{{store url="customer/account/resetpassword/" _query_id=$customer.rp_customer_id _query_token=$customer.rp_token}}"><span>Redefinição de senha</span></a>

diff --git a/app/locale/pt_PT/template/email/admin_new_user_notification.html b/app/locale/pt_PT/template/email/admin_new_user_notification.html
@@ -0,0 +1,25 @@
+<!--@subject Nova conta de administrador {{var user.name}} criada. @-->
+<!--@vars
+{"store url=\"\"":"Store Url",
+"var logo_url":"Email Logo Image Url",
+"var logo_alt":"Email Logo Image Alt",
+"htmlescape var=$user.name":"New Admin Name",
+@-->
+
+<!--@styles
+@-->
+
+{{template config_path="design/email/header"}}
+{{inlinecss file="email-inline.css"}}
+
+<table cellpadding="0" cellspacing="0" border="0">
+    <tr>
+        <td class="action-content">
+            <h1>Notificação de nova conta de administrador.</h1>
+            <p>Uma nova conta de administrador foi criada para <b>{{htmlescape var=$user.name}}</b> usando email: {{htmlescape var=$user.email}}.</p>
+            <p>Se você não solicitou esta ação, reveja a lista de contas de administrador em <a href="{{store url=""}}">sua loja</a>.</p>
+        </td>
+    </tr>
+</table>
+
+{{template config_path="design/email/footer"}}
diff --git a/app/locale/pt_PT/template/email/newsletter_subscr_confirm.html b/app/locale/pt_PT/template/email/newsletter_subscr_confirm.html
@@ -18,7 +18,7 @@
         <td class="action-content">
             <h1>Obrigado por subscrever a nossa newsletter.</h1>
             <p>Para isso acontecer, apenas tem que confirmar o pedido clicando no link abaixo:</p>
-            <table cellspacing="0" cellpadding="0" class="action-button" >
+            <table cellspacing="0" cellpadding="0" class="action-button">
                 <tr>
                     <td>
                         <a href="{{var subscriber.getConfirmationLink()}}"><span>Confirme subscrição</span></a>

diff --git a/composer.json b/composer.json
@@ -98,6 +98,7 @@
       ["app/locale/pt_PT/template/email/account_new_confirmed.html", "app/locale/pt_PT/template/email/account_new_confirmed.html"],
       ["app/locale/pt_PT/template/email/account_new.html", "app/locale/pt_PT/template/email/account_new.html"],
       ["app/locale/pt_PT/template/email/account_password_reset_confirmation.html", "app/locale/pt_PT/template/email/account_password_reset_confirmation.html"],
+      ["app/locale/pt_PT/template/email/admin_new_user_notification.html", "app/locale/pt_PT/template/email/admin_new_user_notification.html"],
       ["app/locale/pt_PT/template/email/admin_password_new.html", "app/locale/pt_PT/template/email/admin_password_new.html"],
       ["app/locale/pt_PT/template/email/admin_password_reset_confirmation.html", "app/locale/pt_PT/template/email/admin_password_reset_confirmation.html"],
       ["app/locale/pt_PT/template/email/amazonpayments_asp_notification_error.html", "app/locale/pt_PT/template/email/amazonpayments_asp_notification_error.html"],

diff --git a/downloader/template_pt_1.7/footer.phtml b/downloader/template_pt_1.7/footer.phtml
@@ -33,7 +33,7 @@
                 <script type="text/javascript">
                     $('bug_tracking_link').target = "varien_external";
                 </script>
-                Magento es una marca comercial de Magento, Inc. Copyright &copy; 2017 Magento Inc.
+                Magento es una marca comercial de Magento, Inc. Copyright &copy; 2019 Magento Inc.
             </p>
         </div>
     </body>

diff --git a/downloader/template_pt_1.7/install/footer.phtml b/downloader/template_pt_1.7/install/footer.phtml
@@ -41,7 +41,7 @@
 <script type="text/javascript">
     $('bug_tracking_link').target = "varien_external";
 </script>
-            Magento es una marca comercial de Magento, Inc. Copyright &copy; 2017 Magento Inc.</p>
+            Magento es una marca comercial de Magento, Inc. Copyright &copy; 2019 Magento Inc.</p>
         </div>
     </div>
         <!-- [end] footer -->

diff --git a/js/german/localepackpt/setup.js b/js/german/localepackpt/setup.js
@@ -26,7 +26,7 @@
 /** Modified Version of this file
  * @category German
  * @package German_LocalePack
- * @authors MaWoScha <mawoscha@siempro.co, http://www.siempro.co/>, Daniel Sasse <info@golox-web.de, http://www.golox-web.de/> - Rico Neitzel <rico@buro71a.de, http://www.buro71a.de/>
+ * @authors MaWoScha, Daniel Sasse <info@golox-web.de, http://www.golox-web.de/> - Rico Neitzel <rico@buro71a.de, http://www.buro71a.de/>
  * @developer Daniel Sasse <info@golox-web.de, http://www.golox-web.de/> - Rico Neitzel <rico@buro71a.de, http://www.buro71a.de/>
  * @version 1.0.0
  * @license http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)

diff --git a/modman b/modman
@@ -123,6 +123,7 @@ app/locale/pt_PT/template/email/account_new_confirmation.html app/locale/pt_PT/t
 app/locale/pt_PT/template/email/account_new_confirmed.html app/locale/pt_PT/template/email/account_new_confirmed.html
 app/locale/pt_PT/template/email/account_new.html app/locale/pt_PT/template/email/account_new.html
 app/locale/pt_PT/template/email/account_password_reset_confirmation.html app/locale/pt_PT/template/email/account_password_reset_confirmation.html
+app/locale/pt_PT/template/email/admin_new_user_notification.html app/locale/pt_PT/template/email/admin_new_user_notification.html
 app/locale/pt_PT/template/email/admin_password_new.html app/locale/pt_PT/template/email/admin_password_new.html
 app/locale/pt_PT/template/email/admin_password_reset_confirmation.html app/locale/pt_PT/template/email/admin_password_reset_confirmation.html
 app/locale/pt_PT/template/email/amazonpayments_asp_notification_error.html app/locale/pt_PT/template/email/amazonpayments_asp_notification_error.html

diff --git a/var/connect/German_LocalePack_pt_PT.xml b/var/connect/German_LocalePack_pt_PT.xml
@@ -13,7 +13,7 @@ Portuguese language pack for Magento Commerce - Version for Portugal
 Portugiesisches Sprachpaket für Magento Commerce - Sprachversion für Portugal</description>
    <license>OSL</license>
    <license_uri>http://opensource.org/licenses/osl-3.0.php</license_uri>
-   <version>1.1.0</version>
+   <version>1.1.1</version>
    <stability>stable</stability>
    <notes>Compatible with Magento (1.6.2) 1.7.0.x-1.9.4.x</notes>
    <authors>
@@ -28,7 +28,7 @@ Portugiesisches Sprachpaket für Magento Commerce - Sprachversion für Portugal<
       </email>
    </authors>
    <depends_php_min>5.2.0</depends_php_min>
-   <depends_php_max>6.0.0</depends_php_max>
+   <depends_php_max>7.1.0</depends_php_max>
    <depends>
       <package>
          <name>