MAGETWO-64557: User can change the Interface Locale only to locales that are already deployed

Author: oshmyheliuk

app/code/Magento/Backend/Block/System/Account/Edit/Form.php

@@ -6,7 +6,7 @@
 namespace Magento\Backend\Block\System\Account\Edit;
 
 use Magento\Framework\App\ObjectManager;
-use Magento\Framework\Locale\Deployed\OptionInterface;
+use Magento\Framework\Locale\OptionInterface;
 
 /**
  * Adminhtml edit admin user account form
@@ -135,7 +135,7 @@ protected function _prepareForm()
                 'name' => 'interface_locale',
                 'label' => __('Interface Locale'),
                 'title' => __('Interface Locale'),
-                'values' => $this->deployedLocales->getTranslatedLocales(),
+                'values' => $this->deployedLocales->getTranslatedOptionLocales(),
                 'class' => 'select'
             ]
         );

app/code/Magento/User/Block/User/Edit/Tab/Main.php

@@ -9,7 +9,7 @@
 namespace Magento\User\Block\User\Edit\Tab;
 
 use Magento\Framework\App\ObjectManager;
-use Magento\Framework\Locale\Deployed\OptionInterface;
+use Magento\Framework\Locale\OptionInterface;
 
 /**
  * Cms page edit form main tab
@@ -152,7 +152,7 @@ protected function _prepareForm()
                 'name' => 'interface_locale',
                 'label' => __('Interface Locale'),
                 'title' => __('Interface Locale'),
-                'values' => $this->deployedLocales->getLocales(),
+                'values' => $this->deployedLocales->getOptionLocales(),
                 'class' => 'select'
             ]
         );

app/etc/di.xml

@@ -35,7 +35,7 @@
     <preference for="Magento\Framework\View\Asset\Bundle\ConfigInterface" type="\Magento\Framework\View\Asset\Bundle\Config" />
     <preference for="Magento\Framework\Locale\ListsInterface" type="Magento\Framework\Locale\TranslatedLists" />
     <preference for="Magento\Framework\Locale\AvailableLocalesInterface" type="Magento\Framework\Locale\Deployed\Codes" />
-    <preference for="Magento\Framework\Locale\Deployed\OptionInterface" type="Magento\Framework\Locale\Deployed\Options" />
+    <preference for="Magento\Framework\Locale\OptionInterface" type="Magento\Framework\Locale\Deployed\Options" />
     <preference for="Magento\Framework\Api\AttributeTypeResolverInterface" type="Magento\Framework\Reflection\AttributeTypeResolver" />
     <preference for="Magento\Framework\Api\Search\SearchResultInterface" type="Magento\Framework\Api\Search\SearchResult" />
     <preference for="Magento\Framework\Api\Search\SearchCriteriaInterface" type="Magento\Framework\Api\Search\SearchCriteria"/>

lib/internal/Magento/Framework/Locale/Deployed/Options.php

@@ -6,8 +6,10 @@
 namespace Magento\Framework\Locale\Deployed;
 
 use Magento\Framework\App\State;
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Locale\AvailableLocalesInterface;
 use Magento\Framework\Locale\ListsInterface;
+use Magento\Framework\Locale\OptionInterface;
 use Magento\Framework\View\DesignInterface;
 
 /**
@@ -64,15 +66,15 @@ public function __construct(
     /**
      * {@inheritdoc}
      */
-    public function getLocales()
+    public function getOptionLocales()
     {
         return $this->filterLocales($this->localeLists->getOptionLocales());
     }
 
     /**
      * {@inheritdoc}
      */
-    public function getTranslatedLocales()
+    public function getTranslatedOptionLocales()
     {
         return $this->filterLocales($this->localeLists->getTranslatedOptionLocales());
     }
@@ -118,7 +120,11 @@ private function filterLocales(array $locales)
         }
 
         $theme = $this->design->getDesignTheme();
-        $availableLocales = $this->availableLocales->getList($theme->getCode(), $theme->getArea());
+        try {
+            $availableLocales = $this->availableLocales->getList($theme->getCode(), $theme->getArea());
+        } catch (LocalizedException $e) {
+            $availableLocales = [];
+        }
 
         return array_filter($locales, function ($localeData) use ($availableLocales) {
             return in_array($localeData['value'], $availableLocales);

lib/internal/Magento/Framework/Locale/ListsInterface.php

@@ -5,22 +5,8 @@
  */
 namespace Magento\Framework\Locale;
 
-interface ListsInterface
+interface ListsInterface extends OptionInterface
 {
-    /**
-     * Get options array for locale dropdown in current locale
-     *
-     * @return array
-     */
-    public function getOptionLocales();
-
-    /**
-     * Get translated to original locale options array for locale dropdown
-     *
-     * @return array
-     */
-    public function getTranslatedOptionLocales();
-
     /**
      * Retrieve timezone option list
      *

lib/internal/Magento/Framework/Locale/Deployed/OptionInterface.php renamed to lib/internal/Magento/Framework/Locale/OptionInterface.php

@@ -3,10 +3,10 @@
  * Copyright © 2013-2017 Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Framework\Locale\Deployed;
+namespace Magento\Framework\Locale;
 
 /**
- * Interface for classes that returning array of deployed locales.
+ * Interface for classes that return array of locales.
  */
 interface OptionInterface
 {
@@ -29,7 +29,7 @@ interface OptionInterface
      *
      * @return array
      */
-    public function getLocales();
+    public function getOptionLocales();
 
     /**
      * Get array of deployed locales with translation.
@@ -50,5 +50,5 @@ public function getLocales();
      *
      * @return array
      */
-    public function getTranslatedLocales();
+    public function getTranslatedOptionLocales();
 }