From 2d42189e5e2595b0febcc69a0dd9d5328551b2e3 Mon Sep 17 00:00:00 2001 From: liushuyu Date: Thu, 14 Oct 2021 23:03:21 -0600 Subject: [PATCH] feat(ui/i18n): mark most of the yuzu-specific strings as translatable --- ui/src/locales/en.json | 16 +++++++-- ui/src/views/AuthenticationView.vue | 27 ++++++++------- ui/src/views/CompleteView.vue | 4 +-- ui/src/views/MigrateView.vue | 48 +++++++++++++-------------- ui/src/views/ReAuthenticationView.vue | 2 +- ui/src/views/SelectPackages.vue | 4 +-- 6 files changed, 56 insertions(+), 45 deletions(-) diff --git a/ui/src/locales/en.json b/ui/src/locales/en.json index 6cc8da1..c9176fb 100644 --- a/ui/src/locales/en.json +++ b/ui/src/locales/en.json @@ -25,7 +25,9 @@ "overwriting": "Overwriting", "overwriting_warning": "Directory {path} already exists.
Are you sure you want to overwrite the contents inside?", "nothing_picked": "Nothing selected", - "nothing_picked_warning": "Please select at least one package to install!" + "nothing_picked_warning": "Please select at least one package to install!", + "options": "Install Options", + "option_shortcut": "Create Desktop Shortcut" }, "install_packages":{ "check_for_update":"Checking for updates...", @@ -44,7 +46,9 @@ "up_to_date":"{name} is already up to date!", "updated":"{name} has been updated.", "uninstalled":"{name} has been uninstalled.", - "where_to_find":"You can find your installed applications in your start menu." + "where_to_find":"You can find your installed applications in your start menu.", + "migration_where_to_find": "You can find your installed applications in your start menu - if you were in the middle of something, just reattempt.", + "migration_finished": "You have been moved to the new, single version of {name}." }, "modify":{ "title":"Choose an option:", @@ -56,6 +60,14 @@ "prompt":"Are you sure you want to uninstall {name}?", "prompt_confirm":"Uninstall {name}" }, + "auth":{ + "paste": "Paste", + "token": "Token", + "verify": "Verify Token", + "page_header": "The Early Access release channel lets you try out the latest experimental features and fixes, before they are merged into yuzu. This channel includes all regular yuzu daily updates, plus these exclusive features.\n\nTo be an Early Access member, you must be a Patreon Early Access Subscriber.", + "page_opened": "Page opened! Check your default browser for the page, and follow the instructions there to link your patreon account.\nWhen you are done, enter the token below.", + "login_failed": "Login failed!\n\nDouble check that your token is correct and try again" + }, "back":"Back", "exit":"Exit", "yes":"Yes", diff --git a/ui/src/views/AuthenticationView.vue b/ui/src/views/AuthenticationView.vue index 824f8e6..d29db4b 100644 --- a/ui/src/views/AuthenticationView.vue +++ b/ui/src/views/AuthenticationView.vue @@ -2,13 +2,10 @@
- Page opened! Check your default browser for the page, and follow the instructions there to link your patreon account. - When you are done, enter the token below. + {{ $t('auth.page_opened') }} - The Early Access release channel lets you try out the latest experimental features and fixes, before they are merged into yuzu. This channel includes all regular yuzu daily updates, plus these exclusive features. - - To be an Early Access member, you must be a Patreon Early Access Subscriber. + {{ $t('auth.page_header') }}
If you are a subscriber, click here to link your yuzu-emu.org account @@ -20,11 +17,11 @@
-

Token

+

{{ $t('auth.token') }}

- +

@@ -34,13 +31,11 @@
- Login failed! - Double check that your token is correct and try again + {{ $t('auth.login_failed') }} - Login failed! - Double check that your token is correct and try again + {{ $t('auth.login_failed') }} @@ -61,13 +56,13 @@

- Verify Token + {{ $t('auth.verify') }}

@@ -88,7 +83,8 @@ export default { return { browser_opened: false, verification_opened: false, - invalid_token: false + invalid_token: false, + loading: false } }, computed: { @@ -148,6 +144,7 @@ export default { }).catch(function () {}) }, verify_token: function () { + this.loading = true this.browser_opened = false this.$root.check_authentication(this.success, this.error) }, @@ -159,8 +156,10 @@ export default { } // They aren't currently eligible for the release, so display the error message this.verification_opened = true + this.loading = false }, error: function () { + this.loading = false this.verification_opened = true } } diff --git a/ui/src/views/CompleteView.vue b/ui/src/views/CompleteView.vue index a78a22a..cf3b3f7 100644 --- a/ui/src/views/CompleteView.vue +++ b/ui/src/views/CompleteView.vue @@ -1,9 +1,9 @@