SelfPrivacy
/
selfprivacy.org.app
10
7
Fork 5
Code Issues 77 Pull Requests 3 Projects 1 Releases 24 Wiki Activity

Fix ru and en translation naming #118

Closed
NaiJi wants to merge 1 commits from fix-translations into master
pull from: fix-translations
merge into: SelfPrivacy:master
Conversation 1 Commits 1 Files Changed 7
7 changed files with 47 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
assets/translations/en.json
View File

@ -475,23 +475,23 @@
"title": "Jobs list", "title": "Jobs list",
"start": "Start", "start": "Start",
"empty": "No jobs", "empty": "No jobs",
"createUser": "Create user", "create_user": "Create user",
"deleteUser": "Delete user", "delete_user": "Delete user",
"serviceTurnOff": "Turn off", "service_turn_off": "Turn off",
"serviceTurnOn": "Turn on", "service_turn_on": "Turn on",
"jobAdded": "Job added", "job_added": "Job added",
"runJobs": "Run jobs", "run_jobs": "Run jobs",
"rebootSuccess": "Server is rebooting", "reboot_success": "Server is rebooting",
"rebootFailed": "Couldn't reboot the server. Check the app logs.", "reboot_failed": "Couldn't reboot the server. Check the app logs.",
"configPullFailed": "Failed to pull configuration upgrade. Started software upgrade anyways.", "config_pull_failed": "Failed to pull configuration upgrade. Started software upgrade anyways.",
"upgradeSuccess": "Server upgrade started", "upgrade_success": "Server upgrade started",
"upgradeFailed": "Failed to upgrade server", "upgrade_failed": "Failed to upgrade server",
"upgradeServer": "Upgrade server", "upgrade_server": "Upgrade server",
"rebootServer": "Reboot server", "reboot_server": "Reboot server",
"create_ssh_key": "Create SSH key for {}", "create_ssh_key": "Create SSH key for {}",
"delete_ssh_key": "Delete SSH key for {}", "delete_ssh_key": "Delete SSH key for {}",
"server_jobs": "Jobs on the server", "server_jobs": "Jobs on the server",
"resetUserPassword": "Reset password of user" "reset_user_password": "Reset password of user"
}, },
"validations": { "validations": {
"required": "Required.", "required": "Required.",

28
assets/translations/ru.json
View File

@ -468,23 +468,23 @@
"title": "Задачи", "title": "Задачи",
"start": "Начать выполенение", "start": "Начать выполенение",
"empty": "Пусто.", "empty": "Пусто.",
"createUser": "Создать пользователя", "create_user": "Создать пользователя",
"deleteUser": "Удалить пользователя", "delete_user": "Удалить пользователя",
"serviceTurnOff": "Остановить", "service_turn_off": "Остановить",
"serviceTurnOn": "Запустить", "service_turn_on": "Запустить",
"jobAdded": "Задача добавленна", "job_added": "Задача добавленна",
"runJobs": "Запустите задачи", "run_jobs": "Запустите задачи",
"rebootSuccess": "Сервер перезагружается", "reboot_success": "Сервер перезагружается",
"rebootFailed": "Не удалось перезагрузить сервер, проверьте логи", "reboot_failed": "Не удалось перезагрузить сервер, проверьте логи",
"configPullFailed": "Не удалось обновить конфигурацию сервера. Обновление ПО запущено.", "config_pull_failed": "Не удалось обновить конфигурацию сервера. Обновление ПО запущено.",
"upgradeSuccess": "Запущено обновление сервера", "upgrade_success": "Запущено обновление сервера",
"upgradeFailed": "Обновить сервер не вышло", "upgrade_failed": "Обновить сервер не вышло",
"upgradeServer": "Обновить сервер", "upgrade_server": "Обновить сервер",
"rebootServer": "Перезагрузить сервер", "reboot_server": "Перезагрузить сервер",
"create_ssh_key": "Создать SSH ключ для {}", "create_ssh_key": "Создать SSH ключ для {}",
"delete_ssh_key": "Удалить SSH ключ для {}", "delete_ssh_key": "Удалить SSH ключ для {}",
"server_jobs": "Задачи на сервере", "server_jobs": "Задачи на сервере",
"resetUserPassword": "Сбросить пароль пользователя" "reset_user_password": "Сбросить пароль пользователя"
}, },
"validations": { "validations": {
"required": "Обязательное поле.", "required": "Обязательное поле.",

16
lib/logic/cubit/client_jobs/client_jobs_cubit.dart
View File

@ -30,7 +30,7 @@ class JobsCubit extends Cubit<JobsState> {
newJobsList.addAll(jobsState.clientJobList); newJobsList.addAll(jobsState.clientJobList);
} }
newJobsList.add(job); newJobsList.add(job);
getIt<NavigationService>().showSnackBar('jobs.jobAdded'.tr()); getIt<NavigationService>().showSnackBar('jobs.job_added'.tr());
emit(JobsStateWithJobs(newJobsList)); emit(JobsStateWithJobs(newJobsList));
} }
@ -53,7 +53,7 @@ class JobsCubit extends Cubit<JobsState> {
removeJob(removingJob.id); removeJob(removingJob.id);
} else { } else {
newJobsList.add(job); newJobsList.add(job);
getIt<NavigationService>().showSnackBar('jobs.jobAdded'.tr()); getIt<NavigationService>().showSnackBar('jobs.job_added'.tr());
emit(JobsStateWithJobs(newJobsList)); emit(JobsStateWithJobs(newJobsList));
} }
} }
@ -67,7 +67,7 @@ class JobsCubit extends Cubit<JobsState> {
newJobsList.any((final el) => el is CreateSSHKeyJob); newJobsList.any((final el) => el is CreateSSHKeyJob);
if (!isExistInJobList) { if (!isExistInJobList) {
newJobsList.add(job); newJobsList.add(job);
getIt<NavigationService>().showSnackBar('jobs.jobAdded'.tr()); getIt<NavigationService>().showSnackBar('jobs.job_added'.tr());
emit(JobsStateWithJobs(newJobsList)); emit(JobsStateWithJobs(newJobsList));
} }
} }
@ -76,9 +76,9 @@ class JobsCubit extends Cubit<JobsState> {
emit(JobsStateLoading()); emit(JobsStateLoading());
final bool isSuccessful = await api.reboot(); final bool isSuccessful = await api.reboot();
if (isSuccessful) { if (isSuccessful) {
getIt<NavigationService>().showSnackBar('jobs.rebootSuccess'.tr()); getIt<NavigationService>().showSnackBar('jobs.reboot_success'.tr());
} else { } else {
getIt<NavigationService>().showSnackBar('jobs.rebootFailed'.tr()); getIt<NavigationService>().showSnackBar('jobs.reboot_failed'.tr());
} }
emit(JobsStateEmpty()); emit(JobsStateEmpty());
} }
@ -89,12 +89,12 @@ class JobsCubit extends Cubit<JobsState> {
final bool isSuccessful = await api.upgrade(); final bool isSuccessful = await api.upgrade();
if (isSuccessful) { if (isSuccessful) {
if (!isPullSuccessful) { if (!isPullSuccessful) {
getIt<NavigationService>().showSnackBar('jobs.configPullFailed'.tr()); getIt<NavigationService>().showSnackBar('jobs.config_pull_failed'.tr());
} else { } else {
getIt<NavigationService>().showSnackBar('jobs.upgradeSuccess'.tr()); getIt<NavigationService>().showSnackBar('jobs.upgrade_success'.tr());
} }
} else { } else {
getIt<NavigationService>().showSnackBar('jobs.upgradeFailed'.tr()); getIt<NavigationService>().showSnackBar('jobs.upgrade_failed'.tr());
} }
emit(JobsStateEmpty()); emit(JobsStateEmpty());
} }

8
lib/logic/models/job.dart
View File

@ -30,7 +30,7 @@ class RebuildServerJob extends ClientJob {
class CreateUserJob extends ClientJob { class CreateUserJob extends ClientJob {
CreateUserJob({ CreateUserJob({
required this.user, required this.user,
}) : super(title: '${"jobs.createUser".tr()} ${user.login}'); }) : super(title: '${"jobs.create_user".tr()} ${user.login}');
final User user; final User user;
@ -41,7 +41,7 @@ class CreateUserJob extends ClientJob {
class ResetUserPasswordJob extends ClientJob { class ResetUserPasswordJob extends ClientJob {
ResetUserPasswordJob({ ResetUserPasswordJob({
required this.user, required this.user,
}) : super(title: '${"jobs.resetUserPassword".tr()} ${user.login}'); }) : super(title: '${"jobs.reset_user_password".tr()} ${user.login}');
final User user; final User user;
@ -52,7 +52,7 @@ class ResetUserPasswordJob extends ClientJob {
class DeleteUserJob extends ClientJob { class DeleteUserJob extends ClientJob {
DeleteUserJob({ DeleteUserJob({
required this.user, required this.user,
}) : super(title: '${"jobs.deleteUser".tr()} ${user.login}'); }) : super(title: '${"jobs.delete_user".tr()} ${user.login}');
final User user; final User user;
@ -78,7 +78,7 @@ class ServiceToggleJob extends ToggleJob {
required this.needToTurnOn, required this.needToTurnOn,
}) : super( }) : super(
title: 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; final bool needToTurnOn;

6
lib/ui/components/jobs_content/jobs_content.dart
View File

@ -43,7 +43,7 @@ class JobsContent extends StatelessWidget {
const SizedBox(height: 80), const SizedBox(height: 80),
BrandButton.rised( BrandButton.rised(
onPressed: () => context.read<JobsCubit>().upgradeServer(), onPressed: () => context.read<JobsCubit>().upgradeServer(),
text: 'jobs.upgradeServer'.tr(), text: 'jobs.upgrade_server'.tr(),
), ),
const SizedBox(height: 10), const SizedBox(height: 10),
BrandButton.text( BrandButton.text(
@ -51,7 +51,7 @@ class JobsContent extends StatelessWidget {
final NavigationService nav = getIt<NavigationService>(); final NavigationService nav = getIt<NavigationService>();
nav.showPopUpDialog( nav.showPopUpDialog(
BrandAlert( BrandAlert(
title: 'jobs.rebootServer'.tr(), title: 'jobs.reboot_server'.tr(),
contentText: 'modals.3'.tr(), contentText: 'modals.3'.tr(),
actions: [ actions: [
ActionButton( ActionButton(
@ -66,7 +66,7 @@ class JobsContent extends StatelessWidget {
), ),
); );
}, },
title: 'jobs.rebootServer'.tr(), title: 'jobs.reboot_server'.tr(),
), ),
]; ];
} }

6
lib/ui/pages/server_details/server_settings.dart
View File

@ -34,7 +34,7 @@ class _ServerSettingsState extends State<_ServerSettings> {
onChanged: (final switched) { onChanged: (final switched) {
if (didSomethingChange == false) { if (didSomethingChange == false) {
context.read<JobsCubit>().addJob( context.read<JobsCubit>().addJob(
RebuildServerJob(title: 'jobs.upgradeServer'.tr()), RebuildServerJob(title: 'jobs.upgrade_server'.tr()),
); );
} }
context context
@ -62,7 +62,7 @@ class _ServerSettingsState extends State<_ServerSettings> {
onChanged: (final switched) { onChanged: (final switched) {
if (didSomethingChange == false) { if (didSomethingChange == false) {
context.read<JobsCubit>().addJob( context.read<JobsCubit>().addJob(
RebuildServerJob(title: 'jobs.upgradeServer'.tr()), RebuildServerJob(title: 'jobs.upgrade_server'.tr()),
); );
} }
context context
@ -93,7 +93,7 @@ class _ServerSettingsState extends State<_ServerSettings> {
onTap: () { onTap: () {
if (didSomethingChange == false) { if (didSomethingChange == false) {
context.read<JobsCubit>().addJob( context.read<JobsCubit>().addJob(
RebuildServerJob(title: 'jobs.upgradeServer'.tr()), RebuildServerJob(title: 'jobs.upgrade_server'.tr()),
); );
} }
setState(() { setState(() {

2
lib/ui/pages/services/services.dart
View File

@ -218,7 +218,7 @@ class _Card extends StatelessWidget {
sigmaY: 2, sigmaY: 2,
), ),
child: BrandText.h2( child: BrandText.h2(
'jobs.runJobs'.tr(), 'jobs.run_jobs'.tr(),
textAlign: TextAlign.center, textAlign: TextAlign.center,
), ),
), ),