From 29ab521f54ab29eead312d053dd724da04fba1b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Herbinet?= <33763786+Jerome-Herbinet@users.noreply.github.com> Date: Mon, 19 Aug 2024 14:04:22 +0200 Subject: [PATCH 1/3] Replace "transfer" notion with "convert" notion MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jérôme Herbinet <33763786+Jerome-Herbinet@users.noreply.github.com> Replace "transfer" notion with "convert" notion Signed-off-by: Jérôme Herbinet <33763786+Jerome-Herbinet@users.noreply.github.com> Replace "transfer" notion with "convert" notion Signed-off-by: Jérôme Herbinet <33763786+Jerome-Herbinet@users.noreply.github.com> Update TransferGuestDialog.vue Signed-off-by: Jérôme Herbinet <33763786+Jerome-Herbinet@users.noreply.github.com> Update lib/Notifications/Notifier.php Signed-off-by: Jérôme Herbinet <33763786+Jerome-Herbinet@users.noreply.github.com> Update lib/Notifications/Notifier.php Signed-off-by: Jérôme Herbinet <33763786+Jerome-Herbinet@users.noreply.github.com> Update src/components/TransferGuestDialog.vue Signed-off-by: Jérôme Herbinet <33763786+Jerome-Herbinet@users.noreply.github.com> Update src/components/TransferGuestDialog.vue Signed-off-by: Jérôme Herbinet <33763786+Jerome-Herbinet@users.noreply.github.com> Co-Authored-By: Pytal <24800714+Pytal@users.noreply.github.com> --- lib/Notifications/Notifier.php | 8 ++++---- src/components/TransferGuestDialog.vue | 10 +++++----- src/users.ts | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/lib/Notifications/Notifier.php b/lib/Notifications/Notifier.php index 0765cf79..a729d10d 100644 --- a/lib/Notifications/Notifier.php +++ b/lib/Notifications/Notifier.php @@ -76,9 +76,9 @@ public function prepare(INotification $notification, string $languageCode): INot case 'guest-transfer-fail': $params = $notification->getSubjectParameters(); $notification - ->setRichSubject($l->t('Guest transfer failed')) + ->setRichSubject($l->t('Guest conversion failed')) ->setRichMessage( - $l->t('Failed to transfer guest {guest} to {user}'), + $l->t('Failed to convert guest {guest} account to {user} account'), $this->getRichMessageParams($params['source'], $params['target']), ); return $notification; @@ -86,9 +86,9 @@ public function prepare(INotification $notification, string $languageCode): INot case 'guest-transfer-done': $params = $notification->getSubjectParameters(); $notification - ->setRichSubject($l->t('Guest transfer done')) + ->setRichSubject($l->t('Guest conversion done')) ->setRichMessage( - $l->t('Transfer of guest {guest} to {user} completed'), + $l->t('Conversion of guest {guest} account to {user} account completed'), $this->getRichMessageParams($params['source'], $params['target']), ); return $notification; diff --git a/src/components/TransferGuestDialog.vue b/src/components/TransferGuestDialog.vue index 91345414..e3c25bad 100644 --- a/src/components/TransferGuestDialog.vue +++ b/src/components/TransferGuestDialog.vue @@ -4,7 +4,7 @@ --> @@ -68,14 +68,14 @@ import { logger } from '../services/logger.ts' const generateMessage = ({ source, target, status }: { source: string, target: string, status: 'waiting' | 'started' }) => { const matchStatus = { - waiting: t('guests', 'Transfer of guest {strongStart}{guest}{strongEnd} to {strongStart}{user}{strongEnd} is pending', { + waiting: t('guests', 'Conversion of guest {strongStart}{guest}{strongEnd} account to {strongStart}{user}{strongEnd} regular account is pending', { guest: source, user: target, strongStart: '', strongEnd: '', }, undefined, { escape: false, sanitize: false }), - started: t('guests', 'Transfer of guest {strongStart}{guest}{strongEnd} to {strongStart}{user}{strongEnd} has started', { + started: t('guests', 'Conversion of guest {strongStart}{guest}{strongEnd} account to {strongStart}{user}{strongEnd} regular account has started', { guest: source, user: target, strongStart: '', diff --git a/src/users.ts b/src/users.ts index d0c413ff..1d6470a4 100644 --- a/src/users.ts +++ b/src/users.ts @@ -18,7 +18,7 @@ const transferGuest = (_event: MouseEvent, user: User): void => { if (userId === null) { return } - showSuccess(t('guests', 'Guest will be transferred to "{userId}" soon', { userId })) + showSuccess(t('guests', 'Guest will be converted to a regular account with the account name "{userId}" soon', { userId })) } spawnDialog(TransferGuestDialog, { @@ -32,7 +32,7 @@ const enabled = (user: User) => user?.backend === 'Guests' const registerAction = () => { window.OCA.Settings.UserList.registerAction( SvgAccountArrowRight, - t('guests', 'Transfer guest to full account'), + t('guests', 'Convert guest to regular account'), transferGuest, enabled, ) From b1d6f52cd3cf33d04308980efb6ffc78eb293b8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Herbinet?= <33763786+Jerome-Herbinet@users.noreply.github.com> Date: Tue, 27 Aug 2024 16:00:47 +0200 Subject: [PATCH 2/3] Update Notifier.php MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jérôme Herbinet <33763786+Jerome-Herbinet@users.noreply.github.com> --- lib/Notifications/Notifier.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Notifications/Notifier.php b/lib/Notifications/Notifier.php index a729d10d..cf3f7bc5 100644 --- a/lib/Notifications/Notifier.php +++ b/lib/Notifications/Notifier.php @@ -88,7 +88,7 @@ public function prepare(INotification $notification, string $languageCode): INot $notification ->setRichSubject($l->t('Guest conversion done')) ->setRichMessage( - $l->t('Conversion of guest {guest} account to {user} account completed'), + $l->t('Conversion of guest {guest} to {user} completed'), $this->getRichMessageParams($params['source'], $params['target']), ); return $notification; From 793b2441347726db6a24254445f28f84755ef4c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Herbinet?= <33763786+Jerome-Herbinet@users.noreply.github.com> Date: Tue, 27 Aug 2024 16:02:07 +0200 Subject: [PATCH 3/3] Update TransferGuestDialog.vue MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jérôme Herbinet <33763786+Jerome-Herbinet@users.noreply.github.com> --- src/components/TransferGuestDialog.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/TransferGuestDialog.vue b/src/components/TransferGuestDialog.vue index e3c25bad..ed1b188a 100644 --- a/src/components/TransferGuestDialog.vue +++ b/src/components/TransferGuestDialog.vue @@ -68,14 +68,14 @@ import { logger } from '../services/logger.ts' const generateMessage = ({ source, target, status }: { source: string, target: string, status: 'waiting' | 'started' }) => { const matchStatus = { - waiting: t('guests', 'Conversion of guest {strongStart}{guest}{strongEnd} account to {strongStart}{user}{strongEnd} regular account is pending', { + waiting: t('guests', 'Conversion of guest {strongStart}{guest}{strongEnd} to {strongStart}{user}{strongEnd} is pending', { guest: source, user: target, strongStart: '', strongEnd: '', }, undefined, { escape: false, sanitize: false }), - started: t('guests', 'Conversion of guest {strongStart}{guest}{strongEnd} account to {strongStart}{user}{strongEnd} regular account has started', { + started: t('guests', 'Conversion of guest {strongStart}{guest}{strongEnd} to {strongStart}{user}{strongEnd} has started', { guest: source, user: target, strongStart: '',