Skip to content

Commit

Permalink
N21-2377 Fix board card share link action text (#3525)
Browse files Browse the repository at this point in the history
  • Loading branch information
MarvinOehlerkingCap authored Jan 29, 2025
1 parent ed4e5e2 commit 782aa34
Show file tree
Hide file tree
Showing 10 changed files with 17 additions and 29 deletions.
10 changes: 2 additions & 8 deletions src/components/organisms/administration/AuthSystems.vue
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,7 @@
icon
variant="text"
@click="copyLoginLink(0)"
:aria-label="
$t('pages.administration.school.index.authSystems.copyLink')
"
:aria-label="$t('common.actions.shareLink')"
>
<v-icon>
{{ getCopyStatus(0) ? iconMdiCheckCircle : iconMdiContentCopy }}
Expand Down Expand Up @@ -67,11 +65,7 @@
icon
variant="text"
@click="copyLoginLink(system.id)"
:aria-label="
$t(
'pages.administration.school.index.authSystems.copyLink'
)
"
:aria-label="$t('common.actions.shareLink')"
>
<v-icon
>{{
Expand Down
2 changes: 1 addition & 1 deletion src/components/share/ShareModalResult.vue
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
class="d-sm-flex d-none"
data-testid="copyAction"
:icon="mdiContentCopy"
:label="$t('components.molecules.share.result.copyClipboard')"
:label="$t('common.actions.shareLink')"
@click.stop="onCopy(shareUrl)"
/>

Expand Down
4 changes: 1 addition & 3 deletions src/locales/de.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ export default {
"common.actions.share": "Teilen",
"common.actions.export": "Exportieren",
"common.actions.shareCopy": "Kopie teilen",
"common.actions.shareLink": "Link kopieren",
"common.actions.update": "Aktualisieren",
"common.ariaLabel.newTab": "öffnet in einem neuen Tab",
"common.ariaLabel.sameTab": "öffnet im selben Tab",
Expand Down Expand Up @@ -747,7 +748,6 @@ export default {
"components.molecules.share.options.schoolInternally":
"Link nur schulintern gültig",
"components.molecules.share.options.title": "Teilen-Einstellungen",
"components.molecules.share.result.copyClipboard": "Link kopieren",
"components.molecules.share.result.mailShare": "Als Mail versenden",
"components.molecules.share.result.qrCodeScan": "QR-Code scannen",
"components.molecules.share.result.title": "Teilen über",
Expand Down Expand Up @@ -1246,7 +1246,6 @@ export default {
"pages.administration.school.index.authSystems.alias": "Alias",
"pages.administration.school.index.authSystems.confirmDeleteText":
"Sind Sie sich sicher, dass Sie folgendes Authentifizierungs-System löschen wollen?",
"pages.administration.school.index.authSystems.copyLink": "Link kopieren",
"pages.administration.school.index.authSystems.delete": "{system} löschen",
"pages.administration.school.index.authSystems.deleteAuthSystem":
"Authentifizierung löschen",
Expand Down Expand Up @@ -1957,7 +1956,6 @@ export default {
"tldraw.error.ws.4404": "Whiteboard mit diesem Namen wurde nicht gefunden",
"ui-confirmation-dialog.ask-delete": "{type}{title} wirklich löschen?",
"ui-confirmation-dialog.ask-cancel-form": "Änderungen verwerfen?",
"ui-layout.topbar.pageShare.copyLink": "Link kopieren",
"ui-layout.topbar.pageShare.printQRCode": "QR-Code drucken",
"util-validators-invalid-url": "Dies ist keine gültige URL.",
"utils.adminFilter.class.title": "Klasse(n)",
Expand Down
4 changes: 1 addition & 3 deletions src/locales/en.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ export default {
"common.actions.scrollToTop": "Scroll up",
"common.actions.share": "Share",
"common.actions.shareCopy": "Share copy",
"common.actions.shareLink": "Copy link",
"common.actions.update": "Update",
"common.ariaLabel.newTab": "opens in a new tab",
"common.ariaLabel.sameTab": "opens in the same tab",
Expand Down Expand Up @@ -733,7 +734,6 @@ export default {
"components.molecules.share.options.schoolInternally":
"Link only valid within the school",
"components.molecules.share.options.title": "Share settings",
"components.molecules.share.result.copyClipboard": "Copy link",
"components.molecules.share.result.mailShare": "Send as mail",
"components.molecules.share.result.qrCodeScan": "Scan QR code",
"components.molecules.share.result.title": "Share via",
Expand Down Expand Up @@ -1238,7 +1238,6 @@ export default {
"pages.administration.school.index.authSystems.alias": "Alias",
"pages.administration.school.index.authSystems.confirmDeleteText":
"Are you sure you want to delete the following authentification system?",
"pages.administration.school.index.authSystems.copyLink": "Copy Link",
"pages.administration.school.index.authSystems.delete": "Delete {system}",
"pages.administration.school.index.authSystems.deleteAuthSystem":
"Delete Authentification",
Expand Down Expand Up @@ -1924,7 +1923,6 @@ export default {
"tldraw.error.ws.4404": "Whiteboard with this name was not found",
"ui-confirmation-dialog.ask-delete": "Delete {type}{title}?",
"ui-confirmation-dialog.ask-cancel-form": "Discard changes?",
"ui-layout.topbar.pageShare.copyLink": "Copy link",
"ui-layout.topbar.pageShare.printQRCode": "Print QR Code",
"util-validators-invalid-url": "This is not a valid URL.",
"utils.adminFilter.class.title": "Class(es)",
Expand Down
6 changes: 2 additions & 4 deletions src/locales/es.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ export default {
"common.actions.scrollToTop": "Desplazarse hacia arriba",
"common.actions.share": "Compartir",
"common.actions.shareCopy": "Compartir copia",
"common.actions.shareLink": "Copiar enlace",
"common.actions.update": "Actualizar",
"common.ariaLabel.newTab": "se abre en una nueva pestaña",
"common.ariaLabel.sameTab": "se abre en la misma pestaña",
Expand Down Expand Up @@ -380,7 +381,7 @@ export default {
"components.board.action.moveRight": "Mover a la derecha",
"components.board.action.moveUp": "Levantar",
"components.board.action.changeLayout": "Cambiar vista",
"components.board.action.shareLink.card": "Enlace a la ficha",
"components.board.action.shareLink.card": "Copiar enlace a la tarjeta",
"components.board.column.defaultTitle": "Nueva columna",
"components.board.column.ghost.column.placeholder": "Añadir columna",
"components.board.column.ghost.list.placeholder": "Añadir sección",
Expand Down Expand Up @@ -754,7 +755,6 @@ export default {
"components.molecules.share.options.schoolInternally":
"El enlace sólo es válido dentro de la escuela",
"components.molecules.share.options.title": "Compartir la configuración",
"components.molecules.share.result.copyClipboard": "Copiar enlace",
"components.molecules.share.result.mailShare": "Enviar como correo",
"components.molecules.share.result.qrCodeScan": "Escanear código QR",
"components.molecules.share.result.title": "Compartir vía",
Expand Down Expand Up @@ -1275,7 +1275,6 @@ export default {
"pages.administration.school.index.authSystems.alias": "Alias",
"pages.administration.school.index.authSystems.confirmDeleteText":
"¿Estás seguro de que deseas eliminar la siguiente sistema de autenticación?",
"pages.administration.school.index.authSystems.copyLink": "Copiar enlace",
"pages.administration.school.index.authSystems.delete": "Eliminar {system}",
"pages.administration.school.index.authSystems.deleteAuthSystem":
"Eliminar sistema LDAP",
Expand Down Expand Up @@ -1979,7 +1978,6 @@ export default {
"tldraw.error.ws.4404": "No se ha encontrado la pizarra con este nombre",
"ui-confirmation-dialog.ask-delete": "¿Eliminar {type}{title}?",
"ui-confirmation-dialog.ask-cancel-form": "¿Descartar cambios?",
"ui-layout.topbar.pageShare.copyLink": "Copiar enlace",
"ui-layout.topbar.pageShare.printQRCode": "Imprimir código QR",
"util-validators-invalid-url": "Esta URL no es válida.",
"utils.adminFilter.class.title": "Clase(s)",
Expand Down
5 changes: 1 addition & 4 deletions src/locales/uk.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ export default {
"common.actions.scrollToTop": "Прокрутити вгору",
"common.actions.share": "Поділіться",
"common.actions.shareCopy": "Поділитися копією",
"common.actions.shareLink": "Копіювати посилання",
"common.actions.update": "Оновити",
"common.ariaLabel.newTab": "відкривається в новій вкладці",
"common.ariaLabel.sameTab": "відкривається в тій же вкладці",
Expand Down Expand Up @@ -755,7 +756,6 @@ export default {
"components.molecules.share.options.schoolInternally":
"Посилання дійсне тільки в межах школи",
"components.molecules.share.options.title": "Налаштування спільного доступу",
"components.molecules.share.result.copyClipboard": "Скопіювати посилання",
"components.molecules.share.result.mailShare": "Надіслати поштою",
"components.molecules.share.result.qrCodeScan": "Відскануйте QR-код",
"components.molecules.share.result.title": "Поділіться через",
Expand Down Expand Up @@ -1262,8 +1262,6 @@ export default {
"pages.administration.school.index.authSystems.alias": "Псевдонім",
"pages.administration.school.index.authSystems.confirmDeleteText":
"Ви дійсно хочете видалити наступну систему автентифікації?",
"pages.administration.school.index.authSystems.copyLink":
"копіювати посилання",
"pages.administration.school.index.authSystems.delete": "Видалити {system}",
"pages.administration.school.index.authSystems.deleteAuthSystem":
"Видалити автентифікацію",
Expand Down Expand Up @@ -1953,7 +1951,6 @@ export default {
"ui-confirmation-dialog.ask-delete":
"{type}{title} буде видалена. Ви впевнені, що хочете видалити?",
"ui-confirmation-dialog.ask-cancel-form": "Відкинути зміни?",
"ui-layout.topbar.pageShare.copyLink": "Скопіювати посилання",
"ui-layout.topbar.pageShare.printQRCode": "Роздрукуйте QR-код",
"util-validators-invalid-url": "Esta URL no es válida.",
"utils.adminFilter.class.title": "Клас(-и)",
Expand Down
5 changes: 4 additions & 1 deletion src/modules/feature/board/card/CardHost.vue
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,10 @@
v-if="hasDeletePermission && !isEditMode"
@click="onStartEditMode"
/>
<KebabMenuActionShareLink @click="onCopyShareLink" />
<KebabMenuActionShareLink
:scope="BoardMenuScope.CARD"
@click="onCopyShareLink"
/>
<KebabMenuActionDelete
v-if="hasDeletePermission"
:name="card.title"
Expand Down
2 changes: 1 addition & 1 deletion src/modules/ui/kebab-menu/KebabMenuActionShareLink.unit.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ describe("BoardMenuActionShareLink", () => {
it("should show a generic share text", async () => {
const { wrapper } = setup(BoardMenuScope.BOARD);

expect(wrapper.text()).toBe("common.actions.share");
expect(wrapper.text()).toBe("common.actions.shareLink");
});
});
});
2 changes: 1 addition & 1 deletion src/modules/ui/kebab-menu/KebabMenuActionShareLink.vue
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ const actionNameTranslationKeyMap: Partial<
};
const actionName = computed(() => {
return actionNameTranslationKeyMap[props.scope] ?? "common.actions.share";
return actionNameTranslationKeyMap[props.scope] ?? "common.actions.shareLink";
});
</script>
6 changes: 3 additions & 3 deletions src/modules/ui/layout/topbar/PageShare.vue
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,16 @@
data-testid="qr-code-copy"
@click="onCopy"
>
{{ $t("ui-layout.topbar.pageShare.copyLink") }}
{{ $t("common.actions.shareLink") }}
</VBtn>
</div>
</div>
</template>

<script setup lang="ts">
import { ComponentPublicInstance, ref } from "vue";
import { mdiPrinter, mdiContentCopy } from "@icons/material";
import { mdiContentCopy, mdiPrinter } from "@icons/material";
import { QRCode } from "@ui-qr-code";
import { ComponentPublicInstance, ref } from "vue";
const props = defineProps({
url: {
Expand Down

0 comments on commit 782aa34

Please sign in to comment.