From 1ce1f06b80a8f7005124d6e0b79cfe80a0ad5ce3 Mon Sep 17 00:00:00 2001 From: NaiJi Date: Tue, 20 Sep 2022 19:54:32 +0300 Subject: [PATCH] Fix ru and en translation naming --- assets/translations/en.json | 28 +++++++++---------- assets/translations/ru.json | 28 +++++++++---------- .../cubit/client_jobs/client_jobs_cubit.dart | 16 +++++------ lib/logic/models/job.dart | 8 +++--- .../components/jobs_content/jobs_content.dart | 6 ++-- .../pages/server_details/server_settings.dart | 6 ++-- lib/ui/pages/services/services.dart | 2 +- 7 files changed, 47 insertions(+), 47 deletions(-) diff --git a/assets/translations/en.json b/assets/translations/en.json index 3c849eff..fe797ed1 100644 --- a/assets/translations/en.json +++ b/assets/translations/en.json @@ -475,23 +475,23 @@ "title": "Jobs list", "start": "Start", "empty": "No jobs", - "createUser": "Create user", - "deleteUser": "Delete user", - "serviceTurnOff": "Turn off", - "serviceTurnOn": "Turn on", - "jobAdded": "Job added", - "runJobs": "Run jobs", - "rebootSuccess": "Server is rebooting", - "rebootFailed": "Couldn't reboot the server. Check the app logs.", - "configPullFailed": "Failed to pull configuration upgrade. Started software upgrade anyways.", - "upgradeSuccess": "Server upgrade started", - "upgradeFailed": "Failed to upgrade server", - "upgradeServer": "Upgrade server", - "rebootServer": "Reboot server", + "create_user": "Create user", + "delete_user": "Delete user", + "service_turn_off": "Turn off", + "service_turn_on": "Turn on", + "job_added": "Job added", + "run_jobs": "Run jobs", + "reboot_success": "Server is rebooting", + "reboot_failed": "Couldn't reboot the server. Check the app logs.", + "config_pull_failed": "Failed to pull configuration upgrade. Started software upgrade anyways.", + "upgrade_success": "Server upgrade started", + "upgrade_failed": "Failed to upgrade server", + "upgrade_server": "Upgrade server", + "reboot_server": "Reboot server", "create_ssh_key": "Create SSH key for {}", "delete_ssh_key": "Delete SSH key for {}", "server_jobs": "Jobs on the server", - "resetUserPassword": "Reset password of user" + "reset_user_password": "Reset password of user" }, "validations": { "required": "Required.", diff --git a/assets/translations/ru.json b/assets/translations/ru.json index ce2d6231..ee89b903 100644 --- a/assets/translations/ru.json +++ b/assets/translations/ru.json @@ -468,23 +468,23 @@ "title": "Задачи", "start": "Начать выполенение", "empty": "Пусто.", - "createUser": "Создать пользователя", - "deleteUser": "Удалить пользователя", - "serviceTurnOff": "Остановить", - "serviceTurnOn": "Запустить", - "jobAdded": "Задача добавленна", - "runJobs": "Запустите задачи", - "rebootSuccess": "Сервер перезагружается", - "rebootFailed": "Не удалось перезагрузить сервер, проверьте логи", - "configPullFailed": "Не удалось обновить конфигурацию сервера. Обновление ПО запущено.", - "upgradeSuccess": "Запущено обновление сервера", - "upgradeFailed": "Обновить сервер не вышло", - "upgradeServer": "Обновить сервер", - "rebootServer": "Перезагрузить сервер", + "create_user": "Создать пользователя", + "delete_user": "Удалить пользователя", + "service_turn_off": "Остановить", + "service_turn_on": "Запустить", + "job_added": "Задача добавленна", + "run_jobs": "Запустите задачи", + "reboot_success": "Сервер перезагружается", + "reboot_failed": "Не удалось перезагрузить сервер, проверьте логи", + "config_pull_failed": "Не удалось обновить конфигурацию сервера. Обновление ПО запущено.", + "upgrade_success": "Запущено обновление сервера", + "upgrade_failed": "Обновить сервер не вышло", + "upgrade_server": "Обновить сервер", + "reboot_server": "Перезагрузить сервер", "create_ssh_key": "Создать SSH ключ для {}", "delete_ssh_key": "Удалить SSH ключ для {}", "server_jobs": "Задачи на сервере", - "resetUserPassword": "Сбросить пароль пользователя" + "reset_user_password": "Сбросить пароль пользователя" }, "validations": { "required": "Обязательное поле.", diff --git a/lib/logic/cubit/client_jobs/client_jobs_cubit.dart b/lib/logic/cubit/client_jobs/client_jobs_cubit.dart index 4fa610cd..a6d23a23 100644 --- a/lib/logic/cubit/client_jobs/client_jobs_cubit.dart +++ b/lib/logic/cubit/client_jobs/client_jobs_cubit.dart @@ -30,7 +30,7 @@ class JobsCubit extends Cubit { newJobsList.addAll(jobsState.clientJobList); } newJobsList.add(job); - getIt().showSnackBar('jobs.jobAdded'.tr()); + getIt().showSnackBar('jobs.job_added'.tr()); emit(JobsStateWithJobs(newJobsList)); } @@ -53,7 +53,7 @@ class JobsCubit extends Cubit { removeJob(removingJob.id); } else { newJobsList.add(job); - getIt().showSnackBar('jobs.jobAdded'.tr()); + getIt().showSnackBar('jobs.job_added'.tr()); emit(JobsStateWithJobs(newJobsList)); } } @@ -67,7 +67,7 @@ class JobsCubit extends Cubit { newJobsList.any((final el) => el is CreateSSHKeyJob); if (!isExistInJobList) { newJobsList.add(job); - getIt().showSnackBar('jobs.jobAdded'.tr()); + getIt().showSnackBar('jobs.job_added'.tr()); emit(JobsStateWithJobs(newJobsList)); } } @@ -76,9 +76,9 @@ class JobsCubit extends Cubit { emit(JobsStateLoading()); final bool isSuccessful = await api.reboot(); if (isSuccessful) { - getIt().showSnackBar('jobs.rebootSuccess'.tr()); + getIt().showSnackBar('jobs.reboot_success'.tr()); } else { - getIt().showSnackBar('jobs.rebootFailed'.tr()); + getIt().showSnackBar('jobs.reboot_failed'.tr()); } emit(JobsStateEmpty()); } @@ -89,12 +89,12 @@ class JobsCubit extends Cubit { final bool isSuccessful = await api.upgrade(); if (isSuccessful) { if (!isPullSuccessful) { - getIt().showSnackBar('jobs.configPullFailed'.tr()); + getIt().showSnackBar('jobs.config_pull_failed'.tr()); } else { - getIt().showSnackBar('jobs.upgradeSuccess'.tr()); + getIt().showSnackBar('jobs.upgrade_success'.tr()); } } else { - getIt().showSnackBar('jobs.upgradeFailed'.tr()); + getIt().showSnackBar('jobs.upgrade_failed'.tr()); } emit(JobsStateEmpty()); } diff --git a/lib/logic/models/job.dart b/lib/logic/models/job.dart index 1dc1bd91..c3748daa 100644 --- a/lib/logic/models/job.dart +++ b/lib/logic/models/job.dart @@ -30,7 +30,7 @@ class RebuildServerJob extends ClientJob { class CreateUserJob extends ClientJob { CreateUserJob({ required this.user, - }) : super(title: '${"jobs.createUser".tr()} ${user.login}'); + }) : super(title: '${"jobs.create_user".tr()} ${user.login}'); final User user; @@ -41,7 +41,7 @@ class CreateUserJob extends ClientJob { class ResetUserPasswordJob extends ClientJob { ResetUserPasswordJob({ required this.user, - }) : super(title: '${"jobs.resetUserPassword".tr()} ${user.login}'); + }) : super(title: '${"jobs.reset_user_password".tr()} ${user.login}'); final User user; @@ -52,7 +52,7 @@ class ResetUserPasswordJob extends ClientJob { class DeleteUserJob extends ClientJob { DeleteUserJob({ required this.user, - }) : super(title: '${"jobs.deleteUser".tr()} ${user.login}'); + }) : super(title: '${"jobs.delete_user".tr()} ${user.login}'); final User user; @@ -78,7 +78,7 @@ class ServiceToggleJob extends ToggleJob { required this.needToTurnOn, }) : super( title: - '${needToTurnOn ? "jobs.serviceTurnOn".tr() : "jobs.serviceTurnOff".tr()} ${type.title}', + '${needToTurnOn ? "jobs.service_turn_on".tr() : "jobs.service_turn_off".tr()} ${type.title}', ); final bool needToTurnOn; diff --git a/lib/ui/components/jobs_content/jobs_content.dart b/lib/ui/components/jobs_content/jobs_content.dart index 877770dc..6cbc822f 100644 --- a/lib/ui/components/jobs_content/jobs_content.dart +++ b/lib/ui/components/jobs_content/jobs_content.dart @@ -43,7 +43,7 @@ class JobsContent extends StatelessWidget { const SizedBox(height: 80), BrandButton.rised( onPressed: () => context.read().upgradeServer(), - text: 'jobs.upgradeServer'.tr(), + text: 'jobs.upgrade_server'.tr(), ), const SizedBox(height: 10), BrandButton.text( @@ -51,7 +51,7 @@ class JobsContent extends StatelessWidget { final NavigationService nav = getIt(); nav.showPopUpDialog( BrandAlert( - title: 'jobs.rebootServer'.tr(), + title: 'jobs.reboot_server'.tr(), contentText: 'modals.3'.tr(), actions: [ ActionButton( @@ -66,7 +66,7 @@ class JobsContent extends StatelessWidget { ), ); }, - title: 'jobs.rebootServer'.tr(), + title: 'jobs.reboot_server'.tr(), ), ]; } diff --git a/lib/ui/pages/server_details/server_settings.dart b/lib/ui/pages/server_details/server_settings.dart index 38c7133b..6ea4cea3 100644 --- a/lib/ui/pages/server_details/server_settings.dart +++ b/lib/ui/pages/server_details/server_settings.dart @@ -34,7 +34,7 @@ class _ServerSettingsState extends State<_ServerSettings> { onChanged: (final switched) { if (didSomethingChange == false) { context.read().addJob( - RebuildServerJob(title: 'jobs.upgradeServer'.tr()), + RebuildServerJob(title: 'jobs.upgrade_server'.tr()), ); } context @@ -62,7 +62,7 @@ class _ServerSettingsState extends State<_ServerSettings> { onChanged: (final switched) { if (didSomethingChange == false) { context.read().addJob( - RebuildServerJob(title: 'jobs.upgradeServer'.tr()), + RebuildServerJob(title: 'jobs.upgrade_server'.tr()), ); } context @@ -93,7 +93,7 @@ class _ServerSettingsState extends State<_ServerSettings> { onTap: () { if (didSomethingChange == false) { context.read().addJob( - RebuildServerJob(title: 'jobs.upgradeServer'.tr()), + RebuildServerJob(title: 'jobs.upgrade_server'.tr()), ); } setState(() { diff --git a/lib/ui/pages/services/services.dart b/lib/ui/pages/services/services.dart index d638866a..b0a231c9 100644 --- a/lib/ui/pages/services/services.dart +++ b/lib/ui/pages/services/services.dart @@ -218,7 +218,7 @@ class _Card extends StatelessWidget { sigmaY: 2, ), child: BrandText.h2( - 'jobs.runJobs'.tr(), + 'jobs.run_jobs'.tr(), textAlign: TextAlign.center, ), ),