From 72a274994386b0015c6e76b118fd611c74de0bd7 Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Mon, 2 Nov 2015 17:55:31 +1030 Subject: [PATCH] Fall back to en after the forum's default locale Since we'll be encouraging (requiring?) people to include an "en" translation in extensions they want to put on the Marketplace, we should have a further fallback to "en" if it can't find translations in the forum's default language. That way if people only use extensions from the Marketplace, they'll hardly ever see any key names. Thanks to @dcsjapan for the suggestion. --- src/Locale/LocaleServiceProvider.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Locale/LocaleServiceProvider.php b/src/Locale/LocaleServiceProvider.php index 93ee825c9..1e8546d32 100644 --- a/src/Locale/LocaleServiceProvider.php +++ b/src/Locale/LocaleServiceProvider.php @@ -42,7 +42,7 @@ class LocaleServiceProvider extends AbstractServiceProvider : 'en'; $translator = new Translator($defaultLocale, new MessageSelector()); - $translator->setFallbackLocales([$defaultLocale]); + $translator->setFallbackLocales([$defaultLocale, 'en']); $translator->addLoader('yaml', new YamlFileLoader()); return $translator;