From b57da432bf2da83d6bd1f5dd7c8686be5b0bc422 Mon Sep 17 00:00:00 2001 From: Ilya Oleshko Date: Thu, 27 May 2021 11:50:11 +0300 Subject: [PATCH] Web: Fixed FullDublicatesTest for "CopyEmailAndPassword" translation key, key moved to Common. --- .../ASC.People/Client/public/locales/de/ProfileAction.json | 1 - .../ASC.People/Client/public/locales/en/ProfileAction.json | 1 - .../ASC.People/Client/public/locales/ru/ProfileAction.json | 1 - .../src/pages/ProfileAction/Section/Body/createUserForm.js | 2 +- public/locales/de/Common.json | 3 ++- public/locales/en/Common.json | 3 ++- public/locales/ru/Common.json | 3 ++- web/ASC.Web.Client/public/locales/de/Confirm.json | 1 - web/ASC.Web.Client/public/locales/en/Confirm.json | 1 - web/ASC.Web.Client/public/locales/ru/Confirm.json | 1 - .../components/pages/Confirm/sub-components/activateUser.js | 2 +- .../src/components/pages/Confirm/sub-components/createUser.js | 2 +- 12 files changed, 9 insertions(+), 12 deletions(-) diff --git a/products/ASC.People/Client/public/locales/de/ProfileAction.json b/products/ASC.People/Client/public/locales/de/ProfileAction.json index 8014a093c7..ca70756269 100644 --- a/products/ASC.People/Client/public/locales/de/ProfileAction.json +++ b/products/ASC.People/Client/public/locales/de/ProfileAction.json @@ -8,7 +8,6 @@ "ChangeButton": "Ändern", "ChangesSavedSuccessfully": "Änderungen wurden gespeichert", "ContactInformation": "Kontaktdaten", - "CopyEmailAndPassword": "E-Mail und Passwort kopieren", "CustomCreation": "{{user}} (Erstellung)", "EditPhoto": "Bild bearbeiten", "EditUserDialogTitle": "Profil bearbeiten", diff --git a/products/ASC.People/Client/public/locales/en/ProfileAction.json b/products/ASC.People/Client/public/locales/en/ProfileAction.json index 341ad06fc8..19618dbc7c 100644 --- a/products/ASC.People/Client/public/locales/en/ProfileAction.json +++ b/products/ASC.People/Client/public/locales/en/ProfileAction.json @@ -9,7 +9,6 @@ "ChangesSavedSuccessfully": "Changes saved successfully", "ContactInformation": "Contact information", "CopiedResourceText": "Copied", - "CopyEmailAndPassword": "Copy email and password", "CustomCreation": "{{user}} (creation)", "EditPhoto": "Edit Photo", "EditUserDialogTitle": "Edit profile", diff --git a/products/ASC.People/Client/public/locales/ru/ProfileAction.json b/products/ASC.People/Client/public/locales/ru/ProfileAction.json index ef86532f64..f5f956b2d7 100644 --- a/products/ASC.People/Client/public/locales/ru/ProfileAction.json +++ b/products/ASC.People/Client/public/locales/ru/ProfileAction.json @@ -9,7 +9,6 @@ "ChangesSavedSuccessfully": "Изменения успешно сохранены", "ContactInformation": "Контактные данные", "CopiedResourceText": "Скопировано", - "CopyEmailAndPassword": "Копировать email и пароль", "CustomCreation": "{{user}} (создание)", "EditPhoto": "Изменить фотографию", "EditUserDialogTitle": "Редактирование профиля", diff --git a/products/ASC.People/Client/src/pages/ProfileAction/Section/Body/createUserForm.js b/products/ASC.People/Client/src/pages/ProfileAction/Section/Body/createUserForm.js index 93c2100f73..84038f3489 100644 --- a/products/ASC.People/Client/src/pages/ProfileAction/Section/Body/createUserForm.js +++ b/products/ASC.People/Client/src/pages/ProfileAction/Section/Body/createUserForm.js @@ -531,7 +531,7 @@ class CreateUserForm extends React.Component { inputValue={profile.password} inputIsDisabled={isLoading || profile.passwordType === "link"} inputOnChange={this.onInputChange} - copyLinkText={t("CopyEmailAndPassword")} + copyLinkText={t("Common:CopyEmailAndPassword")} copiedResourceText={t("CopiedResourceText")} inputTabIndex={4} passwordSettings={passwordSettings} diff --git a/public/locales/de/Common.json b/public/locales/de/Common.json index d1db53c4b4..6ef8e3c28c 100644 --- a/public/locales/de/Common.json +++ b/public/locales/de/Common.json @@ -76,5 +76,6 @@ "Active": "Aktiv", "LblSelect": "Auswählen", "Version": "Version", - "SomethingWentWrong": "Ein Fehler ist aufgetreten." + "SomethingWentWrong": "Ein Fehler ist aufgetreten.", + "CopyEmailAndPassword": "E-Mail und Passwort kopieren" } diff --git a/public/locales/en/Common.json b/public/locales/en/Common.json index dc9ad9efca..f371cc354e 100644 --- a/public/locales/en/Common.json +++ b/public/locales/en/Common.json @@ -78,5 +78,6 @@ "Active": "Active", "LblSelect": "Select", "Version": "Version", - "SomethingWentWrong": "Something went wrong." + "SomethingWentWrong": "Something went wrong.", + "CopyEmailAndPassword": "Copy email and password" } diff --git a/public/locales/ru/Common.json b/public/locales/ru/Common.json index 7a318a019b..093227e9ed 100644 --- a/public/locales/ru/Common.json +++ b/public/locales/ru/Common.json @@ -78,5 +78,6 @@ "Active": "Активный", "LblSelect": "Выберите", "Version": "Версия", - "SomethingWentWrong": "Что-то пошло не так." + "SomethingWentWrong": "Что-то пошло не так.", + "CopyEmailAndPassword": "Скопировать email и пароль" } diff --git a/web/ASC.Web.Client/public/locales/de/Confirm.json b/web/ASC.Web.Client/public/locales/de/Confirm.json index 775ee8b853..59d7046eb5 100644 --- a/web/ASC.Web.Client/public/locales/de/Confirm.json +++ b/web/ASC.Web.Client/public/locales/de/Confirm.json @@ -2,7 +2,6 @@ "ChangePasswordSuccess": "Passwort wurde erfolgreich geändert", "ConfirmOwnerPortalSuccessMessage": "Der Portalbesitzer wurde erfolgreich geändert. {0} In 10 Sekunden werden Sie {1} hier {2} umgeleitet werden", "ConfirmOwnerPortalTitle": "Bitte bestätigen Sie, dass {{newOwner}} Portalbesitzer werden soll", - "CopyEmailAndPassword": "E-Mail und Passwort kopieren", "DeleteProfileBtn": "Mein Konto löschen", "DeleteProfileConfirmation": "Achtung! Dies wird Ihr Konto löschen.", "DeleteProfileConfirmationInfo": "Wenn Sie auf \u0022Mein Konto löschen\u0022 klicken, akzeptieren Sie unsere Datenschutzerklärung.", diff --git a/web/ASC.Web.Client/public/locales/en/Confirm.json b/web/ASC.Web.Client/public/locales/en/Confirm.json index 5e3d1b49d4..5387ecb621 100644 --- a/web/ASC.Web.Client/public/locales/en/Confirm.json +++ b/web/ASC.Web.Client/public/locales/en/Confirm.json @@ -2,7 +2,6 @@ "ChangePasswordSuccess": "Password has been successfully changed", "ConfirmOwnerPortalSuccessMessage": "Portal owner has been successfully changed. {0}In 10 seconds you will be redirected {1}here{2}", "ConfirmOwnerPortalTitle": "Please confirm that you want to change portal owner to {{newOwner}}", - "CopyEmailAndPassword": "Copy email and password", "DeleteProfileBtn": "Delete my account", "DeleteProfileConfirmation": "Attention! You are about to delete your account.", "DeleteProfileConfirmationInfo": "By clicking \u0022Delete my account\u0022 you agree with our Privacy policy.", diff --git a/web/ASC.Web.Client/public/locales/ru/Confirm.json b/web/ASC.Web.Client/public/locales/ru/Confirm.json index 5f01890e9b..d308373738 100644 --- a/web/ASC.Web.Client/public/locales/ru/Confirm.json +++ b/web/ASC.Web.Client/public/locales/ru/Confirm.json @@ -2,7 +2,6 @@ "ChangePasswordSuccess": "Пароль был успешно изменен", "ConfirmOwnerPortalSuccessMessage": "Portal owner has been successfully changed. {0}In 10 seconds you will be redirected {1}here{2}", "ConfirmOwnerPortalTitle": "Пожалуйста, подтвердите, что Вы хотите изменить владельца портала на {{newOwner}}", - "CopyEmailAndPassword": "Скопировать email и пароль", "EmailAndPasswordCopiedToClipboard": "Email и пароль скопированы", "FirstName": "Имя", "InviteTitle": "Вы приглашены присоединиться к этому порталу!", diff --git a/web/ASC.Web.Client/src/components/pages/Confirm/sub-components/activateUser.js b/web/ASC.Web.Client/src/components/pages/Confirm/sub-components/activateUser.js index 2927202682..0441f6e719 100644 --- a/web/ASC.Web.Client/src/components/pages/Confirm/sub-components/activateUser.js +++ b/web/ASC.Web.Client/src/components/pages/Confirm/sub-components/activateUser.js @@ -314,7 +314,7 @@ class Confirm extends React.PureComponent { onChange={this.onChangePassword} onCopyToClipboard={this.onCopyToClipboard} onValidateInput={this.validatePassword} - clipActionResource={t("CopyEmailAndPassword")} + clipActionResource={t("Common:CopyEmailAndPassword")} clipEmailResource={`${t("Common:Email")}: `} clipPasswordResource={`${t("Common:Password")}: `} tooltipPasswordTitle={`${t("Common:PasswordLimitMessage")}:`} diff --git a/web/ASC.Web.Client/src/components/pages/Confirm/sub-components/createUser.js b/web/ASC.Web.Client/src/components/pages/Confirm/sub-components/createUser.js index 23333f13fa..b74ff84fc9 100644 --- a/web/ASC.Web.Client/src/components/pages/Confirm/sub-components/createUser.js +++ b/web/ASC.Web.Client/src/components/pages/Confirm/sub-components/createUser.js @@ -493,7 +493,7 @@ class Confirm extends React.PureComponent { onChange={this.onChangePassword} onCopyToClipboard={this.onCopyToClipboard} onValidateInput={this.validatePassword} - clipActionResource={t("CopyEmailAndPassword")} + clipActionResource={t("Common:CopyEmailAndPassword")} clipEmailResource={`${t("Common:Email")}: `} clipPasswordResource={`${t("Common:Password")}: `} tooltipPasswordTitle={`${t("Common:PasswordLimitMessage")}:`}