MAGETWO-82431: Magento sets ISO invalid language code #11561

vrann · vrann · commit e41c27ffe841 · 2017-10-20T08:16:48.000-05:00
- Merge Pull Request #11561 from crissanclick/magento2:ISOLanguageCode - Merged commits: 1. 09c6b1e
diff --git a/lib/internal/Magento/Framework/View/Page/Config.php b/lib/internal/Magento/Framework/View/Page/Config.php
@@ -173,7 +173,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
`@@ -173,7 +173,7 @@ public function __construct(`
`173`	`173`	`$this->setElementAttribute(`
`174`	`174`	`self::ELEMENT_TYPE_HTML,`
`175`	`175`	`self::HTML_ATTRIBUTE_LANG,`
`176`		`- str_replace('_', '-', $this->localeResolver->getLocale())`
	`176`	`+ strstr($this->localeResolver->getLocale(), '_', true)`
`177`	`177`	`);`
`178`	`178`	`}`
`179`	`179`