From f359bbcd3d734f5296f88c7078c1a2b6c3b00017 Mon Sep 17 00:00:00 2001
From: Misha Medzhytov <mdg12v@gmail.com>
Date: Sun, 2 Sep 2018 20:16:50 +0300
Subject: [PATCH] #17890: show correct text swatch values per store view

---
 app/code/Magento/Swatches/Helper/Data.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/code/Magento/Swatches/Helper/Data.php b/app/code/Magento/Swatches/Helper/Data.php
index 38879178235c0..ac19ad5116cc3 100644
--- a/app/code/Magento/Swatches/Helper/Data.php
+++ b/app/code/Magento/Swatches/Helper/Data.php
@@ -488,6 +488,8 @@ private function addFallbackOptions(array $fallbackValues, array $swatches)
                 && $swatches[$optionId]['type'] === $optionsArray[$currentStoreId]['type']
             ) {
                 $swatches[$optionId] = $optionsArray[$currentStoreId];
+            } elseif (isset($optionsArray[$currentStoreId])) {
+                $swatches[$optionId] = $optionsArray[$currentStoreId];
             } elseif (isset($optionsArray[self::DEFAULT_STORE_ID])) {
                 $swatches[$optionId] = $optionsArray[self::DEFAULT_STORE_ID];
             }