Skip to content

Commit

Permalink
change all references from MailChimp to Mailchimp closes #565 for mag…
Browse files Browse the repository at this point in the history
…ento 2.3
  • Loading branch information
gonzaloebiz committed Jan 25, 2019
1 parent 70353a9 commit 4a44211
Show file tree
Hide file tree
Showing 8 changed files with 13 additions and 14 deletions.
2 changes: 1 addition & 1 deletion Block/Adminhtml/Stores/Edit/Tabs.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ protected function _construct()
parent::_construct();
$this->setId('stores_edit_tabs');
$this->setDestElementId('edit_form');
$this->setTitle(__('MailChimp Store Information'));
$this->setTitle(__('Mailchimp Store Information'));
}

/**
Expand Down
2 changes: 1 addition & 1 deletion Controller/Adminhtml/Errors/Index.php
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public function __construct(
public function execute()
{
$page = $this->resultPageFactory->create();
$page->getConfig()->getTitle()->prepend(__('MailChimp Errors'));
$page->getConfig()->getTitle()->prepend(__('Mailchimp Errors'));
return $page;
}
protected function _isAllowed()
Expand Down
2 changes: 1 addition & 1 deletion Controller/Adminhtml/Stores/Edit.php
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public function execute()
/** @var \Magento\Backend\Model\View\Result\Page $resultPage */
$resultPage = $this->_resultPageFactory->create();
$resultPage->setActiveMenu('Ebizmarts_MailChimp::main_menu');
$resultPage->getConfig()->getTitle()->prepend(__('MailChimp Store'));
$resultPage->getConfig()->getTitle()->prepend(__('Mailchimp Store'));

return $resultPage;
}
Expand Down
2 changes: 1 addition & 1 deletion Controller/Adminhtml/Stores/Index.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public function execute()
{
$this->_helper->loadStores();
$page = $this->_resultPageFactory->create();
$page->getConfig()->getTitle()->prepend(__('MailChimp Stores'));
$page->getConfig()->getTitle()->prepend(__('Mailchimp Stores'));
return $page;
}
protected function _isAllowed()
Expand Down
7 changes: 3 additions & 4 deletions etc/adminhtml/menu.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Backend:etc/menu.xsd">
<menu>
<add id="Ebizmarts_MailChimp::mailchimp_menu"
title="MailChimp"
title="Mailchimp"
module="Ebizmarts_MailChimp"
sortOrder="110"
dependsOnModule="Ebizmarts_MailChimp"
Expand All @@ -17,7 +17,7 @@
action="adminhtml/system_config/edit/section/mailchimp"
/>
<add id="Ebizmarts_MailChimp::store_menu"
title="MailChimp Stores"
title="Mailchimp Stores"
module="Ebizmarts_MailChimp"
sortOrder="20"
resource="Ebizmarts_MailChimp::stores_grid"
Expand All @@ -33,5 +33,4 @@
action="mailchimp/errors"
/>
</menu>
</config>

</config>
8 changes: 4 additions & 4 deletions etc/adminhtml/system.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd">
<system>
<tab id="mailchimp" translate="label" sortOrder="450">
<label>MailChimp</label>
<label>Mailchimp</label>
</tab>
<section id="mailchimp" translate="label" type="text" sortOrder="100" showInDefault="1" showInWebsite="1" showInStore="1">
<class>separator-top</class>
<label>MailChimp</label>
<label>Mailchimp</label>
<tab>mailchimp</tab>
<resource>Ebizmarts_MailChimp::config_mailchimp</resource>
<group id="hint" translate="label" type="text" sortOrder="0" showInDefault="1" showInWebsite="1" showInStore="1">
Expand Down Expand Up @@ -86,7 +86,7 @@
<field id="webhook_active" translate="label" type="select" sortOrder="50" showInDefault="1">
<label>Enable Two Way Sync</label>
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
<comment><![CDATA[If this is set to "No", the synchronization will be from Magento's newsletter to MailChimp only]]></comment>
<comment><![CDATA[If this is set to "No", the synchronization will be from Magento's newsletter to Mailchimp only]]></comment>
<depends>
<field id="*/*/active">1</field>
</depends>
Expand Down Expand Up @@ -129,7 +129,7 @@
<label>Available Groups</label>
<source_model>Ebizmarts\MailChimp\Model\Config\Source\Interest</source_model>
<can_be_empty>1</can_be_empty>
<comment><![CDATA[If you <a href="https://kb.mailchimp.com/lists/groups/create-a-new-list-group" target="_blank">set up groups in MailChimp</a>, include them in your checkout page so customers can choose the type of email marketing they want to receive.]]></comment>
<comment><![CDATA[If you <a href="https://kb.mailchimp.com/lists/groups/create-a-new-list-group" target="_blank">set up groups in Mailchimp</a>, include them in your checkout page so customers can choose the type of email marketing they want to receive.]]></comment>
<depends>
<field id="*/*/active">1</field>
</depends>
Expand Down
2 changes: 1 addition & 1 deletion view/adminhtml/templates/system/config/fieldset/hint.phtml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<h4>
<img width="224px" style="padding-left: 15px;" height="60px" src="https://ebizmarts-website.s3.amazonaws.com/Logo_Ebizmarts.png"/><br><br>
<div style="padding-left: 15px;">
<p> <strong style="color:#EA7601;"><?php echo __('MailChimp v') ?><?php echo $this->getModuleVersion() ?><?php echo __(' by') ?></strong> <a target="_blank" href="http://ebizmarts.com"><strong>ebizmarts</strong></a></p>
<p> <strong style="color:#EA7601;"><?php echo __('Mailchimp v') ?><?php echo $this->getModuleVersion() ?><?php echo __(' by') ?></strong> <a target="_blank" href="http://ebizmarts.com"><strong>ebizmarts</strong></a></p>
<p><?php echo __('Need help? See our ') ?><a href="http://wiki.ebizmarts.com/installation" target="_blank"><?php echo __('Wiki') ?></a><?php echo __(' or browse our ') ?><a href="http://ebizmarts.com/forums" target="_blank"><?php echo __('support forums') ?></a><?php echo __(' Got feedback? ') ?><a href="mailto:[email protected]?Subject=MailChimp For Magento Version <?php echo $this->getModuleVersion()?>"><?php echo __('Email us') ?></a></p>
<p><?php echo __('You can find more extension in our ') ?><a href="http://store.ebizmarts.com" target="_blank"><?php echo __('Store') ?></a></p>
</div>
Expand Down
2 changes: 1 addition & 1 deletion view/adminhtml/ui_component/mailchimp_stores_grid.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<item name="buttons" xsi:type="array">
<item name="add" xsi:type="array">
<item name="name" xsi:type="string">add</item>
<item name="label" xsi:type="string" translate="true">Create New MailChimp Store</item>
<item name="label" xsi:type="string" translate="true">Create New Mailchimp Store</item>
<item name="class" xsi:type="string">primary</item>
<item name="url" xsi:type="string">mailchimp/stores/edit</item>
</item>
Expand Down

0 comments on commit 4a44211

Please sign in to comment.