Merge pull request #288 from gregsmirnov/pulls/1.3/fix-subsite-page-l…

…anguage Fix page rendering with proper subsite locale
silverstripe · Sep 1, 2017 · c3471ec · c3471ec
2 parents 428a5f9 + ab81117
commit c3471ec
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/code/extensions/SiteTreeSubsites.php b/code/extensions/SiteTreeSubsites.php
@@ -265,6 +265,10 @@ public static function contentcontrollerInit($controller)
         if ($subsite && $subsite->Theme) {
             Config::inst()->update('SSViewer', 'theme', Subsite::currentSubsite()->Theme);
         }
+
+        if ($subsite && i18n::validate_locale($subsite->Language)) {
+            i18n::set_locale($subsite->Language);
+        }
     }
 
     public function alternateAbsoluteLink()