From 57e16f5efe447a23c2613f42a2c45e17847d2c60 Mon Sep 17 00:00:00 2001 From: superiorsd10 Date: Sat, 1 Oct 2022 15:53:05 +0530 Subject: [PATCH 1/3] adding translations for some files --- assets/translations/en-US.json | 11 ++++++++++- .../blinds/blinds_actor/blinds_actor_bloc.dart | 7 ++++--- .../boilers/boilers_actor/boilers_actor_bloc.dart | 5 +++-- .../configure_new_cbj_comp_bloc.dart | 7 ++++--- .../join_home_by_id/join_home_by_id_bloc.dart | 3 ++- 5 files changed, 23 insertions(+), 10 deletions(-) diff --git a/assets/translations/en-US.json b/assets/translations/en-US.json index 39dabdfc2..3394ecbe1 100644 --- a/assets/translations/en-US.json +++ b/assets/translations/en-US.json @@ -101,5 +101,14 @@ "No_need_here": "No need here", "Do_not_need": "Do not need", "Finish": "Finish", - "Select_Purposes_Of_The_Area": "Select Purposes Of The Area" + "Select_Purposes_Of_The_Area": "Select Purposes Of The Area", + "Pulling_Up_all_blinds": "Pulling Up all blinds", + "Stopping_all_blinds": "Stopping all blinds", + "Pulling_down_all_blinds": "Pulling down all blinds", + "Turning_On_boiler": "Turning On boiler", + "Turning_Off_boiler": "Turning Off boiler", + "Waiting_for_user_to_get_connected_to_WiFi": "Waiting for user to get connected to WiFi", + "allInSameRoom": "allInSameRoom", + "Can't_add_unsupported_device": "Can't add unsupported device", + "home": "home", } diff --git a/lib/application/blinds/blinds_actor/blinds_actor_bloc.dart b/lib/application/blinds/blinds_actor/blinds_actor_bloc.dart index ba28fa316..c165e8f26 100644 --- a/lib/application/blinds/blinds_actor/blinds_actor_bloc.dart +++ b/lib/application/blinds/blinds_actor/blinds_actor_bloc.dart @@ -5,6 +5,7 @@ import 'package:bloc/bloc.dart'; import 'package:cybear_jinni/domain/devices/device/devices_failures.dart'; import 'package:cybear_jinni/domain/devices/device/i_device_repository.dart'; import 'package:cybear_jinni/domain/devices/generic_light_device/generic_light_entity.dart'; +import 'package:easy_localization/easy_localization.dart'; import 'package:flutter/material.dart'; import 'package:freezed_annotation/freezed_annotation.dart'; import 'package:injectable/injectable.dart'; @@ -41,7 +42,7 @@ class BlindsActorBloc extends Bloc { Emitter emit, ) async { FlushbarHelper.createLoading( - message: 'Pulling Up all blinds', + message: 'Pulling_Up_all_blinds'.tr(), linearProgressIndicator: const LinearProgressIndicator(), ).show(event.context); @@ -53,7 +54,7 @@ class BlindsActorBloc extends Bloc { Emitter emit, ) async { FlushbarHelper.createLoading( - message: 'Stopping all blinds', + message: 'Stopping_all_blinds'.tr(), linearProgressIndicator: const LinearProgressIndicator(), ).show(event.context); @@ -65,7 +66,7 @@ class BlindsActorBloc extends Bloc { Emitter emit, ) async { FlushbarHelper.createLoading( - message: 'Pulling down all blinds', + message: 'Pulling_down_all_blinds'.tr(), linearProgressIndicator: const LinearProgressIndicator(), ).show(event.context); diff --git a/lib/application/boilers/boilers_actor/boilers_actor_bloc.dart b/lib/application/boilers/boilers_actor/boilers_actor_bloc.dart index 08b94f253..bb85daaff 100644 --- a/lib/application/boilers/boilers_actor/boilers_actor_bloc.dart +++ b/lib/application/boilers/boilers_actor/boilers_actor_bloc.dart @@ -5,6 +5,7 @@ import 'package:bloc/bloc.dart'; import 'package:cybear_jinni/domain/devices/device/devices_failures.dart'; import 'package:cybear_jinni/domain/devices/device/i_device_repository.dart'; import 'package:cybear_jinni/domain/devices/generic_boiler_device/generic_boiler_entity.dart'; +import 'package:easy_localization/easy_localization.dart'; import 'package:flutter/material.dart'; import 'package:freezed_annotation/freezed_annotation.dart'; import 'package:injectable/injectable.dart'; @@ -40,7 +41,7 @@ class BoilersActorBloc extends Bloc { Emitter emit, ) async { FlushbarHelper.createLoading( - message: 'Turning On boiler', + message: 'Turning_On_boiler'.tr(), linearProgressIndicator: const LinearProgressIndicator(), ).show(event.context); @@ -52,7 +53,7 @@ class BoilersActorBloc extends Bloc { Emitter emit, ) async { FlushbarHelper.createLoading( - message: 'Turning Off boiler', + message: 'Turning_Off_boiler'.tr(), linearProgressIndicator: const LinearProgressIndicator(), ).show(event.context); diff --git a/lib/application/configure_new_cbj_comp/configure_new_cbj_comp_bloc.dart b/lib/application/configure_new_cbj_comp/configure_new_cbj_comp_bloc.dart index 3e46b1adf..49c7b1181 100644 --- a/lib/application/configure_new_cbj_comp/configure_new_cbj_comp_bloc.dart +++ b/lib/application/configure_new_cbj_comp/configure_new_cbj_comp_bloc.dart @@ -16,6 +16,7 @@ import 'package:cybear_jinni/domain/security_bear/security_bear_failures.dart'; import 'package:cybear_jinni/presentation/add_new_devices_process/configure_new_cbj_comp/widgets/configure_new_cbj_comp_widget.dart'; import 'package:cybear_jinni/utils.dart'; import 'package:dartz/dartz.dart'; +import 'package:easy_localization/easy_localization.dart'; import 'package:flutter/widgets.dart'; import 'package:freezed_annotation/freezed_annotation.dart'; import 'package:injectable/injectable.dart'; @@ -245,7 +246,7 @@ class ConfigureNewCbjCompBloc // await WiFiScan.instance bool isConnectedToWifi = false; - logger.i('Waiting for user to get connected to WiFi'); + logger.i('Waiting_for_user_to_get_connected_to_WiFi'.tr()); while (true) { isConnectedToWifi = await WiFiForIoTPlugin.isConnected(); @@ -294,7 +295,7 @@ class ConfigureNewCbjCompBloc final List deviceEntityList = []; final String roomUuid = const Uuid().v1(); - final String roomName = _textEditingController['allInSameRoom']!.text; + final String roomName = _textEditingController['allInSameRoom'.tr()]!.text; final ManageNetworkEntity manageWiFiEntity = IManageNetworkRepository.manageWiFiEntity!; @@ -309,7 +310,7 @@ class ConfigureNewCbjCompBloc deviceE..defaultName = DeviceDefaultName(deviceName), ); } catch (e) { - logger.w("Can't add unsupported device"); + logger.w("Can't_add_unsupported_device".tr()); } }); final CBJCompEntity compUpdatedData = cbjCompEntity.copyWith( diff --git a/lib/application/join_home_by_id/join_home_by_id_bloc.dart b/lib/application/join_home_by_id/join_home_by_id_bloc.dart index 22f163853..c53a10a8b 100644 --- a/lib/application/join_home_by_id/join_home_by_id_bloc.dart +++ b/lib/application/join_home_by_id/join_home_by_id_bloc.dart @@ -6,6 +6,7 @@ import 'package:cybear_jinni/domain/user/all_homes_of_user/all_homes_of_user_ent import 'package:cybear_jinni/domain/user/all_homes_of_user/all_homes_of_user_value_objects.dart'; import 'package:cybear_jinni/domain/user/i_user_repository.dart'; import 'package:dartz/dartz.dart'; +import 'package:easy_localization/easy_localization.dart'; import 'package:freezed_annotation/freezed_annotation.dart'; import 'package:injectable/injectable.dart'; @@ -46,7 +47,7 @@ class JoinHomeByIdBloc extends Bloc { } else { final AllHomesOfUserEntity allHomesOfUserEntity = AllHomesOfUserEntity( id: AllHomesOfUserUniqueId.fromUniqueString(event.id), - name: AllHomesOfUserName('home'), + name: AllHomesOfUserName('home'.tr()), ); final initialization = await _iUserRepository.addHome( getCurrentUser, From 29071cce92f12bd861db4a5375dfe885fd238e01 Mon Sep 17 00:00:00 2001 From: superiorsd10 Date: Sat, 1 Oct 2022 17:43:57 +0530 Subject: [PATCH 2/3] removing two changes --- .../configure_new_cbj_comp/configure_new_cbj_comp_bloc.dart | 2 +- lib/application/join_home_by_id/join_home_by_id_bloc.dart | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/application/configure_new_cbj_comp/configure_new_cbj_comp_bloc.dart b/lib/application/configure_new_cbj_comp/configure_new_cbj_comp_bloc.dart index 49c7b1181..8f700e532 100644 --- a/lib/application/configure_new_cbj_comp/configure_new_cbj_comp_bloc.dart +++ b/lib/application/configure_new_cbj_comp/configure_new_cbj_comp_bloc.dart @@ -295,7 +295,7 @@ class ConfigureNewCbjCompBloc final List deviceEntityList = []; final String roomUuid = const Uuid().v1(); - final String roomName = _textEditingController['allInSameRoom'.tr()]!.text; + final String roomName = _textEditingController['allInSameRoom']!.text; final ManageNetworkEntity manageWiFiEntity = IManageNetworkRepository.manageWiFiEntity!; diff --git a/lib/application/join_home_by_id/join_home_by_id_bloc.dart b/lib/application/join_home_by_id/join_home_by_id_bloc.dart index c53a10a8b..0a7af2dff 100644 --- a/lib/application/join_home_by_id/join_home_by_id_bloc.dart +++ b/lib/application/join_home_by_id/join_home_by_id_bloc.dart @@ -47,7 +47,7 @@ class JoinHomeByIdBloc extends Bloc { } else { final AllHomesOfUserEntity allHomesOfUserEntity = AllHomesOfUserEntity( id: AllHomesOfUserUniqueId.fromUniqueString(event.id), - name: AllHomesOfUserName('home'.tr()), + name: AllHomesOfUserName('home'), ); final initialization = await _iUserRepository.addHome( getCurrentUser, From bf818652057e5040c77314a804823178af66861d Mon Sep 17 00:00:00 2001 From: superiorsd10 Date: Sat, 1 Oct 2022 18:34:06 +0530 Subject: [PATCH 3/3] doing some small changes --- assets/translations/en-US.json | 4 +--- lib/application/join_home_by_id/join_home_by_id_bloc.dart | 1 - 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/assets/translations/en-US.json b/assets/translations/en-US.json index 3394ecbe1..a319c5e5f 100644 --- a/assets/translations/en-US.json +++ b/assets/translations/en-US.json @@ -108,7 +108,5 @@ "Turning_On_boiler": "Turning On boiler", "Turning_Off_boiler": "Turning Off boiler", "Waiting_for_user_to_get_connected_to_WiFi": "Waiting for user to get connected to WiFi", - "allInSameRoom": "allInSameRoom", - "Can't_add_unsupported_device": "Can't add unsupported device", - "home": "home", + "Can't_add_unsupported_device": "Can't add unsupported device" } diff --git a/lib/application/join_home_by_id/join_home_by_id_bloc.dart b/lib/application/join_home_by_id/join_home_by_id_bloc.dart index 0a7af2dff..22f163853 100644 --- a/lib/application/join_home_by_id/join_home_by_id_bloc.dart +++ b/lib/application/join_home_by_id/join_home_by_id_bloc.dart @@ -6,7 +6,6 @@ import 'package:cybear_jinni/domain/user/all_homes_of_user/all_homes_of_user_ent import 'package:cybear_jinni/domain/user/all_homes_of_user/all_homes_of_user_value_objects.dart'; import 'package:cybear_jinni/domain/user/i_user_repository.dart'; import 'package:dartz/dartz.dart'; -import 'package:easy_localization/easy_localization.dart'; import 'package:freezed_annotation/freezed_annotation.dart'; import 'package:injectable/injectable.dart';