From c333fa3c33c83c2a8f018fdde99254a3b1389d7c Mon Sep 17 00:00:00 2001 From: Alberto Ponces Date: Sun, 18 Sep 2022 22:52:29 +0100 Subject: [PATCH] fix: Prefer Yes/No instead of OK/Cancel on a few dialogs --- assets/i18n/en.json | 4 ++-- lib/ui/views/home/home_viewmodel.dart | 4 ++-- lib/ui/views/patcher/patcher_viewmodel.dart | 4 ++-- lib/ui/views/settings/settings_viewmodel.dart | 8 ++++---- lib/ui/widgets/appInfoView/app_info_viewmodel.dart | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/assets/i18n/en.json b/assets/i18n/en.json index 82d1a691..8ffd5bbd 100644 --- a/assets/i18n/en.json +++ b/assets/i18n/en.json @@ -3,8 +3,8 @@ "cancelButton": "Cancel", "enabledLabel": "Enabled", "disabledLabel": "Disabled", - "yesLabel": "Yes", - "noLabel": "No", + "yesButton": "Yes", + "noButton": "No", "navigationView": { "dashboardTab": "Dashboard", "patcherTab": "Patcher", diff --git a/lib/ui/views/home/home_viewmodel.dart b/lib/ui/views/home/home_viewmodel.dart index cdcc1bba..963421b9 100644 --- a/lib/ui/views/home/home_viewmodel.dart +++ b/lib/ui/views/home/home_viewmodel.dart @@ -172,11 +172,11 @@ class HomeViewModel extends BaseViewModel { actions: [ CustomMaterialButton( isFilled: false, - label: I18nText('cancelButton'), + label: I18nText('noButton'), onPressed: () => Navigator.of(context).pop(), ), CustomMaterialButton( - label: I18nText('okButton'), + label: I18nText('yesButton'), onPressed: () { Navigator.of(context).pop(); updateManager(context); diff --git a/lib/ui/views/patcher/patcher_viewmodel.dart b/lib/ui/views/patcher/patcher_viewmodel.dart index 63f78ef8..a1a5e4a4 100644 --- a/lib/ui/views/patcher/patcher_viewmodel.dart +++ b/lib/ui/views/patcher/patcher_viewmodel.dart @@ -64,11 +64,11 @@ class PatcherViewModel extends BaseViewModel { actions: [ CustomMaterialButton( isFilled: false, - label: I18nText('cancelButton'), + label: I18nText('noButton'), onPressed: () => Navigator.of(context).pop(), ), CustomMaterialButton( - label: I18nText('okButton'), + label: I18nText('yesButton'), onPressed: () { Navigator.of(context).pop(); navigateToInstaller(); diff --git a/lib/ui/views/settings/settings_viewmodel.dart b/lib/ui/views/settings/settings_viewmodel.dart index bcc595d1..be9b9c56 100644 --- a/lib/ui/views/settings/settings_viewmodel.dart +++ b/lib/ui/views/settings/settings_viewmodel.dart @@ -270,11 +270,11 @@ class SettingsViewModel extends BaseViewModel { actions: [ CustomMaterialButton( isFilled: false, - label: I18nText('cancelButton'), + label: I18nText('noButton'), onPressed: () => Navigator.of(context).pop(), ), CustomMaterialButton( - label: I18nText('okButton'), + label: I18nText('yesButton'), onPressed: () { _managerAPI.setPatchesRepo(''); _managerAPI.setIntegrationsRepo(''); @@ -297,11 +297,11 @@ class SettingsViewModel extends BaseViewModel { actions: [ CustomMaterialButton( isFilled: false, - label: I18nText('cancelButton'), + label: I18nText('noButton'), onPressed: () => Navigator.of(context).pop(), ), CustomMaterialButton( - label: I18nText('okButton'), + label: I18nText('yesButton'), onPressed: () { _managerAPI.setApiUrl(''); Navigator.of(context).pop(); diff --git a/lib/ui/widgets/appInfoView/app_info_viewmodel.dart b/lib/ui/widgets/appInfoView/app_info_viewmodel.dart index e023e8db..5a06384e 100644 --- a/lib/ui/widgets/appInfoView/app_info_viewmodel.dart +++ b/lib/ui/widgets/appInfoView/app_info_viewmodel.dart @@ -81,11 +81,11 @@ class AppInfoViewModel extends BaseViewModel { actions: [ CustomMaterialButton( isFilled: false, - label: I18nText('cancelButton'), + label: I18nText('noButton'), onPressed: () => Navigator.of(context).pop(), ), CustomMaterialButton( - label: I18nText('okButton'), + label: I18nText('yesButton'), onPressed: () { uninstallApp(app, onlyUnpatch); locator().initialize(context);