From 5c9f0f120bb5e483b34ede86d87debdf025c03c4 Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Mon, 10 Nov 2008 19:54:30 +0000 Subject: [PATCH] BUGFIX Setting correct user locale in ImageField and FileIframeField - the controller is separate from the CMS context, so wasn't initialized with i18n (see #1727) git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@65539 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- core/model/Image.php | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/core/model/Image.php b/core/model/Image.php index a85ee8d73..71fa4785d 100755 --- a/core/model/Image.php +++ b/core/model/Image.php @@ -458,6 +458,21 @@ class Image_Uploader extends Controller { '$Action/$Class/$ID/$Field' => 'handleAction', ); + function init() { + // set language + $member = Member::currentUser(); + if(!empty($member->Locale)) { + i18n::set_locale($member->Locale); + } + + // set reading lang + if(Translatable::is_enabled() && !Director::is_ajax()) { + Translatable::choose_site_lang(array_keys(i18n::get_existing_content_languages('SiteTree'))); + } + + parent::init(); + } + /** * Ensures the css is loaded for the iframe. */