From ffd4439113530499b7cb9386763c170d7a8d62c5 Mon Sep 17 00:00:00 2001
From: Maciej Zieniuk <mzieniuk@bitwarden.com>
Date: Thu, 3 Apr 2025 16:12:17 +0100
Subject: [PATCH] organization name placement change in the remove password
 component

---
 apps/browser/src/_locales/en/messages.json            | 11 ++++-------
 .../key-connector/remove-password.component.html      |  4 +++-
 apps/cli/src/locales/en/messages.json                 |  2 +-
 .../key-connector/remove-password.component.html      |  4 +++-
 apps/desktop/src/locales/en/messages.json             | 11 ++++-------
 .../key-connector/remove-password.component.html      |  4 +++-
 apps/web/src/locales/en/messages.json                 |  8 +-------
 7 files changed, 19 insertions(+), 25 deletions(-)

diff --git a/apps/browser/src/_locales/en/messages.json b/apps/browser/src/_locales/en/messages.json
index 0d80c7e10b9..0a1d419fc0c 100644
--- a/apps/browser/src/_locales/en/messages.json
+++ b/apps/browser/src/_locales/en/messages.json
@@ -2966,13 +2966,10 @@
     "message": "No unique identifier found."
   },
   "removeMasterPasswordForOrganizationUserKeyConnector": {
-    "message": "$ORGANIZATION$ has updated its member decryption options. You no longer need a password when logging into Bitwarden. Please confirm the domain below with your organization administrator.",
-    "placeholders": {
-      "organization": {
-        "content": "$1",
-        "example": "My Org Name"
-      }
-    }
+    "message": "A master password is no longer required for members of the following organization. Please confirm the domain below with your organization administrator."
+  },
+  "organizationName": {
+    "message": "Organization name"
   },
   "keyConnectorDomain": {
     "message": "Key Connector domain"
diff --git a/apps/browser/src/key-management/key-connector/remove-password.component.html b/apps/browser/src/key-management/key-connector/remove-password.component.html
index 75746b03dca..56baf0de2a0 100644
--- a/apps/browser/src/key-management/key-connector/remove-password.component.html
+++ b/apps/browser/src/key-management/key-connector/remove-password.component.html
@@ -15,7 +15,9 @@
     </div>
     <div class="box-content" *ngIf="!loading">
       <div class="box-content-row" appBoxRow>
-        <p>{{ "removeMasterPasswordForOrganizationUserKeyConnector" | i18n: organization.name }}</p>
+        <p>{{ "removeMasterPasswordForOrganizationUserKeyConnector" | i18n }}</p>
+        <p class="tw-mb-0">{{ "organizationName" | i18n }}:</p>
+        <p class="tw-text-muted tw-mb-6">{{ organization.name }}</p>
         <p class="tw-mb-0">{{ "keyConnectorDomain" | i18n }}:</p>
         <p class="tw-text-muted tw-mb-6">{{ organization.keyConnectorUrl }}</p>
       </div>
diff --git a/apps/cli/src/locales/en/messages.json b/apps/cli/src/locales/en/messages.json
index a6af0a12c32..9149e25c5bc 100644
--- a/apps/cli/src/locales/en/messages.json
+++ b/apps/cli/src/locales/en/messages.json
@@ -189,7 +189,7 @@
     "message": "An organization you are a member of is using Key Connector. In order to access the vault, you must opt-in to Key Connector now via the web vault. You have been logged out."
   },
   "removeMasterPasswordForOrganizationUserKeyConnector": {
-    "message": "$ORGANIZATION$ has updated its member decryption options. You no longer need a password when logging into Bitwarden. Please confirm the domain below with your organization administrator. Key Connector domain: $KEYCONNECTORDOMAIN$",
+    "message": "A master password is no longer required for members of the following organization. Please confirm the domain below with your organization administrator. Organization name: $ORGANIZATION$. Key Connector domain: $KEYCONNECTORDOMAIN$",
     "placeholders": {
       "organization": {
         "content": "$1",
diff --git a/apps/desktop/src/key-management/key-connector/remove-password.component.html b/apps/desktop/src/key-management/key-connector/remove-password.component.html
index 883b314fb00..5276e00c531 100644
--- a/apps/desktop/src/key-management/key-connector/remove-password.component.html
+++ b/apps/desktop/src/key-management/key-connector/remove-password.component.html
@@ -1,7 +1,9 @@
 <div id="remove-password-page" *ngIf="!loading">
   <div class="content">
     <h1>{{ "removeMasterPassword" | i18n }}</h1>
-    <p>{{ "removeMasterPasswordForOrganizationUserKeyConnector" | i18n: organization.name }}</p>
+    <p>{{ "removeMasterPasswordForOrganizationUserKeyConnector" | i18n }}</p>
+    <p class="tw-mb-0">{{ "organizationName" | i18n }}:</p>
+    <p class="tw-text-muted tw-mb-6">{{ organization.name }}</p>
     <p class="tw-mb-0">{{ "keyConnectorDomain" | i18n }}:</p>
     <p class="tw-text-muted tw-mb-6">{{ organization.keyConnectorUrl }}</p>
     <div class="buttons">
diff --git a/apps/desktop/src/locales/en/messages.json b/apps/desktop/src/locales/en/messages.json
index de5e7a81700..d9a841c3bab 100644
--- a/apps/desktop/src/locales/en/messages.json
+++ b/apps/desktop/src/locales/en/messages.json
@@ -2422,13 +2422,10 @@
     "message": "Master password removed"
   },
   "removeMasterPasswordForOrganizationUserKeyConnector": {
-    "message": "$ORGANIZATION$ has updated its member decryption options. You no longer need a password when logging into Bitwarden. Please confirm the domain below with your organization administrator.",
-    "placeholders": {
-      "organization": {
-        "content": "$1",
-        "example": "My Org Name"
-      }
-    }
+    "message": "A master password is no longer required for members of the following organization. Please confirm the domain below with your organization administrator."
+  },
+  "organizationName": {
+    "message": "Organization name"
   },
   "keyConnectorDomain": {
     "message": "Key Connector domain"
diff --git a/apps/web/src/app/key-management/key-connector/remove-password.component.html b/apps/web/src/app/key-management/key-connector/remove-password.component.html
index 30c97744e83..aae660ce504 100644
--- a/apps/web/src/app/key-management/key-connector/remove-password.component.html
+++ b/apps/web/src/app/key-management/key-connector/remove-password.component.html
@@ -8,7 +8,9 @@
 </div>
 
 <div *ngIf="!loading">
-  <p>{{ "removeMasterPasswordForOrganizationUserKeyConnector" | i18n: organization.name }}</p>
+  <p>{{ "removeMasterPasswordForOrganizationUserKeyConnector" | i18n }}</p>
+  <p class="tw-mb-0">{{ "organizationName" | i18n }}:</p>
+  <p class="tw-text-muted tw-mb-6">{{ organization.name }}</p>
   <p class="tw-mb-0">{{ "keyConnectorDomain" | i18n }}:</p>
   <p class="tw-text-muted tw-mb-6">{{ organization.keyConnectorUrl }}</p>
 
diff --git a/apps/web/src/locales/en/messages.json b/apps/web/src/locales/en/messages.json
index 814c0277518..cedd3fc3596 100644
--- a/apps/web/src/locales/en/messages.json
+++ b/apps/web/src/locales/en/messages.json
@@ -6477,13 +6477,7 @@
     "message": "Invalid verification code"
   },
   "removeMasterPasswordForOrganizationUserKeyConnector": {
-    "message": "$ORGANIZATION$ has updated its member decryption options. You no longer need a password when logging into Bitwarden. Please confirm the domain below with your organization administrator.",
-    "placeholders": {
-      "organization": {
-        "content": "$1",
-        "example": "My Org Name"
-      }
-    }
+    "message": "A master password is no longer required for members of the following organization. Please confirm the domain below with your organization administrator."
   },
   "keyConnectorDomain": {
     "message": "Key Connector domain"