Fixed #2439

Reverts 253e97f, but doesn't seem like that order of operations is needed anymore, based on testing. (Could be wrong though, in which case we'll need to revisit.)
craftcms · Feb 17, 2018 · 1bbd5ac · 1bbd5ac
1 parent 1d9ddc2
commit 1bbd5ac
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/CHANGELOG-v3.md b/CHANGELOG-v3.md
@@ -23,6 +23,7 @@
 - Fixed an error that occurred if an SVG file without `width` and `height` attributes was uploaded as the Login Page Logo. ([#2435](https://github.com/craftcms/cms/issues/2435))
 - Fixed a bug where the `defaultCpLanguage` setting was only working in some cases.
 - Fixed a bug where Dashboard widgets could go freaking crazy when the browser was resized. ([#2438](https://github.com/craftcms/cms/issues/2438))
+- Fixed a bug where Control Panel dates, times, and numbers were formatted for US English regardless of the user’s preferred language, if any plugins were registering an asset bundle that relied on `craft\web\assets\cp\CpAsset` from their `init()` methods. ([#2439](https://github.com/craftcms/cms/issues/2439))
 
 ## 3.0.0-RC10 - 2018-02-13
 

diff --git a/src/base/ApplicationTrait.php b/src/base/ApplicationTrait.php
@@ -1131,13 +1131,12 @@ private function _init()
         // Set the timezone
         $this->_setTimeZone();
 
-        // Load the plugins
-        // (this has to happen before setting the language, so plugin class aliases are registered in time)
-        $this->getPlugins()->loadPlugins();
-
         // Set the language
         $this->updateTargetLanguage();
 
+        // Load the plugins
+        $this->getPlugins()->loadPlugins();
+
         // Fire an 'afterInit' event
         if ($this->hasEventHandlers(WebApplication::EVENT_INIT)) {
             $this->trigger(WebApplication::EVENT_INIT);