ENGCOM-2586: [Backport] Magento sets ISO invalid language code #17212

magento-engcom-team · magento-engcom-team · commit 31ad91ce9e21 · 2018-07-28T16:06:19.000-05:00
- Merge Pull Request #17212 from mageprince/magento2:2.1-develop-PR-port-11561 - Merged commits: 1. 6702cdc
diff --git a/lib/internal/Magento/Framework/View/Page/Config.php b/lib/internal/Magento/Framework/View/Page/Config.php
@@ -174,7 +174,7 @@ public function __construct(
         $this->setElementAttribute(
             self::ELEMENT_TYPE_HTML,
             self::HTML_ATTRIBUTE_LANG,
-            str_replace('_', '-', $this->localeResolver->getLocale())
+            strstr($this->localeResolver->getLocale(), '_', true)
         );
     }
 

Original file line number	Diff line number	Diff line change
`@@ -174,7 +174,7 @@ public function __construct(`
`174`	`174`	`$this->setElementAttribute(`
`175`	`175`	`self::ELEMENT_TYPE_HTML,`
`176`	`176`	`self::HTML_ATTRIBUTE_LANG,`
`177`		`- str_replace('_', '-', $this->localeResolver->getLocale())`
	`177`	`+ strstr($this->localeResolver->getLocale(), '_', true)`
`178`	`178`	`);`
`179`	`179`	`}`
`180`	`180`