Merge pull request #382 from magento-webdev/PR

[WD] Update Content in Magento2 + Bugs
magento · Jun 25, 2015 · 378cab2 · 378cab2
2 parents 264c105 + fe74200
commit 378cab2
Show file tree

Hide file tree

Showing 572 changed files with 1,181 additions and 1,091 deletions.
diff --git a/app/code/Magento/AdminNotification/Block/Window.php b/app/code/Magento/AdminNotification/Block/Window.php
@@ -76,7 +76,7 @@ protected function _toHtml()
  if ($this->canShow()) {
  $this->setHeaderText($this->escapeHtml(__('Incoming Message')));
  $this->setCloseText($this->escapeHtml(__('close')));
- $this->setReadDetailsText($this->escapeHtml(__('Read details')));
+ $this->setReadDetailsText($this->escapeHtml(__('Read Details')));
  $this->setNoticeMessageText($this->escapeHtml($this->_getLatestItem()->getTitle()));
  $this->setNoticeMessageUrl($this->escapeUrl($this->_getLatestItem()->getUrl()));
  $this->setSeverityText('critical');

diff --git a/app/code/Magento/AdminNotification/Model/System/Message/Baseurl.php b/app/code/Magento/AdminNotification/Model/System/Message/Baseurl.php
@@ -120,7 +120,7 @@ public function getText()
  {
  return __(
  '{{base_url}} is not recommended to use in a production environment to declare the Base Unsecure '
- . 'URL / Base Secure URL. It is highly recommended to change this value in your Magento '
+ . 'URL / Base Secure URL. We highly recommend changing this value in your Magento '
  . '<a href="%1">configuration</a>.',
  $this->_getConfigUrl()
  );

diff --git a/app/code/Magento/AdminNotification/Model/System/Message/Media/Synchronization/Error.php b/app/code/Magento/AdminNotification/Model/System/Message/Media/Synchronization/Error.php
@@ -34,8 +34,7 @@ protected function _shouldBeDisplayed()
  public function getText()
  {
  return __(
- 'One or more media files failed to be synchronized during the media storages synchronization process. '
- . 'Refer to the log file for details.'
+ 'We were unable to synchronize one or more media files. Please refer to the log file for details.'
  );
  }
 }
diff --git a/app/code/Magento/AdminNotification/Model/System/Message/Security.php b/app/code/Magento/AdminNotification/Model/System/Message/Security.php
@@ -135,8 +135,8 @@ public function isDisplayed()
  public function getText()
  {
  return __(
- 'Your web server is configured incorrectly. As a result, configuration files '
- . ' with sensitive information are accessible from the outside. Please contact your hosting provider.'
+ 'Your web server is set up incorrectly and allows unauthorized access to sensitive files. '
+ . 'Please contact your hosting provider.'
  );
  }
 

diff --git a/...ento/AdminNotification/Test/Unit/Model/System/Message/Media/Synchronization/ErrorTest.php b/...ento/AdminNotification/Test/Unit/Model/System/Message/Media/Synchronization/ErrorTest.php
@@ -39,7 +39,7 @@ protected function setUp()
 
  public function testGetText()
  {
- $messageText = 'One or more media files failed to be synchronized';
+ $messageText = 'We were unable to synchronize one or more media files.';
 
  $this->assertContains($messageText, (string)$this->_model->getText());
  }

diff --git a/app/code/Magento/AdminNotification/Test/Unit/Model/System/Message/SecurityTest.php b/app/code/Magento/AdminNotification/Test/Unit/Model/System/Message/SecurityTest.php
@@ -90,7 +90,7 @@ public function isDisplayedDataProvider()
 
  public function testGetText()
  {
- $messageStart = 'Your web server is configured incorrectly.';
+ $messageStart = 'Your web server is set up incorrectly';
 
  $this->assertStringStartsWith($messageStart, (string)$this->_messageModel->getText());
  }

diff --git a/app/code/Magento/Authorization/Model/Acl/AclRetriever.php b/app/code/Magento/Authorization/Model/Acl/AclRetriever.php
@@ -76,7 +76,7 @@ public function getAllowedResourcesByUser($userType, $userId)
  $role = $this->_getUserRole($userType, $userId);
  if (!$role) {
  throw new AuthorizationException(
- __('The role associated with the specified user cannot be found.')
+ __('We can\'t find the role for the user you wanted.')
  );
  }
  $allowedResources = $this->getAllowedResourcesByRole($role->getId());
@@ -85,7 +85,10 @@ public function getAllowedResourcesByUser($userType, $userId)
  } catch (\Exception $e) {
  $this->logger->critical($e);
  throw new LocalizedException(
- __('Error happened while getting a list of allowed resources. Check exception log for details.')
+ __(
+ 'Something went wrong while compiling a list of allowed resources. '
+ . 'You can find out more in the exceptions log.'
+ )
  );
  }
  return $allowedResources;

diff --git a/app/code/Magento/Authorization/Test/Unit/Model/Acl/AclRetrieverTest.php b/app/code/Magento/Authorization/Test/Unit/Model/Acl/AclRetrieverTest.php
@@ -57,7 +57,7 @@ public function testGetAllowedResourcesByUserTypeCustomer()
 
  /**
  * @expectedException \Magento\Framework\Exception\AuthorizationException
- * @expectedExceptionMessage The role associated with the specified user cannot be found.
+ * @expectedExceptionMessage We can't find the role for the user you wanted.
  */
  public function testGetAllowedResourcesByUserRoleNotFound()
  {

diff --git a/app/code/Magento/Backend/Block/Cache.php b/app/code/Magento/Backend/Block/Cache.php
@@ -27,7 +27,7 @@ protected function _construct()
  ]
  );
 
- $message = __('Cache storage may contain additional data. Are you sure that you want flush it?');
+ $message = __('The cache storage may contain additional data. Are you sure that you want to flush it?');
  $this->buttonList->add(
  'flush_system',
  [

diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Account/Save.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Account/Save.php
@@ -57,7 +57,7 @@ public function execute()
  if ($password !== '') {
  $user->sendPasswordResetNotificationEmail();
  }
- $this->messageManager->addSuccess(__('The account has been saved.'));
+ $this->messageManager->addSuccess(__('You saved the account.'));
  } catch (ValidatorException $e) {
  $this->messageManager->addMessages($e->getMessages());
  if ($e->getMessage()) {

diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Design/Delete.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Design/Delete.php
@@ -23,7 +23,7 @@ public function execute()
  } catch (\Magento\Framework\Exception\LocalizedException $e) {
  $this->messageManager->addError($e->getMessage());
  } catch (\Exception $e) {
- $this->messageManager->addException($e, __("Cannot delete the design change."));
+ $this->messageManager->addException($e, __("You can't delete the design change."));
  }
  }
  /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */

diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Store.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Store.php
@@ -113,7 +113,7 @@ protected function _backupDatabase()
  } catch (\Exception $e) {
  $this->messageManager->addException(
  $e,
- __('We couldn\'t create a backup right now. Please try again later.')
+ __('We can\'t create a backup right now. Please try again later.')
  );
  return false;
  }

diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteGroup.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteGroup.php
@@ -15,7 +15,7 @@ public function execute()
  {
  $itemId = $this->getRequest()->getParam('item_id', null);
  if (!($model = $this->_objectManager->create('Magento\Store\Model\Group')->load($itemId))) {
- $this->messageManager->addError(__('Unable to proceed. Please, try again.'));
+ $this->messageManager->addError(__('Something went wrong. Please try again.'));
  /** @var \Magento\Backend\Model\View\Result\Redirect $redirectResult */
  $redirectResult = $this->resultRedirectFactory->create();
  return $redirectResult->setPath('adminhtml/*/');

diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteGroupPost.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteGroupPost.php
@@ -21,7 +21,7 @@ public function execute()
  $redirectResult = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
 
  if (!($model = $this->_objectManager->create('Magento\Store\Model\Group')->load($itemId))) {
- $this->messageManager->addError(__('Unable to proceed. Please, try again.'));
+ $this->messageManager->addError(__('Something went wrong. Please try again.'));
  return $redirectResult->setPath('adminhtml/*/');
  }
  if (!$model->isCanDelete()) {
@@ -35,7 +35,7 @@ public function execute()
 
  try {
  $model->delete();
- $this->messageManager->addSuccess(__('The store has been deleted.'));
+ $this->messageManager->addSuccess(__('You deleted the store.'));
  return $redirectResult->setPath('adminhtml/*/');
  } catch (\Magento\Framework\Exception\LocalizedException $e) {
  $this->messageManager->addError($e->getMessage());

diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteStore.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteStore.php
@@ -15,7 +15,7 @@ public function execute()
  {
  $itemId = $this->getRequest()->getParam('item_id', null);
  if (!($model = $this->_objectManager->create('Magento\Store\Model\Store')->load($itemId))) {
- $this->messageManager->addError(__('Unable to proceed. Please, try again.'));
+ $this->messageManager->addError(__('Something went wrong. Please try again.'));
  /** @var \Magento\Backend\Model\View\Result\Redirect $redirectResult */
  $redirectResult = $this->resultRedirectFactory->create();
  return $redirectResult->setPath('adminhtml/*/');

diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteStorePost.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteStorePost.php
@@ -22,7 +22,7 @@ public function execute()
  /** @var \Magento\Backend\Model\View\Result\Redirect $redirectResult */
  $redirectResult = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
  if (!($model = $this->_objectManager->create('Magento\Store\Model\Store')->load($itemId))) {
- $this->messageManager->addError(__('Unable to proceed. Please, try again'));
+ $this->messageManager->addError(__('Something went wrong. Please try again.'));
  return $redirectResult->setPath('adminhtml/*/');
  }
  if (!$model->isCanDelete()) {
@@ -39,7 +39,7 @@ public function execute()
 
  $this->_eventManager->dispatch('store_delete', ['store' => $model]);
 
- $this->messageManager->addSuccess(__('The store view has been deleted.'));
+ $this->messageManager->addSuccess(__('You deleted the store view.'));
  return $redirectResult->setPath('adminhtml/*/');
  } catch (\Magento\Framework\Exception\LocalizedException $e) {
  $this->messageManager->addError($e->getMessage());

diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteWebsite.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteWebsite.php
@@ -15,7 +15,7 @@ public function execute()
  {
  $itemId = $this->getRequest()->getParam('item_id', null);
  if (!($model = $this->_objectManager->create('Magento\Store\Model\Website')->load($itemId))) {
- $this->messageManager->addError(__('Unable to proceed. Please, try again.'));
+ $this->messageManager->addError(__('Something went wrong. Please try again.'));
  /** @var \Magento\Backend\Model\View\Result\Redirect $redirectResult */
  $redirectResult = $this->resultRedirectFactory->create();
  return $redirectResult->setPath('adminhtml/*/');

diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteWebsitePost.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteWebsitePost.php
@@ -23,7 +23,7 @@ public function execute()
  $redirectResult = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
 
  if (!$model) {
- $this->messageManager->addError(__('Unable to proceed. Please, try again'));
+ $this->messageManager->addError(__('Something went wrong. Please try again.'));
  return $redirectResult->setPath('adminhtml/*/');
  }
  if (!$model->isCanDelete()) {
@@ -37,7 +37,7 @@ public function execute()
 
  try {
  $model->delete();
- $this->messageManager->addSuccess(__('The website has been deleted.'));
+ $this->messageManager->addSuccess(__('You deleted the website.'));
  return $redirectResult->setPath('adminhtml/*/');
  } catch (\Magento\Framework\Exception\LocalizedException $e) {
  $this->messageManager->addError($e->getMessage());

diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/EditStore.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/EditStore.php
@@ -31,7 +31,7 @@ public function execute()
  $model = $this->_objectManager->create('Magento\Store\Model\Website');
  $title = __("Web Site");
  $notExists = __("The website does not exist.");
- $codeBase = __('Before modifying the website code please make sure that it is not used in index.php.');
+ $codeBase = __('Before modifying the website code please make sure it is not used in index.php.');
  break;
  case 'group':
  $itemId = $this->getRequest()->getParam('group_id', null);
@@ -45,9 +45,7 @@ public function execute()
  $model = $this->_objectManager->create('Magento\Store\Model\Store');
  $title = __("Store View");
  $notExists = __("Store view doesn't exist");
- $codeBase = __(
- 'Before modifying the store view code please make sure that it is not used in index.php.'
- );
+ $codeBase = __('Before modifying the store view code please make sure it is not used in index.php.');
  break;
  default:
  break;

diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/Save.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/Save.php
@@ -37,7 +37,7 @@ public function execute()
  }
 
  $websiteModel->save();
- $this->messageManager->addSuccess(__('The website has been saved.'));
+ $this->messageManager->addSuccess(__('You saved the website.'));
  break;
 
  case 'group':
@@ -55,7 +55,7 @@ public function execute()
 
  $this->_eventManager->dispatch('store_group_save', ['group' => $groupModel]);
 
- $this->messageManager->addSuccess(__('The store has been saved.'));
+ $this->messageManager->addSuccess(__('You saved the store.'));
  break;
 
  case 'store':
@@ -82,7 +82,7 @@ public function execute()
 
  $this->_eventManager->dispatch($eventName, ['store' => $storeModel]);
 
- $this->messageManager->addSuccess(__('The store view has been saved'));
+ $this->messageManager->addSuccess(__('You saved the store view.'));
  break;
  default:
  $redirectResult->setPath('adminhtml/*/');
@@ -96,7 +96,7 @@ public function execute()
  } catch (\Exception $e) {
  $this->messageManager->addException(
  $e,
- __('An error occurred while saving. Please review the error log.')
+ __('Something went wrong while saving. Please review the error log.')
  );
  $this->_getSession()->setPostData($postData);
  }

diff --git a/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/System/Account/SaveTest.php b/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/System/Account/SaveTest.php
@@ -136,7 +136,7 @@ public function testSaveAction()
  \Magento\Backend\Block\System\Account\Edit\Form::IDENTITY_VERIFICATION_PASSWORD_FIELD => 'current_password',
  ];
 
- $testedMessage = 'The account has been saved.';
+ $testedMessage = 'You saved the account.';
 
  $this->_authSessionMock->expects($this->any())->method('getUser')->will($this->returnValue($this->_userMock));
 

diff --git a/app/code/Magento/Backend/etc/adminhtml/system.xml b/app/code/Magento/Backend/etc/adminhtml/system.xml
@@ -180,15 +180,15 @@
  <group id="translate_inline" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
  <label>Translate Inline</label>
  <field id="active" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
- <label>Enabled for Frontend</label>
+ <label>Enabled for Storefront</label>
  <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
  <backend_model>Magento\Config\Model\Config\Backend\Translate</backend_model>
  </field>
  <field id="active_admin" translate="label comment" type="select" sortOrder="20" showInDefault="1" showInWebsite="0" showInStore="0">
  <label>Enabled for Admin</label>
  <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
  <backend_model>Magento\Config\Model\Config\Backend\Translate</backend_model>
- <comment>Translate, blocks and other output caches should be disabled for both frontend and admin inline translations.</comment>
+ <comment>Translate, blocks and other output caches should be disabled for both Storefront and Admin inline translations.</comment>
  </field>
  </group>
  <group id="js" translate="label" type="text" sortOrder="100" showInDefault="1" showInWebsite="1" showInStore="1">
@@ -410,7 +410,7 @@
  <depends>
  <field id="use_custom_path">1</field>
  </depends>
- <comment>You will have to log in after you save your custom admin path.</comment>
+ <comment>You will have to sign in after you save your custom admin path.</comment>
  </field>
  </group>
  <group id="security" translate="label" type="text" sortOrder="35" showInDefault="1" showInWebsite="0" showInStore="0">
@@ -513,10 +513,10 @@
  <comment>May be empty or start with {{secure_base_url}}, or {{unsecure_base_url}} placeholder.</comment>
  </field>
  <field id="use_in_frontend" translate="label" type="select" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="1">
- <label>Use Secure URLs in Frontend</label>
+ <label>Use Secure URLs on Storefront</label>
  <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
  <backend_model>Magento\Config\Model\Config\Backend\Secure</backend_model>
- <comment>Enter https protocol to use Secure URLs in Frontend.</comment>
+ <comment>Enter https protocol to use Secure URLs on Storefront.</comment>
  </field>
  <field id="use_in_adminhtml" translate="label" type="select" sortOrder="60" showInDefault="1" showInWebsite="0" showInStore="0">
  <label>Use Secure URLs in Admin</label>
@@ -556,7 +556,7 @@
  <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
  </field>
  <field id="use_frontend_sid" translate="label comment" type="select" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="0">
- <label>Use SID on Frontend</label>
+ <label>Use SID on Storefront</label>
  <comment>Allows customers to stay logged in when switching between different stores.</comment>
  <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
  </field>

diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/extended.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/extended.phtml
@@ -116,7 +116,7 @@ $numColumns = sizeof($block->getColumns());
  <?php echo __('of %1', '<span>' . $block->getCollection()->getLastPageNumber() . '</span>') ?>
  </label>
  <?php if ($_curPage < $_lastPage): ?>
- <button href="#"
+ <button type="button"
  title="<?php echo __('Next page') ?>"
  class="action-next"
  onclick="<?php echo $block->getJsObjectName() ?>.setPage('<?php echo($_curPage + 1) ?>');return false;">

diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/tabs.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/tabs.phtml
@@ -43,7 +43,7 @@
  <span class="admin__page-nav-item-message _error">
  <span class="admin__page-nav-item-message-icon"></span>
  <span class="admin__page-nav-item-message-tooltip">
- <?php echo __('This tab contains invalid data. Please solve the problem before saving.'); ?>
+ <?php echo __('This tab contains invalid data. Please resolve this before saving.'); ?>
  </span>
  </span>
  <span class="admin__page-nav-item-message-loader">

diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/tabshoriz.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/tabshoriz.phtml
@@ -21,7 +21,7 @@
  <a href="<?php echo $_tabHref?>" id="<?php echo $block->getTabId($_tab) ?>" title="<?php echo $block->getTabTitle($_tab) ?>" class="<?php $_tabClass ?>" data-tab-type="<?php $_tabType ?>">
  <span>
  <span class="changed" title="<?php echo __('The information in this tab has been changed.') ?>"></span>
- <span class="error" title="<?php echo __('This tab contains invalid data. Please solve the problem before saving.') ?>"></span>
+ <span class="error" title="<?php echo __('This tab contains invalid data. Please resolve this before saving.') ?>"></span>
  <span class="loader" title="<?php echo __('Loading...') ?>"></span>
  <?php echo $block->getTabLabel($_tab) ?>
  </span>