From f8a7439675450d5324f3a6364fda5f402faa2297 Mon Sep 17 00:00:00 2001 From: Matt Gibson Date: Mon, 21 Jun 2021 19:27:27 -0400 Subject: [PATCH] Redefine cipher "share" to "move to organization" (#1039) * Redefine cipher "share" to "move to organization" * Bump jslib Co-authored-by: = <=> --- jslib | 2 +- src/app/services/event.service.ts | 4 +- .../emergency-access-view.component.html | 2 +- .../exposed-passwords-report.component.html | 2 +- .../inactive-two-factor-report.component.html | 2 +- .../reused-passwords-report.component.html | 2 +- .../unsecured-websites-report.component.html | 2 +- .../weak-passwords-report.component.html | 2 +- src/app/vault/bulk-actions.component.html | 4 +- src/app/vault/bulk-share.component.html | 10 ++-- src/app/vault/bulk-share.component.ts | 3 +- src/app/vault/ciphers.component.html | 6 +-- src/app/vault/share.component.html | 4 +- src/locales/en/messages.json | 51 +++++++++++++------ 14 files changed, 58 insertions(+), 38 deletions(-) diff --git a/jslib b/jslib index 1f83c3c1ba..f568c87289 160000 --- a/jslib +++ b/jslib @@ -1 +1 @@ -Subproject commit 1f83c3c1ba14d2cdbc319ac060a08cc7c0911b5c +Subproject commit f568c872898c86b3cf8b5a99f8b5b377cb5b49e7 diff --git a/src/app/services/event.service.ts b/src/app/services/event.service.ts index 991ec9c8e7..2ee4fc103c 100644 --- a/src/app/services/event.service.ts +++ b/src/app/services/event.service.ts @@ -101,8 +101,8 @@ export class EventService { humanReadableMsg = this.i18nService.t('deletedAttachmentForItem', this.getShortId(ev.cipherId)); break; case EventType.Cipher_Shared: - msg = this.i18nService.t('sharedItemId', this.formatCipherId(ev, options)); - humanReadableMsg = this.i18nService.t('sharedItemId', this.getShortId(ev.cipherId)); + msg = this.i18nService.t('movedItemIdToOrg', this.formatCipherId(ev, options)); + humanReadableMsg = this.i18nService.t('movedItemIdToOrg', this.getShortId(ev.cipherId)); break; case EventType.Cipher_ClientViewed: msg = this.i18nService.t('viewedItemId', this.formatCipherId(ev, options)); diff --git a/src/app/settings/emergency-access-view.component.html b/src/app/settings/emergency-access-view.component.html index bdb421754c..360b65bb5f 100644 --- a/src/app/settings/emergency-access-view.component.html +++ b/src/app/settings/emergency-access-view.component.html @@ -12,7 +12,7 @@ {{c.name}} - + {{'shared' | i18n}} diff --git a/src/app/tools/exposed-passwords-report.component.html b/src/app/tools/exposed-passwords-report.component.html index 43acf9a1ee..e0a788f705 100644 --- a/src/app/tools/exposed-passwords-report.component.html +++ b/src/app/tools/exposed-passwords-report.component.html @@ -28,7 +28,7 @@ {{c.name}} - + {{'shared' | i18n}} diff --git a/src/app/tools/inactive-two-factor-report.component.html b/src/app/tools/inactive-two-factor-report.component.html index a43bfc6afc..7af350c35b 100644 --- a/src/app/tools/inactive-two-factor-report.component.html +++ b/src/app/tools/inactive-two-factor-report.component.html @@ -29,7 +29,7 @@ {{c.name}} - + {{'shared' | i18n}} diff --git a/src/app/tools/reused-passwords-report.component.html b/src/app/tools/reused-passwords-report.component.html index ed527d2241..83655ab752 100644 --- a/src/app/tools/reused-passwords-report.component.html +++ b/src/app/tools/reused-passwords-report.component.html @@ -34,7 +34,7 @@ {{c.name}} - + {{'shared' | i18n}} diff --git a/src/app/tools/unsecured-websites-report.component.html b/src/app/tools/unsecured-websites-report.component.html index db177c0eec..9685621b09 100644 --- a/src/app/tools/unsecured-websites-report.component.html +++ b/src/app/tools/unsecured-websites-report.component.html @@ -29,7 +29,7 @@ {{c.name}} - + {{'shared' | i18n}} diff --git a/src/app/tools/weak-passwords-report.component.html b/src/app/tools/weak-passwords-report.component.html index 83232e4c29..31e88f8c64 100644 --- a/src/app/tools/weak-passwords-report.component.html +++ b/src/app/tools/weak-passwords-report.component.html @@ -34,7 +34,7 @@ {{c.name}} - + {{'shared' | i18n}} diff --git a/src/app/vault/bulk-actions.component.html b/src/app/vault/bulk-actions.component.html index 04e15b57e2..a977f271a2 100644 --- a/src/app/vault/bulk-actions.component.html +++ b/src/app/vault/bulk-actions.component.html @@ -9,8 +9,8 @@ {{'moveSelected' | i18n}}
-

{{'shareManyDesc' | i18n}}

-

{{'shareSelectedItemsCountDesc' | i18n: this.ciphers.length : shareableCiphers.length : nonShareableCount}} +

{{'moveManyToOrgDesc' | i18n}}

+

{{'moveSelectedItemsCountDesc' | i18n: this.ciphers.length : shareableCiphers.length : nonShareableCount}}

diff --git a/src/app/vault/bulk-share.component.ts b/src/app/vault/bulk-share.component.ts index 4697b64901..f6306c4dbf 100644 --- a/src/app/vault/bulk-share.component.ts +++ b/src/app/vault/bulk-share.component.ts @@ -71,7 +71,8 @@ export class BulkShareComponent implements OnInit { checkedCollectionIds); await this.formPromise; this.onShared.emit(); - this.toasterService.popAsync('success', null, this.i18nService.t('sharedItems')); + const orgName = this.organizations.find(o => o.id === this.organizationId)?.name ?? this.i18nService.t('organization'); + this.toasterService.popAsync('success', null, this.i18nService.t('movedItemsToOrg', orgName)); } catch { } } diff --git a/src/app/vault/ciphers.component.html b/src/app/vault/ciphers.component.html index 19efb95217..77d1744519 100644 --- a/src/app/vault/ciphers.component.html +++ b/src/app/vault/ciphers.component.html @@ -13,7 +13,7 @@ {{c.name}} - + {{'shared' | i18n}} @@ -70,8 +70,8 @@ - - {{'share' | i18n}} + + {{'moveToOrganization' | i18n}} diff --git a/src/app/vault/share.component.html b/src/app/vault/share.component.html index 16edb2e9fd..d801064018 100644 --- a/src/app/vault/share.component.html +++ b/src/app/vault/share.component.html @@ -3,7 +3,7 @@
-

{{'shareDesc' | i18n}}

+

{{'moveToOrgDesc' | i18n}}