Merge pull request #126 from creative-commoners/pulls/3/update-cwp-lo…

…cale-settings MNT Move i18n::default_locale value in to config.yml
silverstripe · Sep 20, 2023 · 3ff115b · 3ff115b
2 parents 9891120 + 2ff1907
commit 3ff115b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/_config.php b/_config.php
@@ -11,12 +11,6 @@
 
 use SilverStripe\Core\Environment;
 use SilverStripe\HybridSessions\HybridSession;
-use SilverStripe\i18n\i18n;
-
-// set the system locale to en_GB. This also means locale dropdowns
-// and date formatting etc will default to this locale. Note there is no
-// English (New Zealand) option
-i18n::set_locale('en_GB');
 
 // default to the binary being in the usual path on Linux
 if (!Environment::getEnv('WKHTMLTOPDF_BINARY')) {

diff --git a/_config/config.yml b/_config/config.yml
@@ -31,3 +31,12 @@ SilverStripe\Core\Injector\Injector:
 
 GDBackend:
   default_quality: 90
+
+# Set the system locale to en_GB. This also means locale dropdowns
+# and date formatting etc will default to this locale. Note there is no
+# English (New Zealand) option
+---
+Name: cwplocaleconfig
+---
+SilverStripe\i18n\i18n:
+  default_locale: en_GB