wt1.1.1 ExercisePlan + ExercisePlan detail, Trainee

lib/bloc/settings/settings_bloc.dart

@@ -34,6 +34,10 @@ class SettingsBloc extends Bloc<SettingsEvent, SettingsState> {
       yield SettingsLoading();
       await _changeLang( event.language);
       yield SettingsReady(_locale);
+    } else if ( event is SettingsGetLanguage) {
+      await AppLanguage().fetchLocale();
+      _locale = AppLanguage().appLocal;
+      yield SettingsReady(_locale);
     }
   }
 
@@ -50,12 +54,13 @@ class SettingsBloc extends Bloc<SettingsEvent, SettingsState> {
         break;
     }
     this.language = lang;
+    final AppLanguage appLanguage = AppLanguage();
+    appLanguage.changeLanguage(_locale);
     await loadLang();
   }
 
   Future<void> loadLang() async{
-    final AppLanguage appLanguage = AppLanguage();
-    appLanguage.changeLanguage(_locale);
+    print (" -- Loading lang $_locale");
     if ( context != null ) {
       AppLocalizations.of(context).setLocale(_locale);
       await AppLocalizations.of(context).load();

lib/bloc/settings/settings_event.dart

@@ -11,3 +11,7 @@ class SettingsChangeLanguage extends SettingsEvent {
   final String language;
   const SettingsChangeLanguage({this.language});
 }
+
+class SettingsGetLanguage extends SettingsEvent {
+  const SettingsGetLanguage();
+}