From 692ac7715654325016612a46deeaf406f304c930 Mon Sep 17 00:00:00 2001 From: Marc Jauvin Date: Thu, 18 Jun 2020 06:07:07 -0400 Subject: [PATCH] try locale without country before returning default translation (#579) before returning default translation, try using locale without country suffix --- models/Message.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/models/Message.php b/models/Message.php index 3ba1d98f..922adaf9 100644 --- a/models/Message.php +++ b/models/Message.php @@ -61,6 +61,11 @@ public function forLocale($locale = null, $default = null) $locale = self::DEFAULT_LOCALE; } + if (!array_key_exists($locale, $this->message_data)) { + // search parent locale (e.g. en-US -> en) before returning default + list($locale) = explode('-', $locale); + } + if (array_key_exists($locale, $this->message_data)) { return $this->message_data[$locale]; }