diff --git a/src/I18n/I18n.php b/src/I18n/I18n.php index e420010ed19..5a782a5cc33 100644 --- a/src/I18n/I18n.php +++ b/src/I18n/I18n.php @@ -255,15 +255,13 @@ protected static function _fallbackTranslator($name, $locale) { ]); // \Aura\Intl\Package by default uses formatter configured with key "basic". - if (static::$_defaultFormatter !== 'basic') { - $formatter = static::$_defaultFormatter; - $chain = function() use ($formatter, $chain) { - $package = $chain(); - $package->setFormatter($formatter); - return $package; - }; - } - + // and we want to make sure the cake domain always uses the default formatter + $formatter = $name === 'cake' ? 'default' : static::$_defaultFormatter; + $chain = function() use ($formatter, $chain) { + $package = $chain(); + $package->setFormatter($formatter); + return $package; + }; static::translator($name, $locale, $chain); return static::translators()->get($name); }