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

Fix page rendering with proper subsite locale
2017-09-01 12:22:34 +12:00 · 2017-09-01 12:22:34 +12:00 · c3471ece1c
parent 428a5f958e ab81117c5e
commit c3471ece1c
1 changed files with 4 additions and 0 deletions
--- a/code/extensions/SiteTreeSubsites.php
+++ b/code/extensions/SiteTreeSubsites.php
@ -265,6 +265,10 @@ class SiteTreeSubsites extends DataExtension
        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()