refactor(i18n): use common messages for generic button labels (#7020)

A few components defined their own "Cancel", "Close", "Clear" and
"Success" descriptors when commonMessages already has them. Swapped
them over and removed the old ones.

Locale files come from intl:prune-local dropping the now-orphaned
strings across every language.

packages/ui/src/components/sharing/invite-players-modal/index.vue

@@ -147,6 +147,7 @@ import { Button } from '#ui/components/base/buttons'
 
 import { defineMessages, useVIntl } from '../../../composables/i18n'
 import { injectNotificationManager } from '../../../providers'
+import { commonMessages } from '../../../utils/common-messages'
 import Avatar from '../../base/Avatar.vue'
 import Combobox from '../../base/Combobox.vue'
 import NewModal from '../../modal/NewModal.vue'
@@ -226,10 +227,6 @@ const messages = defineMessages({
 		id: 'sharing.invite-players-modal.added',
 		defaultMessage: 'Added',
 	},
-	cancelButton: {
-		id: 'sharing.invite-players-modal.cancel',
-		defaultMessage: 'Cancel',
-	},
 	requestedButton: {
 		id: 'sharing.invite-players-modal.requested',
 		defaultMessage: 'Request sent',
@@ -297,7 +294,9 @@ const searchPlaceholderLabel = computed(
 const addButtonLabel = computed(() => props.addLabel ?? formatMessage(messages.addButton))
 const inviteButtonLabel = computed(() => props.inviteLabel ?? formatMessage(messages.inviteButton))
 const addedButtonLabel = computed(() => props.addedLabel ?? formatMessage(messages.addedButton))
-const cancelButtonLabel = computed(() => props.cancelLabel ?? formatMessage(messages.cancelButton))
+const cancelButtonLabel = computed(
+	() => props.cancelLabel ?? formatMessage(commonMessages.cancelButton),
+)
 const requestedButtonLabel = computed(
 	() => props.requestedLabel ?? formatMessage(messages.requestedButton),
 )

packages/ui/src/components/sharing/invite-players-modal/invite-players-modal-invite-link-editor.vue

@@ -32,7 +32,7 @@
 							/>
 							<div class="flex justify-end gap-2 p-3 pt-1">
 								<Button type="outlined" native-type="button" @click="cancelCustomExpiry">
-									{{ formatMessage(messages.cancel) }}
+									{{ formatMessage(commonMessages.cancelButton) }}
 								</Button>
 								<Button
 									type="colored"
@@ -73,7 +73,7 @@
 			<div class="flex justify-end gap-2">
 				<Button :disabled="saving" @click="modal?.hide()">
 					<XIcon aria-hidden="true" />
-					{{ formatMessage(messages.cancel) }}
+					{{ formatMessage(commonMessages.cancelButton) }}
 				</Button>
 				<Button type="colored" color="brand" :disabled="!canSave" @click="save">
 					<SpinnerIcon v-if="saving" class="animate-spin" aria-hidden="true" />
@@ -94,6 +94,7 @@ import { Button } from '#ui/components/base/buttons'
 import { useFormatDateTime } from '../../../composables'
 import { defineMessages, useVIntl } from '../../../composables/i18n'
 import { injectNotificationManager } from '../../../providers'
+import { commonMessages } from '../../../utils/common-messages'
 import Combobox, { type ComboboxOption } from '../../base/Combobox.vue'
 import DatePicker from '../../base/DatePicker.vue'
 import StyledInput from '../../base/StyledInput.vue'
@@ -186,10 +187,6 @@ const messages = defineMessages({
 		id: 'sharing.invite-players-modal.custom-expiry-value',
 		defaultMessage: 'Custom: {date}',
 	},
-	cancel: {
-		id: 'sharing.invite-players-modal.cancel-button',
-		defaultMessage: 'Cancel',
-	},
 	apply: {
 		id: 'sharing.invite-players-modal.apply-button',
 		defaultMessage: 'Apply',

packages/ui/src/layouts/shared/files-tab/components/editor/EditorFindReplace.vue

@@ -66,9 +66,9 @@
 				</IconButton>
 				<div class="mx-0.5 h-4 w-px bg-surface-5" />
 				<IconButton
-					v-tooltip="formatMessage(messages.closeFind)"
+					v-tooltip="formatMessage(commonMessages.closeButton)"
 					type="quiet"
-					:label="formatMessage(messages.closeFind)"
+					:label="formatMessage(commonMessages.closeButton)"
 					@click="close"
 				>
 					<XIcon />
@@ -118,6 +118,7 @@ import { nextTick, ref, watch } from 'vue'
 import { Button, IconButton } from '#ui/components/base/buttons'
 import StyledInput from '#ui/components/base/StyledInput.vue'
 import { defineMessages, useVIntl } from '#ui/composables/i18n'
+import { commonMessages } from '#ui/utils/common-messages'
 
 const props = defineProps<{
 	isFindOpen: boolean
@@ -161,10 +162,6 @@ const messages = defineMessages({
 		id: 'files.editor.find-next-match',
 		defaultMessage: 'Next match',
 	},
-	closeFind: {
-		id: 'files.editor.find-close',
-		defaultMessage: 'Close',
-	},
 	toggleReplace: {
 		id: 'files.editor.find-toggle-replace',
 		defaultMessage: 'Toggle replace',

packages/ui/src/locales/cs-CZ/index.json

@@ -1130,9 +1130,6 @@
   "files.editor.file-saved-title": {
     "defaultMessage": "Soubor uložen"
   },
-  "files.editor.find-close": {
-    "defaultMessage": "Zavřít"
-  },
   "files.editor.find-in-file": {
     "defaultMessage": "Najít"
   },
@@ -4557,4 +4554,3 @@
     "defaultMessage": "Typ"
   }
 }
-

packages/ui/src/locales/da-DK/index.json

@@ -557,9 +557,6 @@
   "files.editor.file-saved-title": {
     "defaultMessage": "Fil gemt"
   },
-  "files.editor.find-close": {
-    "defaultMessage": "Luk"
-  },
   "files.editor.find-in-file": {
     "defaultMessage": "Find"
   },
@@ -2253,4 +2250,3 @@
     "defaultMessage": "Vanilla Shader"
   }
 }
-

packages/ui/src/locales/de-CH/index.json

@@ -1304,9 +1304,6 @@
   "files.editor.file-saved-title": {
     "defaultMessage": "Datei gespeichert"
   },
-  "files.editor.find-close": {
-    "defaultMessage": "Schliessen"
-  },
   "files.editor.find-in-file": {
     "defaultMessage": "Finden"
   },
@@ -5399,12 +5396,6 @@
   "sharing.invite-players-modal.avatar-alt": {
     "defaultMessage": "Avatar von {username}"
   },
-  "sharing.invite-players-modal.cancel": {
-    "defaultMessage": "Abbrechen"
-  },
-  "sharing.invite-players-modal.cancel-button": {
-    "defaultMessage": "Abbrechen"
-  },
   "sharing.invite-players-modal.custom-expiry": {
     "defaultMessage": "Benutzerdefiniert..."
   },
@@ -6240,4 +6231,3 @@
     "defaultMessage": "Typ"
   }
 }
-

packages/ui/src/locales/de-DE/index.json

@@ -1304,9 +1304,6 @@
   "files.editor.file-saved-title": {
     "defaultMessage": "Datei gespeichert"
   },
-  "files.editor.find-close": {
-    "defaultMessage": "Schließen"
-  },
   "files.editor.find-in-file": {
     "defaultMessage": "Finden"
   },
@@ -5399,12 +5396,6 @@
   "sharing.invite-players-modal.avatar-alt": {
     "defaultMessage": "Avatar von {username}"
   },
-  "sharing.invite-players-modal.cancel": {
-    "defaultMessage": "Abbrechen"
-  },
-  "sharing.invite-players-modal.cancel-button": {
-    "defaultMessage": "Abbrechen"
-  },
   "sharing.invite-players-modal.custom-expiry": {
     "defaultMessage": "Benutzerdefiniert..."
   },
@@ -6240,4 +6231,3 @@
     "defaultMessage": "Typ"
   }
 }
-

packages/ui/src/locales/en-US/index.json

@@ -1304,9 +1304,6 @@
   "files.editor.file-saved-title": {
     "defaultMessage": "File saved"
   },
-  "files.editor.find-close": {
-    "defaultMessage": "Close"
-  },
   "files.editor.find-in-file": {
     "defaultMessage": "Find"
   },
@@ -5414,12 +5411,6 @@
   "sharing.invite-players-modal.avatar-alt": {
     "defaultMessage": "{username}'s avatar"
   },
-  "sharing.invite-players-modal.cancel": {
-    "defaultMessage": "Cancel"
-  },
-  "sharing.invite-players-modal.cancel-button": {
-    "defaultMessage": "Cancel"
-  },
   "sharing.invite-players-modal.custom-expiry": {
     "defaultMessage": "Custom..."
   },

packages/ui/src/locales/es-419/index.json

@@ -1304,9 +1304,6 @@
   "files.editor.file-saved-title": {
     "defaultMessage": "Archivo guardado"
   },
-  "files.editor.find-close": {
-    "defaultMessage": "Cerrar"
-  },
   "files.editor.find-in-file": {
     "defaultMessage": "Buscar"
   },
@@ -5414,12 +5411,6 @@
   "sharing.invite-players-modal.avatar-alt": {
     "defaultMessage": "Avatar de {username}"
   },
-  "sharing.invite-players-modal.cancel": {
-    "defaultMessage": "Cancelar"
-  },
-  "sharing.invite-players-modal.cancel-button": {
-    "defaultMessage": "Cancelar"
-  },
   "sharing.invite-players-modal.custom-expiry": {
     "defaultMessage": "Otro..."
   },
@@ -6255,4 +6246,3 @@
     "defaultMessage": "Tipo"
   }
 }
-

packages/ui/src/locales/es-ES/index.json

@@ -1187,9 +1187,6 @@
   "files.editor.file-saved-title": {
     "defaultMessage": "Archivo guardado"
   },
-  "files.editor.find-close": {
-    "defaultMessage": "Cerrar"
-  },
   "files.editor.find-in-file": {
     "defaultMessage": "Encontrar"
   },

packages/ui/src/locales/fil-PH/index.json

@@ -341,9 +341,6 @@
   "external-project-license-status.yes": {
     "defaultMessage": "Oo"
   },
-  "files.editor.find-close": {
-    "defaultMessage": "Isara"
-  },
   "files.editor.find-in-file": {
     "defaultMessage": "Hahanapin"
   },
@@ -2766,4 +2763,3 @@
     "defaultMessage": "Uri"
   }
 }
-

packages/ui/src/locales/fr-FR/index.json

@@ -1301,9 +1301,6 @@
   "files.editor.file-saved-title": {
     "defaultMessage": "Fichier sauvegardé"
   },
-  "files.editor.find-close": {
-    "defaultMessage": "Fermer"
-  },
   "files.editor.find-in-file": {
     "defaultMessage": "Trouver"
   },
@@ -5390,12 +5387,6 @@
   "sharing.invite-players-modal.avatar-alt": {
     "defaultMessage": "Avatar de {username}"
   },
-  "sharing.invite-players-modal.cancel": {
-    "defaultMessage": "Annuler"
-  },
-  "sharing.invite-players-modal.cancel-button": {
-    "defaultMessage": "Annuler"
-  },
   "sharing.invite-players-modal.custom-expiry": {
     "defaultMessage": "Personnaliser..."
   },

packages/ui/src/locales/hu-HU/index.json

@@ -1028,9 +1028,6 @@
   "files.editor.file-saved-title": {
     "defaultMessage": "A fájl mentve"
   },
-  "files.editor.find-close": {
-    "defaultMessage": "Bezárás"
-  },
   "files.editor.find-in-file": {
     "defaultMessage": "Keresés"
   },
@@ -4544,12 +4541,6 @@
   "sharing.invite-players-modal.avatar-alt": {
     "defaultMessage": "{username} avatárja"
   },
-  "sharing.invite-players-modal.cancel": {
-    "defaultMessage": "Mégse"
-  },
-  "sharing.invite-players-modal.cancel-button": {
-    "defaultMessage": "Mégse"
-  },
   "sharing.invite-players-modal.edit-invite-link": {
     "defaultMessage": "Meghívólink szerkesztése."
   },

packages/ui/src/locales/id-ID/index.json

@@ -824,9 +824,6 @@
   "files.editor.file-saved-title": {
     "defaultMessage": "Berkas disimpan"
   },
-  "files.editor.find-close": {
-    "defaultMessage": "Tutup"
-  },
   "files.editor.find-in-file": {
     "defaultMessage": "Cari"
   },
@@ -2985,4 +2982,3 @@
     "defaultMessage": "Anda memiliki perubahan yang belum tersimpan."
   }
 }
-

packages/ui/src/locales/it-IT/index.json

@@ -1274,9 +1274,6 @@
   "files.editor.file-saved-title": {
     "defaultMessage": "File salvato"
   },
-  "files.editor.find-close": {
-    "defaultMessage": "Chiudi"
-  },
   "files.editor.find-in-file": {
     "defaultMessage": "Trova"
   },
@@ -5372,12 +5369,6 @@
   "sharing.invite-players-modal.avatar-alt": {
     "defaultMessage": "Foto profilo di {username}"
   },
-  "sharing.invite-players-modal.cancel": {
-    "defaultMessage": "Annulla"
-  },
-  "sharing.invite-players-modal.cancel-button": {
-    "defaultMessage": "Annulla"
-  },
   "sharing.invite-players-modal.custom-expiry": {
     "defaultMessage": "Personalizzata..."
   },

packages/ui/src/locales/ja-JP/index.json

@@ -1220,9 +1220,6 @@
   "files.editor.file-saved-title": {
     "defaultMessage": "保存済み"
   },
-  "files.editor.find-close": {
-    "defaultMessage": "閉じる"
-  },
   "files.editor.find-in-file": {
     "defaultMessage": "検索"
   },

packages/ui/src/locales/ko-KR/index.json

@@ -1304,9 +1304,6 @@
   "files.editor.file-saved-title": {
     "defaultMessage": "파일 저장됨"
   },
-  "files.editor.find-close": {
-    "defaultMessage": "닫다"
-  },
   "files.editor.find-in-file": {
     "defaultMessage": "찾다"
   },
@@ -5396,12 +5393,6 @@
   "sharing.invite-players-modal.avatar-alt": {
     "defaultMessage": "{username} 님의 아바타"
   },
-  "sharing.invite-players-modal.cancel": {
-    "defaultMessage": "취소"
-  },
-  "sharing.invite-players-modal.cancel-button": {
-    "defaultMessage": "취소"
-  },
   "sharing.invite-players-modal.custom-expiry": {
     "defaultMessage": "커스텀..."
   },

packages/ui/src/locales/ms-MY/index.json

@@ -914,9 +914,6 @@
   "files.editor.file-saved-title": {
     "defaultMessage": "Fail disimpan"
   },
-  "files.editor.find-close": {
-    "defaultMessage": "Tutup"
-  },
   "files.editor.find-in-file": {
     "defaultMessage": "Cari"
   },
@@ -5058,4 +5055,3 @@
     "defaultMessage": "Jenis"
   }
 }
-

packages/ui/src/locales/nl-NL/index.json

@@ -1301,9 +1301,6 @@
   "files.editor.file-saved-title": {
     "defaultMessage": "Bestand opgeslagen"
   },
-  "files.editor.find-close": {
-    "defaultMessage": "Sluiten"
-  },
   "files.editor.find-in-file": {
     "defaultMessage": "Vind"
   },
@@ -5219,12 +5216,6 @@
   "sharing.invite-players-modal.avatar-alt": {
     "defaultMessage": "Avatar van {username}"
   },
-  "sharing.invite-players-modal.cancel": {
-    "defaultMessage": "Annuleren"
-  },
-  "sharing.invite-players-modal.cancel-button": {
-    "defaultMessage": "Annuleren"
-  },
   "sharing.invite-players-modal.edit-invite-link": {
     "defaultMessage": "Uitnodigingslink bewerken."
   },

packages/ui/src/locales/pl-PL/index.json

@@ -1298,9 +1298,6 @@
   "files.editor.file-saved-title": {
     "defaultMessage": "Plik zapisany"
   },
-  "files.editor.find-close": {
-    "defaultMessage": "Zamknij"
-  },
   "files.editor.find-in-file": {
     "defaultMessage": "Znajdź"
   },
@@ -5369,12 +5366,6 @@
   "sharing.invite-players-modal.avatar-alt": {
     "defaultMessage": "Awatar użytkownika {username}"
   },
-  "sharing.invite-players-modal.cancel": {
-    "defaultMessage": "Anuluj"
-  },
-  "sharing.invite-players-modal.cancel-button": {
-    "defaultMessage": "Anuluj"
-  },
   "sharing.invite-players-modal.expiry-label": {
     "defaultMessage": "Data wygaśnięcia"
   },

packages/ui/src/locales/pt-BR/index.json

@@ -1304,9 +1304,6 @@
   "files.editor.file-saved-title": {
     "defaultMessage": "Arquivo salvo"
   },
-  "files.editor.find-close": {
-    "defaultMessage": "Fechar"
-  },
   "files.editor.find-in-file": {
     "defaultMessage": "Localizar"
   },
@@ -5414,12 +5411,6 @@
   "sharing.invite-players-modal.avatar-alt": {
     "defaultMessage": "Avatar de {username}"
   },
-  "sharing.invite-players-modal.cancel": {
-    "defaultMessage": "Cancelar"
-  },
-  "sharing.invite-players-modal.cancel-button": {
-    "defaultMessage": "Cancelar"
-  },
   "sharing.invite-players-modal.custom-expiry": {
     "defaultMessage": "Personalizado..."
   },
@@ -6255,4 +6246,3 @@
     "defaultMessage": "Tipo"
   }
 }
-

packages/ui/src/locales/pt-PT/index.json

@@ -497,9 +497,6 @@
   "files.editor.file-saved-title": {
     "defaultMessage": "Ficheiro salvo"
   },
-  "files.editor.find-close": {
-    "defaultMessage": "Fechar"
-  },
   "files.editor.find-in-file": {
     "defaultMessage": "Encontrar"
   },
@@ -2526,4 +2523,3 @@
     "defaultMessage": "Tens alterações por guardar."
   }
 }
-

packages/ui/src/locales/ro-RO/index.json

@@ -551,9 +551,6 @@
   "files.editor.file-saved-title": {
     "defaultMessage": "Fișier salvat"
   },
-  "files.editor.find-close": {
-    "defaultMessage": "Închide"
-  },
   "files.editor.find-in-file": {
     "defaultMessage": "Caută"
   },

packages/ui/src/locales/ru-RU/index.json

@@ -1232,9 +1232,6 @@
   "files.editor.file-saved-title": {
     "defaultMessage": "Файл сохранён"
   },
-  "files.editor.find-close": {
-    "defaultMessage": "Закрыть"
-  },
   "files.editor.find-in-file": {
     "defaultMessage": "Найти"
   },
@@ -5327,12 +5324,6 @@
   "sharing.invite-players-modal.avatar-alt": {
     "defaultMessage": "Аватар {username}"
   },
-  "sharing.invite-players-modal.cancel": {
-    "defaultMessage": "Отозвать"
-  },
-  "sharing.invite-players-modal.cancel-button": {
-    "defaultMessage": "Отмена"
-  },
   "sharing.invite-players-modal.custom-expiry": {
     "defaultMessage": "Другое..."
   },

packages/ui/src/locales/sr-CS/index.json

@@ -1253,9 +1253,6 @@
   "files.editor.file-saved-title": {
     "defaultMessage": "Datoteka sačuvana"
   },
-  "files.editor.find-close": {
-    "defaultMessage": "Zatvori"
-  },
   "files.editor.find-in-file": {
     "defaultMessage": "Pronađi"
   },
@@ -5784,4 +5781,3 @@
     "defaultMessage": "Tip"
   }
 }
-

packages/ui/src/locales/sv-SE/index.json

@@ -1142,9 +1142,6 @@
   "files.editor.file-saved-title": {
     "defaultMessage": "Filen sparades"
   },
-  "files.editor.find-close": {
-    "defaultMessage": "Stäng"
-  },
   "files.editor.find-in-file": {
     "defaultMessage": "Hitta"
   },
@@ -4760,12 +4757,6 @@
   "sharing.invite-players-modal.avatar-alt": {
     "defaultMessage": "{username}s avatar"
   },
-  "sharing.invite-players-modal.cancel": {
-    "defaultMessage": "Avbryt"
-  },
-  "sharing.invite-players-modal.cancel-button": {
-    "defaultMessage": "Avbryt"
-  },
   "sharing.invite-players-modal.custom-expiry": {
     "defaultMessage": "Anpassat..."
   },
@@ -5442,4 +5433,3 @@
     "defaultMessage": "Typ"
   }
 }
-

packages/ui/src/locales/tr-TR/index.json

@@ -1274,9 +1274,6 @@
   "files.editor.file-saved-title": {
     "defaultMessage": "Dosya kaydedildi"
   },
-  "files.editor.find-close": {
-    "defaultMessage": "Kapat"
-  },
   "files.editor.find-in-file": {
     "defaultMessage": "Bul"
   },

packages/ui/src/locales/uk-UA/index.json

@@ -1259,9 +1259,6 @@
   "files.editor.file-saved-title": {
     "defaultMessage": "Файл збережено"
   },
-  "files.editor.find-close": {
-    "defaultMessage": "Закрити"
-  },
   "files.editor.find-in-file": {
     "defaultMessage": "Знайти"
   },
@@ -5363,12 +5360,6 @@
   "sharing.invite-players-modal.avatar-alt": {
     "defaultMessage": "Аватар користувача {username}"
   },
-  "sharing.invite-players-modal.cancel": {
-    "defaultMessage": "Скасувати"
-  },
-  "sharing.invite-players-modal.cancel-button": {
-    "defaultMessage": "Скасувати"
-  },
   "sharing.invite-players-modal.custom-expiry": {
     "defaultMessage": "Власна…"
   },

packages/ui/src/locales/vi-VN/index.json

@@ -935,9 +935,6 @@
   "files.editor.file-saved-title": {
     "defaultMessage": "Tệp đã được lưu"
   },
-  "files.editor.find-close": {
-    "defaultMessage": "Đóng"
-  },
   "files.editor.find-in-file": {
     "defaultMessage": "Tìm"
   },
@@ -5082,4 +5079,3 @@
     "defaultMessage": "Đội ngũ Modrinth"
   }
 }
-

packages/ui/src/locales/zh-CN/index.json

@@ -1304,9 +1304,6 @@
   "files.editor.file-saved-title": {
     "defaultMessage": "文件已保存"
   },
-  "files.editor.find-close": {
-    "defaultMessage": "关闭"
-  },
   "files.editor.find-in-file": {
     "defaultMessage": "查找"
   },
@@ -5414,12 +5411,6 @@
   "sharing.invite-players-modal.avatar-alt": {
     "defaultMessage": "{username} 的头像"
   },
-  "sharing.invite-players-modal.cancel": {
-    "defaultMessage": "取消"
-  },
-  "sharing.invite-players-modal.cancel-button": {
-    "defaultMessage": "取消"
-  },
   "sharing.invite-players-modal.custom-expiry": {
     "defaultMessage": "自定义……"
   },
@@ -6255,4 +6246,3 @@
     "defaultMessage": "类型"
   }
 }
-

packages/ui/src/locales/zh-TW/index.json

@@ -1304,9 +1304,6 @@
   "files.editor.file-saved-title": {
     "defaultMessage": "已儲存檔案"
   },
-  "files.editor.find-close": {
-    "defaultMessage": "關閉"
-  },
   "files.editor.find-in-file": {
     "defaultMessage": "尋找"
   },
@@ -5414,12 +5411,6 @@
   "sharing.invite-players-modal.avatar-alt": {
     "defaultMessage": "{username} 的顯示圖片"
   },
-  "sharing.invite-players-modal.cancel": {
-    "defaultMessage": "取消"
-  },
-  "sharing.invite-players-modal.cancel-button": {
-    "defaultMessage": "取消"
-  },
   "sharing.invite-players-modal.custom-expiry": {
     "defaultMessage": "自訂..."
   },
@@ -6255,4 +6246,3 @@
     "defaultMessage": "類型"
   }
 }
-