Merge remote-tracking branch 'remotes/api/MAGETWO-43683-Magento-2-Translation-Tools-Does-Not-Allow-To-Translate-Magento' into API-Bug-Branch

Author: Cari Spruiell

dev/tests/integration/testsuite/Magento/Setup/Module/I18n/Dictionary/_files/expected/with_context.csv

@@ -1,9 +1,11 @@
 Helper,Helper,module,Magento_FirstModule
-Model,Model,module,"Magento_FirstModule,Magento_SecondModule"
+Model,Model,module,Magento_FirstModule
 "Module template","Module template",module,Magento_FirstModule
+Model,Model,module,Magento_SecondModule
 "Theme template","Theme template",theme,adminhtml/default/backend
 "Module js","Module js",module,Magento_FirstModule
-"Lib js","Lib js",lib,"lib/web/mage/file.js,lib/web/varien/file.js"
+"Lib js","Lib js",lib,lib/web/mage/file.js
+"Lib js","Lib js",lib,lib/web/varien/file.js
 "Module layout label","Module layout label",module,Magento_FirstModule
 "Module layout title","Module layout title",module,Magento_FirstModule
 "Theme layout label","Theme layout label",theme,adminhtml/default/backend

setup/src/Magento/Setup/Module/I18n/Locale.php

@@ -30,9 +30,7 @@ class Locale
      */
     public function __construct($locale)
     {
-        if ($locale == self::DEFAULT_SYSTEM_LOCALE) {
-            throw new \InvalidArgumentException('Target locale is system default locale.');
-        } elseif (!preg_match('/[a-z]{2}_[A-Z]{2}/', $locale)) {
+        if (!preg_match('/[a-z]{2}_[A-Z]{2}/', $locale)) {
             throw new \InvalidArgumentException('Target locale must match the following format: "aa_AA".');
         }
         $this->_locale = $locale;

setup/src/Magento/Setup/Module/I18n/Parser/Contextual.php

@@ -63,7 +63,7 @@ protected function _parseByTypeOptions($options)
      */
     protected function _addPhrase($phraseData, $contextType, $contextValue)
     {
-        $phraseKey = $contextType . stripslashes($phraseData['phrase']);
+        $phraseKey = $contextType . $contextValue. stripslashes($phraseData['phrase']);
 
         if (isset($this->_phrases[$phraseKey])) {
             /** @var \Magento\Setup\Module\I18n\Dictionary\Phrase $phrase */

setup/src/Magento/Setup/Test/Unit/Module/I18n/LocaleTest.php

@@ -9,15 +9,6 @@
 
 class LocaleTest extends \PHPUnit_Framework_TestCase
 {
-    /**
-     * @expectedException \InvalidArgumentException
-     * @expectedExceptionMessage Target locale is system default locale.
-     */
-    public function testLocaleIsSystemDefaultLocaleException()
-    {
-        new Locale('en_US');
-    }
-
     /**
      * @expectedException \InvalidArgumentException
      * @expectedExceptionMessage Target locale must match the following format: "aa_AA".