From 482d4ed611fb44926b88b2fab999889cf6523349 Mon Sep 17 00:00:00 2001 From: Salvatore Giordano Date: Thu, 7 Jul 2022 12:19:32 +0200 Subject: [PATCH] fix(ui): fix jiffy locale initialization (#1255) * fix(ui): fix jiffy locale initialization * chore(ui): update changelog * fix(ui): cleanup --- packages/stream_chat_flutter/CHANGELOG.md | 6 ++++++ packages/stream_chat_flutter/lib/src/stream_chat.dart | 7 +++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/packages/stream_chat_flutter/CHANGELOG.md b/packages/stream_chat_flutter/CHANGELOG.md index 08fcb15d..23950e3d 100644 --- a/packages/stream_chat_flutter/CHANGELOG.md +++ b/packages/stream_chat_flutter/CHANGELOG.md @@ -1,3 +1,9 @@ +## Upcming + +🐞 Fixed + +- [[#1247]](https://github.com/GetStream/stream-chat-flutter/issues/1247) Fix Jiffy initialization. + ## 4.4.0 🐞 Fixed diff --git a/packages/stream_chat_flutter/lib/src/stream_chat.dart b/packages/stream_chat_flutter/lib/src/stream_chat.dart index 54bd7191..cef33020 100644 --- a/packages/stream_chat_flutter/lib/src/stream_chat.dart +++ b/packages/stream_chat_flutter/lib/src/stream_chat.dart @@ -140,11 +140,10 @@ class StreamChatState extends State { @override void didChangeDependencies() { - final currentLocale = Localizations.localeOf(context); - final languageCode = currentLocale.languageCode; + final currentLocale = Localizations.localeOf(context).toString(); final availableLocales = Jiffy.getAllAvailableLocales(); - if (availableLocales.contains(languageCode)) { - Jiffy.locale(languageCode); + if (availableLocales.contains(currentLocale)) { + Jiffy.locale(currentLocale); } super.didChangeDependencies(); }