From b08133bb63a9bec766f0225e0fb20bfacff1b3de Mon Sep 17 00:00:00 2001 From: qwerty287 <80460567+qwerty287@users.noreply.github.com> Date: Wed, 15 May 2024 18:52:19 +0200 Subject: [PATCH] Replace duplicated strings (#3710) --- web/src/assets/locales/en.json | 121 +++++------------- .../admin/settings/AdminSecretsTab.vue | 17 +-- web/src/components/layout/header/Navbar.vue | 7 +- .../components/org/settings/OrgSecretsTab.vue | 21 +-- .../components/repo/settings/SecretsTab.vue | 21 +-- web/src/components/secrets/SecretEdit.vue | 19 ++- web/src/components/secrets/SecretList.vue | 7 +- web/src/views/admin/AdminSettings.vue | 4 +- web/src/views/org/OrgRepos.vue | 2 +- web/src/views/org/OrgSettings.vue | 4 +- web/src/views/org/OrgWrapper.vue | 2 +- web/src/views/repo/RepoSettings.vue | 4 +- web/src/views/repo/RepoWrapper.vue | 2 +- 13 files changed, 68 insertions(+), 163 deletions(-) diff --git a/web/src/assets/locales/en.json b/web/src/assets/locales/en.json index ed881f88f..123334127 100644 --- a/web/src/assets/locales/en.json +++ b/web/src/assets/locales/en.json @@ -72,9 +72,8 @@ "success": "Repository enabled", "list_reloaded": "Repository list reloaded" }, - "open_in_forge": "Open Repository in Version Control System", + "open_in_forge": "Open repository in forge", "settings": { - "settings": "Settings", "not_allowed": "You are not allowed to access this repository's settings", "general": { "general": "General", @@ -131,31 +130,6 @@ "desc": "Enable to cancel pending and running pipelines of the same event and context before starting the newly triggered one." } }, - "secrets": { - "secrets": "Secrets", - "desc": "Secrets can be passed to individual pipeline steps at runtime as environmental variables.", - "none": "There are no secrets yet.", - "add": "Add secret", - "save": "Save secret", - "show": "Show secrets", - "name": "Name", - "value": "Value", - "delete_confirm": "Do you really want to delete this secret?", - "deleted": "Secret deleted", - "created": "Secret created", - "saved": "Secret saved", - "images": { - "images": "Available for following images", - "desc": "List of images where this secret is available, leave empty to allow all images" - }, - "events": { - "events": "Available at following events", - "pr_warning": "Please be careful with this option as a bad actor can submit a malicious pull request that exposes your secrets." - }, - "plugins_only": "Only available for plugins", - "edit": "Edit secret", - "delete": "Delete secret" - }, "registries": { "registries": "Registries", "credentials": "Registry credentials", @@ -298,58 +272,18 @@ }, "org": { "settings": { - "settings": "Settings", "not_allowed": "You are not allowed to access this organization's settings", "secrets": { - "secrets": "Secrets", - "desc": "Organization secrets can be passed to all organization's repository individual pipeline steps at runtime as environmental variables.", - "none": "There are no organization secrets yet.", - "add": "Add secret", - "save": "Save secret", - "show": "Show secrets", - "name": "Name", - "value": "Value", - "deleted": "Organization secret deleted", - "created": "Organization secret created", - "saved": "Organization secret saved", - "images": { - "images": "Available for following images", - "desc": "List of images where this secret is available, leave empty to allow all images" - }, - "plugins_only": "Only available for plugins", - "events": { - "events": "Available at following events", - "pr_warning": "Please be careful with this option as a bad actor can submit a malicious pull request that exposes your secrets." - } + "desc": "Organization secrets can be passed to all organization's repository individual pipeline steps at runtime as environmental variables." } } }, "admin": { "settings": { - "settings": "Settings", "not_allowed": "You are not allowed to access server settings", "secrets": { - "secrets": "Secrets", "desc": "Global secrets can be passed to all repositories individual pipeline steps at runtime as environmental variables.", - "warning": "These secrets will be available for all server users.", - "none": "There are no global secrets yet.", - "add": "Add secret", - "save": "Save secret", - "show": "Show secrets", - "name": "Name", - "value": "Value", - "deleted": "Global secret deleted", - "created": "Global secret created", - "saved": "Global secret saved", - "images": { - "images": "Available for following images", - "desc": "List of images where this secret is available, leave empty to allow all images" - }, - "plugins_only": "Only available for plugins", - "events": { - "events": "Available at following events", - "pr_warning": "Please be careful with this option as a bad actor can submit a malicious pull request that exposes your secrets." - } + "warning": "These secrets will be available for all server users." }, "agents": { "agents": "Agents", @@ -472,26 +406,7 @@ } }, "secrets": { - "secrets": "Secrets", - "desc": "User secrets can be passed to all user's repository individual pipeline steps at runtime as environmental variables.", - "none": "There are no user secrets yet.", - "add": "Add secret", - "save": "Save secret", - "show": "Show secrets", - "name": "Name", - "value": "Value", - "deleted": "User secret deleted", - "created": "User secret created", - "saved": "User secret saved", - "images": { - "images": "Available for following images", - "desc": "List of images where this secret is available, leave empty to allow all images" - }, - "plugins_only": "Only available for plugins", - "events": { - "events": "Available at following events", - "pr_warning": "Please be careful with this option as a bad actor can submit a malicious pull request that exposes your secrets." - } + "desc": "User secrets can be passed to all user's repository individual pipeline steps at runtime as environmental variables." }, "cli_and_api": { "cli_and_api": "CLI & API", @@ -508,6 +423,31 @@ "internal_error": "Some internal error occurred", "access_denied": "You are not allowed to login" }, + "secrets": { + "secrets": "Secrets", + "desc": "Secrets can be passed to individual pipeline steps at runtime as environmental variables.", + "none": "There are no secrets yet.", + "add": "Add secret", + "save": "Save secret", + "show": "Show secrets", + "name": "Name", + "value": "Value", + "delete_confirm": "Do you really want to delete this secret?", + "deleted": "Secret deleted", + "created": "Secret created", + "saved": "Secret saved", + "images": { + "images": "Available for following images", + "desc": "List of images where this secret is available, leave empty to allow all images" + }, + "events": { + "events": "Available at following events", + "pr_warning": "Please be careful with this option as a bad actor can submit a malicious pull request that exposes your secrets." + }, + "plugins_only": "Only available for plugins", + "edit": "Edit secret", + "delete": "Delete secret" + }, "default": "default", "info": "Info", "running_version": "You are running Woodpecker {0}", @@ -520,5 +460,6 @@ "cli_login_success": "Login to CLI successful", "cli_login_failed": "Login to CLI failed", "cli_login_denied": "Login to CLI denied", - "return_to_cli": "You can now close this tab and return to the CLI." + "return_to_cli": "You can now close this tab and return to the CLI.", + "settings": "Settings" } diff --git a/web/src/components/admin/settings/AdminSecretsTab.vue b/web/src/components/admin/settings/AdminSecretsTab.vue index 3cdfba59c..7927e3851 100644 --- a/web/src/components/admin/settings/AdminSecretsTab.vue +++ b/web/src/components/admin/settings/AdminSecretsTab.vue @@ -1,24 +1,18 @@ -
{{ $t(i18nPrefix + 'none') }}
+
{{ $t('secrets.none') }}
@@ -47,7 +47,6 @@ import { Secret } from '~/lib/api/types'; const props = defineProps<{ modelValue: (Secret & { edit?: boolean })[]; isDeleting: boolean; - i18nPrefix: string; }>(); const emit = defineEmits<{ diff --git a/web/src/views/admin/AdminSettings.vue b/web/src/views/admin/AdminSettings.vue index 3cb032888..9fbfa7464 100644 --- a/web/src/views/admin/AdminSettings.vue +++ b/web/src/views/admin/AdminSettings.vue @@ -1,12 +1,12 @@ diff --git a/web/src/views/org/OrgSettings.vue b/web/src/views/org/OrgSettings.vue index 90d3f61b6..9568d728b 100644 --- a/web/src/views/org/OrgSettings.vue +++ b/web/src/views/org/OrgSettings.vue @@ -6,11 +6,11 @@ {{ org.name }} / - {{ $t('org.settings.settings') }} + {{ $t('settings') }} - + diff --git a/web/src/views/org/OrgWrapper.vue b/web/src/views/org/OrgWrapper.vue index b78c72c2d..2320ba3f2 100644 --- a/web/src/views/org/OrgWrapper.vue +++ b/web/src/views/org/OrgWrapper.vue @@ -8,7 +8,7 @@ diff --git a/web/src/views/repo/RepoSettings.vue b/web/src/views/repo/RepoSettings.vue index bdaed99c8..bcc070c5d 100644 --- a/web/src/views/repo/RepoSettings.vue +++ b/web/src/views/repo/RepoSettings.vue @@ -10,14 +10,14 @@ {{ repo.name }} / - {{ $t('repo.settings.settings') }} + {{ $t('settings') }} - + diff --git a/web/src/views/repo/RepoWrapper.vue b/web/src/views/repo/RepoWrapper.vue index e3ccc2027..aff516833 100644 --- a/web/src/views/repo/RepoWrapper.vue +++ b/web/src/views/repo/RepoWrapper.vue @@ -21,7 +21,7 @@