Replace duplicated strings (#3710)

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."
-        "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."
-        }
       }
     }
   },
   "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.",
+        "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."
-        }
       },
       "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."
-        "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."
-        }
       },
       "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"
 }

web/src/components/admin/settings/AdminSecretsTab.vue

@@ -1,24 +1,18 @@
 <template>
   <Settings
-    :title="$t('admin.settings.secrets.secrets')"
+    :title="$t('secrets.secrets')"
     :desc="$t('admin.settings.secrets.desc')"
     docs-url="docs/usage/secrets"
     :warning="$t('admin.settings.secrets.warning')"
   >
     <template #titleActions>
-      <Button
+      <Button v-if="selectedSecret" :text="$t('secrets.show')" start-icon="back" @click="selectedSecret = undefined" />
-        v-if="selectedSecret"
+      <Button v-else :text="$t('secrets.add')" start-icon="plus" @click="showAddSecret" />
-        :text="$t('admin.settings.secrets.show')"
-        start-icon="back"
-        @click="selectedSecret = undefined"
-      />
-      <Button v-else :text="$t('admin.settings.secrets.add')" start-icon="plus" @click="showAddSecret" />
     </template>
 
     <SecretList
       v-if="!selectedSecret"
       v-model="secrets"
-      i18n-prefix="admin.settings.secrets."
       :is-deleting="isDeleting"
       @edit="editSecret"
       @delete="deleteSecret"
@@ -27,7 +21,6 @@
     <SecretEdit
       v-else
       v-model="selectedSecret"
-      i18n-prefix="admin.settings.secrets."
       :is-saving="isSaving"
       @save="createSecret"
       @cancel="selectedSecret = undefined"
@@ -81,7 +74,7 @@ const { doSubmit: createSecret, isLoading: isSaving } = useAsyncAction(async ()
     await apiClient.createGlobalSecret(selectedSecret.value);
   }
   notifications.notify({
-    title: i18n.t(isEditingSecret.value ? 'admin.settings.secrets.saved' : 'admin.settings.secrets.created'),
+    title: i18n.t(isEditingSecret.value ? 'secrets.saved' : 'secrets.created'),
     type: 'success',
   });
   selectedSecret.value = undefined;
@@ -90,7 +83,7 @@ const { doSubmit: createSecret, isLoading: isSaving } = useAsyncAction(async ()
 
 const { doSubmit: deleteSecret, isLoading: isDeleting } = useAsyncAction(async (_secret: Secret) => {
   await apiClient.deleteGlobalSecret(_secret.name);
-  notifications.notify({ title: i18n.t('admin.settings.secrets.deleted'), type: 'success' });
+  notifications.notify({ title: i18n.t('secrets.deleted'), type: 'success' });
   resetPage();
 });
 

web/src/components/layout/header/Navbar.vue

@@ -20,12 +20,7 @@
     </div>
     <div class="flex ml-auto -m-1.5 items-center space-x-2">
       <div v-if="user?.admin" class="relative">
-        <IconButton
+        <IconButton class="navbar-icon" :title="$t('settings')" :to="{ name: 'admin-settings' }" icon="settings" />
-          class="navbar-icon"
-          :title="$t('admin.settings.settings')"
-          :to="{ name: 'admin-settings' }"
-          icon="settings"
-        />
         <div
           v-if="version?.needsUpdate"
           class="absolute top-2 right-2 bg-int-wp-state-error-100 rounded-full w-3 h-3"

web/src/components/org/settings/OrgSecretsTab.vue

@@ -1,23 +1,13 @@
 <template>
-  <Settings
+  <Settings :title="$t('secrets.secrets')" :desc="$t('org.settings.secrets.desc')" docs-url="docs/usage/secrets">
-    :title="$t('org.settings.secrets.secrets')"
-    :desc="$t('org.settings.secrets.desc')"
-    docs-url="docs/usage/secrets"
-  >
     <template #titleActions>
-      <Button
+      <Button v-if="selectedSecret" :text="$t('secrets.show')" start-icon="back" @click="selectedSecret = undefined" />
-        v-if="selectedSecret"
+      <Button v-else :text="$t('secrets.add')" start-icon="plus" @click="showAddSecret" />
-        :text="$t('org.settings.secrets.show')"
-        start-icon="back"
-        @click="selectedSecret = undefined"
-      />
-      <Button v-else :text="$t('org.settings.secrets.add')" start-icon="plus" @click="showAddSecret" />
     </template>
 
     <SecretList
       v-if="!selectedSecret"
       v-model="secrets"
-      i18n-prefix="org.settings.secrets."
       :is-deleting="isDeleting"
       @edit="editSecret"
       @delete="deleteSecret"
@@ -26,7 +16,6 @@
     <SecretEdit
       v-else
       v-model="selectedSecret"
-      i18n-prefix="org.settings.secrets."
       :is-saving="isSaving"
       @save="createSecret"
       @cancel="selectedSecret = undefined"
@@ -89,7 +78,7 @@ const { doSubmit: createSecret, isLoading: isSaving } = useAsyncAction(async ()
     await apiClient.createOrgSecret(org.value.id, selectedSecret.value);
   }
   notifications.notify({
-    title: i18n.t(isEditingSecret.value ? 'org.settings.secrets.saved' : 'org.settings.secrets.created'),
+    title: i18n.t(isEditingSecret.value ? 'secrets.saved' : 'secrets.created'),
     type: 'success',
   });
   selectedSecret.value = undefined;
@@ -102,7 +91,7 @@ const { doSubmit: deleteSecret, isLoading: isDeleting } = useAsyncAction(async (
   }
 
   await apiClient.deleteOrgSecret(org.value.id, _secret.name);
-  notifications.notify({ title: i18n.t('org.settings.secrets.deleted'), type: 'success' });
+  notifications.notify({ title: i18n.t('secrets.deleted'), type: 'success' });
   resetPage();
 });
 

web/src/components/repo/settings/SecretsTab.vue

@@ -1,23 +1,13 @@
 <template>
-  <Settings
+  <Settings :title="$t('secrets.secrets')" :desc="$t('secrets.desc')" docs-url="docs/usage/secrets">
-    :title="$t('repo.settings.secrets.secrets')"
-    :desc="$t('repo.settings.secrets.desc')"
-    docs-url="docs/usage/secrets"
-  >
     <template #titleActions>
-      <Button
+      <Button v-if="selectedSecret" :text="$t('secrets.show')" start-icon="back" @click="selectedSecret = undefined" />
-        v-if="selectedSecret"
+      <Button v-else :text="$t('secrets.add')" start-icon="plus" @click="showAddSecret" />
-        :text="$t('repo.settings.secrets.show')"
-        start-icon="back"
-        @click="selectedSecret = undefined"
-      />
-      <Button v-else :text="$t('repo.settings.secrets.add')" start-icon="plus" @click="showAddSecret" />
     </template>
 
     <SecretList
       v-if="!selectedSecret"
       :model-value="secrets"
-      i18n-prefix="repo.settings.secrets."
       :is-deleting="isDeleting"
       @edit="editSecret"
       @delete="deleteSecret"
@@ -26,7 +16,6 @@
     <SecretEdit
       v-else
       v-model="selectedSecret"
-      i18n-prefix="repo.settings.secrets."
       :is-saving="isSaving"
       @save="createSecret"
       @cancel="selectedSecret = undefined"
@@ -129,7 +118,7 @@ const { doSubmit: createSecret, isLoading: isSaving } = useAsyncAction(async ()
     await apiClient.createSecret(repo.value.id, selectedSecret.value);
   }
   notifications.notify({
-    title: i18n.t(isEditingSecret.value ? 'repo.settings.secrets.saved' : 'repo.settings.secrets.created'),
+    title: i18n.t(isEditingSecret.value ? 'secrets.saved' : 'secrets.created'),
     type: 'success',
   });
   selectedSecret.value = undefined;
@@ -142,7 +131,7 @@ const { doSubmit: deleteSecret, isLoading: isDeleting } = useAsyncAction(async (
   }
 
   await apiClient.deleteSecret(repo.value.id, _secret.name);
-  notifications.notify({ title: i18n.t('repo.settings.secrets.deleted'), type: 'success' });
+  notifications.notify({ title: i18n.t('secrets.deleted'), type: 'success' });
   await resetPage();
 });
 

web/src/components/secrets/SecretEdit.vue

@@ -1,28 +1,28 @@
 <template>
   <div v-if="innerValue" class="space-y-4">
     <form @submit.prevent="save">
-      <InputField v-slot="{ id }" :label="$t(i18nPrefix + 'name')">
+      <InputField v-slot="{ id }" :label="$t('secrets.name')">
         <TextField
           :id="id"
           v-model="innerValue.name"
-          :placeholder="$t(i18nPrefix + 'name')"
+          :placeholder="$t('secrets.name')"
           required
           :disabled="isEditingSecret"
         />
       </InputField>
 
-      <InputField v-slot="{ id }" :label="$t(i18nPrefix + 'value')">
+      <InputField v-slot="{ id }" :label="$t('secrets.value')">
         <TextField
           :id="id"
           v-model="innerValue.value"
-          :placeholder="$t(i18nPrefix + 'value')"
+          :placeholder="$t('secrets.value')"
           :lines="5"
           :required="!isEditingSecret"
         />
       </InputField>
 
-      <InputField v-slot="{ id }" :label="$t(i18nPrefix + 'images.images')">
+      <InputField v-slot="{ id }" :label="$t('secrets.images.images')">
-        <span class="ml-1 mb-2 text-wp-text-alt-100">{{ $t(i18nPrefix + 'images.desc') }}</span>
+        <span class="ml-1 mb-2 text-wp-text-alt-100">{{ $t('secrets.images.desc') }}</span>
 
         <div class="flex flex-col gap-2">
           <div v-for="image in innerValue.images" :key="image" class="flex gap-2">
@@ -36,7 +36,7 @@
         </div>
       </InputField>
 
-      <InputField :label="$t(i18nPrefix + 'events.events')">
+      <InputField :label="$t('secrets.events.events')">
         <CheckboxesField v-model="innerValue.events" :options="secretEventsOptions" />
       </InputField>
 
@@ -46,7 +46,7 @@
           type="submit"
           color="green"
           :is-loading="isSaving"
-          :text="isEditingSecret ? $t(i18nPrefix + 'save') : $t(i18nPrefix + 'add')"
+          :text="isEditingSecret ? $t('secrets.save') : $t('secrets.add')"
         />
       </div>
     </form>
@@ -67,7 +67,6 @@ import { Secret, WebhookEvents } from '~/lib/api/types';
 const props = defineProps<{
   modelValue: Partial<Secret>;
   isSaving: boolean;
-  i18nPrefix: string;
 }>();
 
 const emit = defineEmits<{
@@ -106,7 +105,7 @@ const secretEventsOptions: CheckboxOption[] = [
   {
     value: WebhookEvents.PullRequest,
     text: i18n.t('repo.pipeline.event.pr'),
-    description: i18n.t('repo.settings.secrets.events.pr_warning'),
+    description: i18n.t('secrets.events.pr_warning'),
   },
   { value: WebhookEvents.Deploy, text: i18n.t('repo.pipeline.event.deploy') },
   { value: WebhookEvents.Cron, text: i18n.t('repo.pipeline.event.cron') },

web/src/components/secrets/SecretList.vue

@@ -18,20 +18,20 @@
         <IconButton
           icon="edit"
           class="ml-2 <md:ml-auto w-8 h-8"
-          :title="$t('repo.settings.secrets.edit')"
+          :title="$t('secrets.edit')"
           @click="editSecret(secret)"
         />
         <IconButton
           icon="trash"
           class="ml-2 w-8 h-8 hover:text-wp-control-error-100"
           :is-loading="isDeleting"
-          :title="$t('repo.settings.secrets.delete')"
+          :title="$t('secrets.delete')"
           @click="deleteSecret(secret)"
         />
       </template>
     </ListItem>
 
-    <div v-if="secrets?.length === 0" class="ml-2">{{ $t(i18nPrefix + 'none') }}</div>
+    <div v-if="secrets?.length === 0" class="ml-2">{{ $t('secrets.none') }}</div>
   </div>
 </template>
 
@@ -47,7 +47,6 @@ import { Secret } from '~/lib/api/types';
 const props = defineProps<{
   modelValue: (Secret & { edit?: boolean })[];
   isDeleting: boolean;
-  i18nPrefix: string;
 }>();
 
 const emit = defineEmits<{

web/src/views/admin/AdminSettings.vue

@@ -1,12 +1,12 @@
 <template>
   <Scaffold enable-tabs>
     <template #title>
-      {{ $t('repo.settings.settings') }}
+      {{ $t('settings') }}
     </template>
     <Tab id="info" :title="$t('info')">
       <AdminInfoTab />
     </Tab>
-    <Tab id="secrets" :title="$t('admin.settings.secrets.secrets')">
+    <Tab id="secrets" :title="$t('secrets.secrets')">
       <AdminSecretsTab />
     </Tab>
     <Tab id="repos" :title="$t('admin.settings.repos.repos')">

web/src/views/org/OrgRepos.vue

@@ -9,7 +9,7 @@
         v-if="orgPermissions.admin"
         icon="settings"
         :to="{ name: org.is_user ? 'user' : 'org-settings' }"
-        :title="$t('org.settings.settings')"
+        :title="$t('settings')"
       />
     </template>
 

web/src/views/org/OrgSettings.vue

@@ -6,11 +6,11 @@
           {{ org.name }}
         </router-link>
         /
-        {{ $t('org.settings.settings') }}
+        {{ $t('settings') }}
       </span>
     </template>
 
-    <Tab id="secrets" :title="$t('org.settings.secrets.secrets')">
+    <Tab id="secrets" :title="$t('secrets.secrets')">
       <OrgSecretsTab />
     </Tab>
   </Scaffold>

web/src/views/org/OrgWrapper.vue

@@ -8,7 +8,7 @@
       <IconButton
         v-if="orgPermissions.admin"
         :to="{ name: org.is_user ? 'user' : 'repo-settings' }"
-        :title="$t('org.settings.settings')"
+        :title="$t('settings')"
         icon="settings"
       />
     </template>

web/src/views/repo/RepoSettings.vue

@@ -10,14 +10,14 @@
           {{ repo.name }}
         </router-link>
         /
-        {{ $t('repo.settings.settings') }}
+        {{ $t('settings') }}
       </span>
     </template>
 
     <Tab id="general" :title="$t('repo.settings.general.general')">
       <GeneralTab />
     </Tab>
-    <Tab id="secrets" :title="$t('repo.settings.secrets.secrets')">
+    <Tab id="secrets" :title="$t('secrets.secrets')">
       <SecretsTab />
     </Tab>
     <Tab id="registries" :title="$t('repo.settings.registries.registries')">

web/src/views/repo/RepoWrapper.vue

@@ -21,7 +21,7 @@
       <IconButton
         v-if="repoPermissions.admin"
         :to="{ name: 'repo-settings' }"
-        :title="$t('repo.settings.settings')"
+        :title="$t('settings')"
         icon="settings"
       />
     </template>