From be2825c3cc27f9787d8cdf5b3baf32d39eef924e Mon Sep 17 00:00:00 2001 From: Artem Tarasov Date: Wed, 26 May 2021 16:34:49 +0300 Subject: [PATCH 1/2] Web: fixed syntax in OperationsPanel.json --- .../ASC.Files/Client/public/locales/de/OperationsPanel.json | 2 +- .../ASC.Files/Client/public/locales/en/OperationsPanel.json | 2 +- .../ASC.Files/Client/public/locales/ru/OperationsPanel.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/products/ASC.Files/Client/public/locales/de/OperationsPanel.json b/products/ASC.Files/Client/public/locales/de/OperationsPanel.json index 828c087d46..00c8783a4c 100644 --- a/products/ASC.Files/Client/public/locales/de/OperationsPanel.json +++ b/products/ASC.Files/Client/public/locales/de/OperationsPanel.json @@ -1,3 +1,3 @@ { - "MoveToFolderMessage": "Ordner können nicht in Unterordner verschoben werden", + "MoveToFolderMessage": "Ordner können nicht in Unterordner verschoben werden" } \ No newline at end of file diff --git a/products/ASC.Files/Client/public/locales/en/OperationsPanel.json b/products/ASC.Files/Client/public/locales/en/OperationsPanel.json index fa1176dab0..d7e31d9194 100644 --- a/products/ASC.Files/Client/public/locales/en/OperationsPanel.json +++ b/products/ASC.Files/Client/public/locales/en/OperationsPanel.json @@ -1,3 +1,3 @@ { - "MoveToFolderMessage": "You can\u0027t move the folder to its subfolder", + "MoveToFolderMessage": "You can\u0027t move the folder to its subfolder" } \ No newline at end of file diff --git a/products/ASC.Files/Client/public/locales/ru/OperationsPanel.json b/products/ASC.Files/Client/public/locales/ru/OperationsPanel.json index 0659bd77a4..44ecf52658 100644 --- a/products/ASC.Files/Client/public/locales/ru/OperationsPanel.json +++ b/products/ASC.Files/Client/public/locales/ru/OperationsPanel.json @@ -1,3 +1,3 @@ { - "MoveToFolderMessage": "Нельзя перенести папку в свою дочернюю папку", + "MoveToFolderMessage": "Нельзя перенести папку в свою дочернюю папку" } \ No newline at end of file From 1616b8e5e6cb2cd473d5e361d4be5cff7f6e7c66 Mon Sep 17 00:00:00 2001 From: Artem Tarasov Date: Wed, 26 May 2021 16:43:52 +0300 Subject: [PATCH 2/2] Web: deleted duplicated translation keys "PasswordRecoveryPlaceholder", "RegisterPlaceholder", instead of added key "RegistrationEmail" --- web/ASC.Web.Login/public/locales/de/Login.json | 5 ++--- web/ASC.Web.Login/public/locales/en/Login.json | 5 ++--- web/ASC.Web.Login/public/locales/fr/Login.json | 5 ++--- web/ASC.Web.Login/public/locales/it/Login.json | 5 ++--- web/ASC.Web.Login/public/locales/ru/Login.json | 5 ++--- .../src/sub-components/forgot-password-modal-dialog.js | 2 +- .../src/sub-components/register-modal-dialog.js | 2 +- 7 files changed, 12 insertions(+), 17 deletions(-) diff --git a/web/ASC.Web.Login/public/locales/de/Login.json b/web/ASC.Web.Login/public/locales/de/Login.json index 7ff65a2c5d..8005b6b4c0 100644 --- a/web/ASC.Web.Login/public/locales/de/Login.json +++ b/web/ASC.Web.Login/public/locales/de/Login.json @@ -7,10 +7,9 @@ "MessageEmailConfirmed": "Ihre E-Mail-Adresse wurde erfolgreich aktiviert.", "MessageSendPasswordRecoveryInstructionsOnEmail": "Bitte E-Mail eingeben, das Sie bei der Registrierung verwendet haben. Anleitungen zur Änderung eines Passworts werden daran gesendet.", "Or": "oder", - "PasswordRecoveryPlaceholder": "Ihr Registrierungsemail", + "RegistrationEmail": "Ihr Registrierungsemail", "PasswordRecoveryTitle": "Kennwort wiederherstellen", "Register": "Registrieren", - "RegisterPlaceholder": "Ihr Registrierungsemail", "RegisterSendButton": "Anfrage senden", "RegisterTextBodyAfterDomainsList": "Für Registrierung geben Sie Ihre E-Mail-Adresse ein und klicken Sie auf Anfrage senden. Der Aktivierungslink wird an dieser Adresse gesendet.", "RegisterTextBodyBeforeDomainsList": "Für Registrierung sollen Benutzer E-Mail-Konten hier haben:", @@ -18,4 +17,4 @@ "RegistrationEmailWatermark": "E-Mail", "Remember": "Anmeldedaten speichern", "RememberHelper": "Lebensdauer der Sitzung ist standardmäßig 20 Minuten. Wählen Sie diese Option aus, um den Wert 1 Jahr zu setzen. Für benutzerdefinierte Werte öffnen Sie Einstellungen." -} +} \ No newline at end of file diff --git a/web/ASC.Web.Login/public/locales/en/Login.json b/web/ASC.Web.Login/public/locales/en/Login.json index b6c73a577e..644475fbc4 100644 --- a/web/ASC.Web.Login/public/locales/en/Login.json +++ b/web/ASC.Web.Login/public/locales/en/Login.json @@ -7,10 +7,9 @@ "MessageEmailConfirmed": "Your email was activated successfully.", "MessageSendPasswordRecoveryInstructionsOnEmail": "Please, enter the email you used for registration. The password recovery instructions will be sent to it.", "Or": "OR", - "PasswordRecoveryPlaceholder": "Your registration email", + "RegistrationEmail": "Your registration email", "PasswordRecoveryTitle": "Password recovery", "Register": "Register", - "RegisterPlaceholder": "Your registration email", "RegisterSendButton": "Send request", "RegisterTextBodyAfterDomainsList": "To register, enter your email and click Send request. An activation link will be sent to you. ", "RegisterTextBodyBeforeDomainsList": "Registration is available to users with an email account at", @@ -18,4 +17,4 @@ "RegistrationEmailWatermark": "Email", "Remember": "Remember me", "RememberHelper": "The default session lifetime is 20 minutes. Check this option to set it to 1 year. To set your own value, go to Settings." -} +} \ No newline at end of file diff --git a/web/ASC.Web.Login/public/locales/fr/Login.json b/web/ASC.Web.Login/public/locales/fr/Login.json index 56af3d5756..d1460a59f4 100644 --- a/web/ASC.Web.Login/public/locales/fr/Login.json +++ b/web/ASC.Web.Login/public/locales/fr/Login.json @@ -7,10 +7,9 @@ "MessageEmailConfirmed": "Votre adresse e-mail est activée avec succès.", "MessageSendPasswordRecoveryInstructionsOnEmail": "S\u0027il vous plaît entrez l\u0027adresse e-mail que vous avez utilisée lors de votre inscription sur le portail. Les instructions de récupération de votre mot de passe seront envoyées à cette adresse.", "Or": "Ou", - "PasswordRecoveryPlaceholder": "Votre mail d\u0027inscription", + "RegistrationEmail": "Votre mail d\u0027inscription", "PasswordRecoveryTitle": "Récupération de mot de passe", "Register": "Inscription", - "RegisterPlaceholder": "Votre mail d\u0027inscription", "RegisterSendButton": "Envoyer une demande", "RegisterTextBodyAfterDomainsList": "Pour vous inscrire, saisissez votre adresse de courriel et cliquez sur Envoyer une demande. Vous allez recevoir un courriel à l\u0027adresse spécifiée. Veuillez indiquer l\u0027adresse de courriel à laquelle votre invitation sera envoyée :", "RegisterTextBodyBeforeDomainsList": "L\u0027inscription est disponible aux utilisateurs avec le compte de mail à ", @@ -18,4 +17,4 @@ "RegistrationEmailWatermark": "Adresse de courriel", "Remember": "Se souvenir de moi", "RememberHelper": "La durée de validité de la session par défaut est de 20 minutes. Cochez cette option pour la définir sur 1 an. Pour définir votre propre valeur, accédez aux paramètres." -} +} \ No newline at end of file diff --git a/web/ASC.Web.Login/public/locales/it/Login.json b/web/ASC.Web.Login/public/locales/it/Login.json index dc72fd1f60..6e6a46f021 100644 --- a/web/ASC.Web.Login/public/locales/it/Login.json +++ b/web/ASC.Web.Login/public/locales/it/Login.json @@ -7,10 +7,9 @@ "MessageEmailConfirmed": "Il tuo indirizzo email è stato confermato con successo.", "MessageSendPasswordRecoveryInstructionsOnEmail": "‎Inserisci l\u0027e-mail che hai usato per la registrazione. Le istruzioni per il recupero della password verranno inviate su di esso.‎", "Or": "o", - "PasswordRecoveryPlaceholder": "la tua email di registrazione", + "RegistrationEmail": "la tua email di registrazione", "PasswordRecoveryTitle": "Recupero della password", "Register": "Registra", - "RegisterPlaceholder": "la tua email di registrazione", "RegisterSendButton": "‎Invia richiesta‎", "RegisterTextBodyAfterDomainsList": "‎Per registrarsi, immettere la posta elettronica e fare clic su Invia richiesta. Ti verrà inviato un link di attivazione. ‎", "RegisterTextBodyBeforeDomainsList": "‎La registrazione è disponibile per gli utenti con un account di posta elettronica all\u0027indirizzo‎", @@ -18,4 +17,4 @@ "RegistrationEmailWatermark": "Email", "Remember": "‎Ricordati di me‎", "RememberHelper": "‎La durata predefinita della sessione è di 20 minuti. Selezionare questa opzione per impostarla su 1 anno. Per impostare il proprio valore, passare a Impostazioni.‎" -} +} \ No newline at end of file diff --git a/web/ASC.Web.Login/public/locales/ru/Login.json b/web/ASC.Web.Login/public/locales/ru/Login.json index c2914f6edb..6d467eeea3 100644 --- a/web/ASC.Web.Login/public/locales/ru/Login.json +++ b/web/ASC.Web.Login/public/locales/ru/Login.json @@ -7,10 +7,9 @@ "MessageEmailConfirmed": "Ваш email успешно активирован.", "MessageSendPasswordRecoveryInstructionsOnEmail": "Пожалуйста, введите адрес электронной почты, указанный при регистрации на портале. Инструкции для восстановления пароля будут отправлены на этот адрес электронной почты.", "Or": "ИЛИ", - "PasswordRecoveryPlaceholder": "Ваш регистрационный email", + "RegistrationEmail": "Ваш регистрационный email", "PasswordRecoveryTitle": "Восстановление пароля", "Register": "Регистрация", - "RegisterPlaceholder": "Ваш регистрационный email", "RegisterSendButton": "Отправить запрос", "RegisterTextBodyAfterDomainsList": "Чтобы зарегистрироваться, введите свой email и нажмите кнопку Отправить запрос. Сообщение со ссылкой для активации вашей учётной записи будет отправлено на указанный адрес.", "RegisterTextBodyBeforeDomainsList": "Регистрация доступна для пользователей, которые имеют почтовый ящик на", @@ -18,4 +17,4 @@ "RegistrationEmailWatermark": "Регистрационный email", "Remember": "Запомнить", "RememberHelper": "Время существования сессии по умолчанию составляет 20 минут. Отметьте эту опцию, чтобы установить значение 1 год. Чтобы задать собственное значение, перейдите в настройки." -} +} \ No newline at end of file diff --git a/web/ASC.Web.Login/src/sub-components/forgot-password-modal-dialog.js b/web/ASC.Web.Login/src/sub-components/forgot-password-modal-dialog.js index 860d2de4a8..e602d1f9dc 100644 --- a/web/ASC.Web.Login/src/sub-components/forgot-password-modal-dialog.js +++ b/web/ASC.Web.Login/src/sub-components/forgot-password-modal-dialog.js @@ -80,7 +80,7 @@ const ForgotPasswordModalDialog = (props) => { >