From 6b76685e2b2ca54bbbd44d3c79123b07744c1d84 Mon Sep 17 00:00:00 2001
From: Pascal Borreli <pascal@borreli.com>
Date: Sat, 5 Oct 2013 20:19:46 +0000
Subject: [PATCH] Fixed typos

---
 app/code/Magento/Core/Controller/Request/Http.php         | 2 +-
 app/code/Magento/Core/Helper/String.php                   | 1 -
 app/code/Magento/Core/Helper/Url.php                      | 4 ++--
 app/code/Magento/Core/Model/AbstractModel.php             | 4 ++--
 app/code/Magento/Core/Model/App/Emulation.php             | 2 +-
 app/code/Magento/Core/Model/Cache.php                     | 2 +-
 app/code/Magento/Core/Model/Cookie.php                    | 2 +-
 app/code/Magento/Core/Model/Dir.php                       | 2 +-
 app/code/Magento/Core/Model/Email/Template/Mailer.php     | 4 ++--
 app/code/Magento/Core/Model/File/Storage.php              | 2 +-
 .../Core/Model/File/Storage/Directory/Database.php        | 2 +-
 app/code/Magento/Core/Model/Image/AdapterFactory.php      | 2 +-
 .../Core/Model/Layout/Argument/AbstractHandler.php        | 2 +-
 .../Core/Model/Layout/Argument/Handler/ArrayHandler.php   | 2 +-
 app/code/Magento/Core/Model/Locale.php                    | 6 +++---
 app/code/Magento/Core/Model/LocaleInterface.php           | 6 +++---
 .../Core/Model/ObjectManager/DefinitionFactory.php        | 2 +-
 app/code/Magento/Core/Model/Resource/Config/Data.php      | 2 +-
 app/code/Magento/Core/Model/Resource/Db/AbstractDb.php    | 2 +-
 app/code/Magento/Core/Model/Resource/Email/Template.php   | 8 ++++----
 app/code/Magento/Core/Model/Resource/Setup.php            | 2 +-
 app/code/Magento/Core/Model/Resource/Transaction.php      | 2 +-
 .../Magento/Core/Model/Resource/Variable/Collection.php   | 2 +-
 app/code/Magento/Core/Model/Store/Group.php               | 2 +-
 .../Magento/Core/Model/Store/Storage/DefaultStorage.php   | 2 +-
 app/code/Magento/Core/Model/Template.php                  | 4 ++--
 app/code/Magento/Core/Model/Website.php                   | 2 +-
 app/code/Magento/Core/i18n/fr_FR.csv                      | 4 ++--
 28 files changed, 39 insertions(+), 40 deletions(-)

diff --git a/app/code/Magento/Core/Controller/Request/Http.php b/app/code/Magento/Core/Controller/Request/Http.php
index c740e9f02ba8e..62d2b132d1fa6 100644
--- a/app/code/Magento/Core/Controller/Request/Http.php
+++ b/app/code/Magento/Core/Controller/Request/Http.php
@@ -59,7 +59,7 @@ class Http extends \Zend_Controller_Request_Http
     protected $_controllerModule = null;
 
     /**
-     * Streight request flag.
+     * Straight request flag.
      * If flag is determined no additional logic is applicable
      *
      * @var $_isStraight bool
diff --git a/app/code/Magento/Core/Helper/String.php b/app/code/Magento/Core/Helper/String.php
index adbc4aed30c07..4ac81d0d3f42d 100644
--- a/app/code/Magento/Core/Helper/String.php
+++ b/app/code/Magento/Core/Helper/String.php
@@ -134,7 +134,6 @@ public function splitInjection($str, $length = 50, $needle = '-', $insert = ' ')
         foreach ($str as $part) {
             if ($this->strlen($part) >= $length) {
                 $lastDelimetr = $this->strpos($this->strrev($part), $needle);
-                $tmpNewStr = '';
                 $tmpNewStr = $this->substr($this->strrev($part), 0, $lastDelimetr)
                     . $insert . $this->substr($this->strrev($part), $lastDelimetr);
                 $newStr .= $this->strrev($tmpNewStr);
diff --git a/app/code/Magento/Core/Helper/Url.php b/app/code/Magento/Core/Helper/Url.php
index e76b2b0875b3d..553725115dd1b 100644
--- a/app/code/Magento/Core/Helper/Url.php
+++ b/app/code/Magento/Core/Helper/Url.php
@@ -151,8 +151,8 @@ public function addRequestParam($url, $param)
     public function removeRequestParam($url, $paramKey, $caseSensitive = false)
     {
         $regExpression = '/\\?[^#]*?(' . preg_quote($paramKey, '/') . '\\=[^#&]*&?)/' . ($caseSensitive ? '' : 'i');
-        while (preg_match($regExpression, $url, $mathes) != 0) {
-            $paramString = $mathes[1];
+        while (preg_match($regExpression, $url, $matches) != 0) {
+            $paramString = $matches[1];
             if (preg_match('/&$/', $paramString) == 0) {
                 $url = preg_replace('/(&|\\?)?' . preg_quote($paramString, '/') . '/', '', $url);
             } else {
diff --git a/app/code/Magento/Core/Model/AbstractModel.php b/app/code/Magento/Core/Model/AbstractModel.php
index 173069338fb43..5d63ccf880de9 100644
--- a/app/code/Magento/Core/Model/AbstractModel.php
+++ b/app/code/Magento/Core/Model/AbstractModel.php
@@ -346,7 +346,7 @@ public function afterLoad()
     /**
      * Check whether model has changed data.
      * Can be overloaded in child classes to perform advanced check whether model needs to be saved
-     * e.g. usign resouceModel->hasDataChanged() or any other technique
+     * e.g. using resourceModel->hasDataChanged() or any other technique
      *
      * @return boolean
      */
@@ -673,7 +673,7 @@ public function getResource()
     }
 
     /**
-     * Retreive entity id
+     * Retrieve entity id
      *
      * @return mixed
      */
diff --git a/app/code/Magento/Core/Model/App/Emulation.php b/app/code/Magento/Core/Model/App/Emulation.php
index e43e82d5958d2..b2d5a6d6fa77d 100644
--- a/app/code/Magento/Core/Model/App/Emulation.php
+++ b/app/code/Magento/Core/Model/App/Emulation.php
@@ -139,7 +139,7 @@ public function startEnvironmentEmulation($storeId, $area = \Magento\Core\Model\
     }
 
     /**
-     * Stop enviromment emulation
+     * Stop environment emulation
      *
      * Function restores initial store environment
      *
diff --git a/app/code/Magento/Core/Model/Cache.php b/app/code/Magento/Core/Model/Cache.php
index 529cebb283333..b10ff71bd508e 100644
--- a/app/code/Magento/Core/Model/Cache.php
+++ b/app/code/Magento/Core/Model/Cache.php
@@ -26,7 +26,7 @@
 
 /**
  * System cache model
- * support id and tags preffix support,
+ * support id and tags prefix support,
  */
 
 namespace Magento\Core\Model;
diff --git a/app/code/Magento/Core/Model/Cookie.php b/app/code/Magento/Core/Model/Cookie.php
index 7ea96ff9662fd..440f27c5d79d5 100644
--- a/app/code/Magento/Core/Model/Cookie.php
+++ b/app/code/Magento/Core/Model/Cookie.php
@@ -307,7 +307,7 @@ public function renew($name, $period = null, $path = null, $domain = null, $secu
     /**
      * Retrieve cookie or false if not exists
      *
-     * @param string $neme The cookie name
+     * @param string $name The cookie name
      * @return mixed
      */
     public function get($name = null)
diff --git a/app/code/Magento/Core/Model/Dir.php b/app/code/Magento/Core/Model/Dir.php
index 4de063011cd5f..2011c761a5b94 100644
--- a/app/code/Magento/Core/Model/Dir.php
+++ b/app/code/Magento/Core/Model/Dir.php
@@ -3,7 +3,7 @@
  * Application file system directories dictionary
  *
  * Provides information about what directories are available in the application
- * Serves as customizaiton point to specify different directories or add own
+ * Serves as customization point to specify different directories or add own
  *
  * Magento
  *
diff --git a/app/code/Magento/Core/Model/Email/Template/Mailer.php b/app/code/Magento/Core/Model/Email/Template/Mailer.php
index 686f8c20f2719..f04b0cbf69370 100644
--- a/app/code/Magento/Core/Model/Email/Template/Mailer.php
+++ b/app/code/Magento/Core/Model/Email/Template/Mailer.php
@@ -87,7 +87,7 @@ public function send()
         // Send all emails from corresponding list
         while (!empty($this->_emailInfos)) {
             $emailInfo = array_pop($this->_emailInfos);
-            // Handle "Bcc" recepients of the current email
+            // Handle "Bcc" recipients of the current email
             $emailTemplate->addBcc($emailInfo->getBccEmails());
             // Set required design parameters and delegate email sending to \Magento\Core\Model\Email\Template
             $designConfig = array(
@@ -172,7 +172,7 @@ public function getTemplateId()
     }
 
     /**
-     * Set tempate parameters
+     * Set template parameters
      *
      * @param array $templateParams
      * @return \Magento\Core\Model\Email\Template\Mailer
diff --git a/app/code/Magento/Core/Model/File/Storage.php b/app/code/Magento/Core/Model/File/Storage.php
index e8d8fb4dd5593..9576d978e8992 100644
--- a/app/code/Magento/Core/Model/File/Storage.php
+++ b/app/code/Magento/Core/Model/File/Storage.php
@@ -43,7 +43,7 @@ class Storage extends \Magento\Core\Model\AbstractModel
     const STORAGE_MEDIA_DATABASE            = 1;
 
     /**
-     * Config pathes for storing storage configuration
+     * Config paths for storing storage configuration
      */
     const XML_PATH_STORAGE_MEDIA            = 'system/media_storage_configuration/media_storage';
     const XML_PATH_STORAGE_MEDIA_DATABASE   = 'system/media_storage_configuration/media_database';
diff --git a/app/code/Magento/Core/Model/File/Storage/Directory/Database.php b/app/code/Magento/Core/Model/File/Storage/Directory/Database.php
index 5b86cc1b01e90..a45e899a80f7d 100644
--- a/app/code/Magento/Core/Model/File/Storage/Directory/Database.php
+++ b/app/code/Magento/Core/Model/File/Storage/Directory/Database.php
@@ -264,7 +264,7 @@ public function getSubdirectories($directory)
     /**
      * Delete directory from database
      *
-     * @param string $path
+     * @param string $dirPath
      * @return \Magento\Core\Model\File\Storage\Directory\Database
      */
     public function deleteDirectory($dirPath)
diff --git a/app/code/Magento/Core/Model/Image/AdapterFactory.php b/app/code/Magento/Core/Model/Image/AdapterFactory.php
index d319fce7ea8a8..ee5bd9697f6a0 100644
--- a/app/code/Magento/Core/Model/Image/AdapterFactory.php
+++ b/app/code/Magento/Core/Model/Image/AdapterFactory.php
@@ -86,7 +86,7 @@ public function __construct(
      * @param string $adapterType
      * @return \Magento\Image\Adapter\AbstractAdapter
      * @throws \InvalidArgumentException
-     * @throws \Exception if some of dependecies are missing
+     * @throws \Exception if some of dependencies are missing
      */
     public function create($adapterType = null)
     {
diff --git a/app/code/Magento/Core/Model/Layout/Argument/AbstractHandler.php b/app/code/Magento/Core/Model/Layout/Argument/AbstractHandler.php
index 1bd628e3de567..7a5fad5272cb7 100644
--- a/app/code/Magento/Core/Model/Layout/Argument/AbstractHandler.php
+++ b/app/code/Magento/Core/Model/Layout/Argument/AbstractHandler.php
@@ -61,7 +61,7 @@ protected function _getArgumentValue(\Magento\Core\Model\Layout\Element $argumen
     }
 
     /**
-     * Check whether updater used and value not overwriten
+     * Check whether updater used and value not overwritten
      *
      * @param \Magento\Core\Model\Layout\Element $argument
      * @return string
diff --git a/app/code/Magento/Core/Model/Layout/Argument/Handler/ArrayHandler.php b/app/code/Magento/Core/Model/Layout/Argument/Handler/ArrayHandler.php
index b46e23c9c1248..1d447c78158c4 100644
--- a/app/code/Magento/Core/Model/Layout/Argument/Handler/ArrayHandler.php
+++ b/app/code/Magento/Core/Model/Layout/Argument/Handler/ArrayHandler.php
@@ -91,7 +91,7 @@ protected function _validate(array $argument)
     }
 
     /**
-     * Retrive value from Array argument
+     * Retrieve value from Array argument
      *
      * @param \Magento\Core\Model\Layout\Element $argument
      * @return array|null
diff --git a/app/code/Magento/Core/Model/Locale.php b/app/code/Magento/Core/Model/Locale.php
index d5161ae22b111..d2c13074cdde4 100644
--- a/app/code/Magento/Core/Model/Locale.php
+++ b/app/code/Magento/Core/Model/Locale.php
@@ -145,7 +145,7 @@ public function setDefaultLocale($locale)
     }
 
     /**
-     * REtrieve default locale code
+     * Retrieve default locale code
      *
      * @return string
      */
@@ -241,7 +241,7 @@ public function setLocaleCode($code)
     }
 
     /**
-     * Get options array for locale dropdown in currunt locale
+     * Get options array for locale dropdown in current locale
      *
      * @return array
      */
@@ -557,7 +557,7 @@ public function utcDate($store, $date, $includeTime = false, $format = null)
 
     /**
      * Get store timestamp
-     * Timstamp will be builded with store timezone settings
+     * Timestamp will be built with store timezone settings
      *
      * @param   mixed $store
      * @return  int
diff --git a/app/code/Magento/Core/Model/LocaleInterface.php b/app/code/Magento/Core/Model/LocaleInterface.php
index b62b376b5a1c3..88b0c3c9a3040 100644
--- a/app/code/Magento/Core/Model/LocaleInterface.php
+++ b/app/code/Magento/Core/Model/LocaleInterface.php
@@ -66,7 +66,7 @@ interface LocaleInterface
     public function setDefaultLocale($locale);
 
     /**
-     * REtrieve default locale code
+     * Retrieve default locale code
      *
      * @return string
      */
@@ -117,7 +117,7 @@ public function getLocaleCode();
     public function setLocaleCode($code);
 
     /**
-     * Get options array for locale dropdown in currunt locale
+     * Get options array for locale dropdown in current locale
      *
      * @return array
      */
@@ -246,7 +246,7 @@ public function utcDate($store, $date, $includeTime = false, $format = null);
 
     /**
      * Get store timestamp
-     * Timstamp will be builded with store timezone settings
+     * Timestamp will be built with store timezone settings
      *
      * @param   mixed $store
      * @return  int
diff --git a/app/code/Magento/Core/Model/ObjectManager/DefinitionFactory.php b/app/code/Magento/Core/Model/ObjectManager/DefinitionFactory.php
index f5f49a51da393..f22d286133765 100644
--- a/app/code/Magento/Core/Model/ObjectManager/DefinitionFactory.php
+++ b/app/code/Magento/Core/Model/ObjectManager/DefinitionFactory.php
@@ -121,7 +121,7 @@ public function createPluginDefinition()
     }
 
     /**
-     * Retreive class relations list
+     * Retrieve class relations list
      *
      * @return \Magento\Core\Model\ObjectManager\Relations|\Magento\ObjectManager\Relations\Runtime
      */
diff --git a/app/code/Magento/Core/Model/Resource/Config/Data.php b/app/code/Magento/Core/Model/Resource/Config/Data.php
index 5c6be5693e643..709c365c9d4af 100644
--- a/app/code/Magento/Core/Model/Resource/Config/Data.php
+++ b/app/code/Magento/Core/Model/Resource/Config/Data.php
@@ -105,7 +105,7 @@ public function clearWebsiteData(\Magento\Core\Model\Website $website)
     }
 
     /**
-     * Cleare store data
+     * Clear store data
      *
      * @param array $storeIds
      */
diff --git a/app/code/Magento/Core/Model/Resource/Db/AbstractDb.php b/app/code/Magento/Core/Model/Resource/Db/AbstractDb.php
index c7183640b2cfa..3cf05f2d968d2 100644
--- a/app/code/Magento/Core/Model/Resource/Db/AbstractDb.php
+++ b/app/code/Magento/Core/Model/Resource/Db/AbstractDb.php
@@ -86,7 +86,7 @@ abstract class AbstractDb extends \Magento\Core\Model\Resource\AbstractResource
     protected $_idFieldName;
 
     /**
-     * Primery key auto increment flag
+     * Primary key auto increment flag
      *
      * @var bool
      */
diff --git a/app/code/Magento/Core/Model/Resource/Email/Template.php b/app/code/Magento/Core/Model/Resource/Email/Template.php
index 5d0c942f19c44..c6ae33330a708 100644
--- a/app/code/Magento/Core/Model/Resource/Email/Template.php
+++ b/app/code/Magento/Core/Model/Resource/Email/Template.php
@@ -112,7 +112,7 @@ protected function _beforeSave(\Magento\Core\Model\AbstractModel $object)
     }
 
     /**
-     * Retrieve config scope and scope id of specified email template by email pathes
+     * Retrieve config scope and scope id of specified email template by email paths
      *
      * @param array $paths
      * @param int|string $templateId
@@ -121,13 +121,13 @@ protected function _beforeSave(\Magento\Core\Model\AbstractModel $object)
     public function getSystemConfigByPathsAndTemplateId($paths, $templateId)
     {
         $orWhere = array();
-        $pathesCounter = 1;
+        $pathsCounter = 1;
         $bind = array();
         foreach ($paths as $path) {
-            $pathAlias = 'path_' . $pathesCounter;
+            $pathAlias = 'path_' . $pathsCounter;
             $orWhere[] = 'path = :' . $pathAlias;
             $bind[$pathAlias] = $path;
-            $pathesCounter++;
+            $pathsCounter++;
         }
         $bind['template_id'] = $templateId;
         $select = $this->_getReadAdapter()->select()
diff --git a/app/code/Magento/Core/Model/Resource/Setup.php b/app/code/Magento/Core/Model/Resource/Setup.php
index 99a72bcaa0281..fcb7e4f4a7804 100644
--- a/app/code/Magento/Core/Model/Resource/Setup.php
+++ b/app/code/Magento/Core/Model/Resource/Setup.php
@@ -791,7 +791,7 @@ public function getCallAfterApplyAllUpdates()
 
     /**
      * Run each time after applying of all updates,
-     * if setup model setted  $_callAfterApplyAllUpdates flag to true
+     * if setup model setted $_callAfterApplyAllUpdates flag to true
      *
      * @return \Magento\Core\Model\Resource\Setup
      */
diff --git a/app/code/Magento/Core/Model/Resource/Transaction.php b/app/code/Magento/Core/Model/Resource/Transaction.php
index 6a17c7e244832..a9f158997631b 100644
--- a/app/code/Magento/Core/Model/Resource/Transaction.php
+++ b/app/code/Magento/Core/Model/Resource/Transaction.php
@@ -28,7 +28,7 @@
 /**
  * Resource transaction model
  *
- * @todo need collect conection by name
+ * @todo need collect connection by name
  * @category   Magento
  * @package    Magento_Core
  * @author      Magento Core Team <core@magentocommerce.com>
diff --git a/app/code/Magento/Core/Model/Resource/Variable/Collection.php b/app/code/Magento/Core/Model/Resource/Variable/Collection.php
index 4881f81d19c74..540dc3bd5d89b 100644
--- a/app/code/Magento/Core/Model/Resource/Variable/Collection.php
+++ b/app/code/Magento/Core/Model/Resource/Variable/Collection.php
@@ -26,7 +26,7 @@
 
 
 /**
- * Custom variabel collection
+ * Custom variable collection
  *
  * @category    Magento
  * @package     Magento_Core
diff --git a/app/code/Magento/Core/Model/Store/Group.php b/app/code/Magento/Core/Model/Store/Group.php
index 514e8362aa4b1..ce88a06ec2e71 100644
--- a/app/code/Magento/Core/Model/Store/Group.php
+++ b/app/code/Magento/Core/Model/Store/Group.php
@@ -198,7 +198,7 @@ public function getStoreCollection()
     }
 
     /**
-     * Retrieve wersite store objects
+     * Retrieve website store objects
      *
      * @return array
      */
diff --git a/app/code/Magento/Core/Model/Store/Storage/DefaultStorage.php b/app/code/Magento/Core/Model/Store/Storage/DefaultStorage.php
index 0f122ccf30746..be2840430f46f 100644
--- a/app/code/Magento/Core/Model/Store/Storage/DefaultStorage.php
+++ b/app/code/Magento/Core/Model/Store/Storage/DefaultStorage.php
@@ -67,7 +67,7 @@ public function __construct(
     }
 
     /**
-     * Initialize current applicaition store
+     * Initialize current application store
      */
     public function initCurrentStore()
     {
diff --git a/app/code/Magento/Core/Model/Template.php b/app/code/Magento/Core/Model/Template.php
index 15c4affe69c5b..f72bb03f5031b 100644
--- a/app/code/Magento/Core/Model/Template.php
+++ b/app/code/Magento/Core/Model/Template.php
@@ -48,7 +48,7 @@ abstract class Template extends \Magento\Core\Model\AbstractModel
     const DEFAULT_DESIGN_AREA = 'frontend';
 
     /**
-     * Configuration of desing package for template
+     * Configuration of design package for template
      *
      * @var \Magento\Object
      */
@@ -56,7 +56,7 @@ abstract class Template extends \Magento\Core\Model\AbstractModel
 
 
     /**
-     * Configuration of emulated desing package.
+     * Configuration of emulated design package.
      *
      * @var \Magento\Object|boolean
      */
diff --git a/app/code/Magento/Core/Model/Website.php b/app/code/Magento/Core/Model/Website.php
index 0a61ef52f9683..bd03b68fe2af9 100644
--- a/app/code/Magento/Core/Model/Website.php
+++ b/app/code/Magento/Core/Model/Website.php
@@ -422,7 +422,7 @@ public function getStoreCollection()
     }
 
     /**
-     * Retrieve wersite store objects
+     * Retrieve website store objects
      *
      * @return array
      */
diff --git a/app/code/Magento/Core/i18n/fr_FR.csv b/app/code/Magento/Core/i18n/fr_FR.csv
index 9ef05bfa27ff5..31b7cbdf5e8ac 100644
--- a/app/code/Magento/Core/i18n/fr_FR.csv
+++ b/app/code/Magento/Core/i18n/fr_FR.csv
@@ -13,7 +13,7 @@
 "Advanced","Avancé(e)"
 "After selecting a new media storage location, press the Synchronize button
                                 to transfer all media to that location. Media will not be available in the new
-                                location until the synchronization process is complete.","Après avoir sélectionn un nouveau lieu de stockage des médias, appuyez sur le bouton Synchroniser pour transférer tous les médias vers cet emplacement. Les médias ne seront disponibles dans le nouvel emplacement que lorsque la processus sera terminé."
+                                location until the synchronization process is complete.","Après avoir sélectionné un nouveau lieu de stockage des médias, appuyez sur le bouton Synchroniser pour transférer tous les médias vers cet emplacement. Les médias ne seront disponibles dans le nouvel emplacement que lorsque la processus sera terminé."
 "Allow Countries","Permettre pays"
 "Allow Symlinks","Autoriser les Symlinks"
 "Allowed IPs (comma separated)","IPs permis (séparés par virgule)"
@@ -24,7 +24,7 @@
 "An error occurred while saving. Please review the error log.","Une erreur est survenue durant sauvegarde. Veuillez consulter le journal de bord des erreurs."
 "Anchor Text for Next","Ancrer texte pour suivant"
 "Anchor Text for Previous","Ancrer texte pour précédent"
-"Anchor symbol (#) is not supported in request path","Le symbolr d'ancrage (#) n'est pas pris en charge dans la demande de chemin d'accès"
+"Anchor symbol (#) is not supported in request path","Le symbole d'ancrage (#) n'est pas pris en charge dans la demande de chemin d'accès"
 "Anchor symbol (#) is not supported in url rewrite suffix","Le symbole d'ancrage (#) n'est pas pris en charge dans le suffixe de réécriture de l'url"
 "Are you sure?","Etes-vous sûr ?"
 "Auto-redirect to Base URL","Redirige automatiquement vers base URL"