MC-19701: Country code for Taiwan (Province of China)

yelahin-serhiy · yelahin-serhiy · commit 03ed173cf3e8 · 2019-09-12T10:39:13.000+03:00
diff --git a/app/code/Magento/Config/i18n/en_US.csv b/app/code/Magento/Config/i18n/en_US.csv
@@ -118,3 +118,4 @@ Dashboard,Dashboard
 "Web Section","Web Section"
 "Store Email Addresses Section","Store Email Addresses Section"
 "Email to a Friend","Email to a Friend"
+"Taiwan","Taiwan, Province of China"
diff --git a/lib/internal/Magento/Framework/Locale/TranslatedLists.php b/lib/internal/Magento/Framework/Locale/TranslatedLists.php
@@ -207,11 +207,7 @@ public function getCountryTranslation($value, $locale = null)
             $locale = $this->localeResolver->getLocale();
         }
 
-        $language = \Locale::getPrimaryLanguage($locale);
         $translation = (new RegionBundle())->get($locale)['Countries'][$value];
-        if ($value == 'TW' && $language == 'en') {
-            $translation .= ", Province of China";
-        }
 
         return $translation ? (string)__($translation) : $translation;
     }

Original file line number	Diff line number	Diff line change
`@@ -207,11 +207,7 @@ public function getCountryTranslation($value, $locale = null)`
`207`	`207`	`$locale = $this->localeResolver->getLocale();`
`208`	`208`	`}`
`209`	`209`
`210`		`- $language = \Locale::getPrimaryLanguage($locale);`
`211`	`210`	`$translation = (new RegionBundle())->get($locale)['Countries'][$value];`
`212`		`- if ($value == 'TW' && $language == 'en') {`
`213`		`- $translation .= ", Province of China";`
`214`		`- }`
`215`	`211`
`216`	`212`	`return $translation ? (string)__($translation) : $translation;`
`217`	`213`	`}`