Web: moved translationKeys "Error", "ErrorUnknownFileImageType", "FemaleSexStatus", "LDAPLbl", "Location"

2021-05-26 14:55:33 +03:00 · 2021-05-26 14:55:33 +03:00 · f87b1f78f3
commit f87b1f78f3
parent 252fef7ae3
22 changed files with 40 additions and 54 deletions
--- a/products/ASC.People/Client/public/locales/de/Profile.json
+++ b/products/ASC.People/Client/public/locales/de/Profile.json
@ -8,13 +8,8 @@
  "EditPhoto": "Bild bearbeiten",
  "EditSubscriptionsBtn": "Abonnements bearbeiten",
  "EditUserDialogTitle": "Profil bearbeiten",
-  "Error": "Fehler",
-  "ErrorUnknownFileImageType": "Unbekannter Bilddateityp",
-  "FemaleSexStatus": "Weiblich",
  "InviteAgainLbl": "Erneut einladen",
  "Language": "Sprache",
-  "LDAPLbl": "LDAP",
-  "Location": "Standort",
  "MaleSexStatus": "Männlich",
  "maxSizeFileError": "Maximale Dateigröße überschritten",
  "MessageEmailActivationInstuctionsSentOnEmail": "Die Hinweise für die Aktivierung wurden an \u003Cstrong\u003E{{ email }}\u003C/strong\u003E versandt.",
--- a/products/ASC.People/Client/public/locales/de/ProfileAction.json
+++ b/products/ASC.People/Client/public/locales/de/ProfileAction.json
@ -14,12 +14,8 @@
  "EditPhoto": "Bild bearbeiten",
  "EditUserDialogTitle": "Profil bearbeiten",
  "EmailPopupHelper": "Die Haupt-E-Mail-Adresse wird für Benachrichtigungen und Zugriffswiederherstellung benutzt. \u003C1\u003E Sie können in dieser Domain eine neue E-Mail für den Benutzer erstellen und ein Einmalkennwort für die erste Anmeldung festlegen.\u003C/1\u003E",
-  "Error": "Fehler",
-  "ErrorUnknownFileImageType": "Unbekannter Bilddateityp",
-  "FemaleSexStatus": "Weiblich",
  "FirstName": "Vorname",
  "LastName": "Familienname",
-  "Location": "Standort",
  "Mail": "E-Mail",
  "MaleSexStatus": "Männlich",
  "maxSizeFileError": "Maximale Dateigröße überschritten",
--- a/products/ASC.People/Client/public/locales/de/Reassign.json
+++ b/products/ASC.People/Client/public/locales/de/Reassign.json
@ -1,4 +1,3 @@
 {
-  "LDAPLbl": "LDAP",
  "ReassignmentData": "Neuzuweisung von Daten"
 }
--- a/products/ASC.People/Client/public/locales/de/Translations.json
+++ b/products/ASC.People/Client/public/locales/de/Translations.json
@ -14,5 +14,9 @@
  "ReassignData": "Daten erneut zuweisen",
  "SuccessChangeUserStatus": "Der Benutzerstatus war erfolgreich geändert",
  "SendInviteAgain": "Einladung erneut senden",
-  "EnableUserButton": "Aktivieren"
+  "EnableUserButton": "Aktivieren",
+  "ErrorUnknownFileImageType": "Unbekannter Bilddateityp",
+  "FemaleSexStatus": "Weiblich",
+  "LDAPLbl": "LDAP",
+  "Location": "Standort"
 }
--- a/products/ASC.People/Client/public/locales/en/Profile.json
+++ b/products/ASC.People/Client/public/locales/en/Profile.json
@ -10,13 +10,8 @@
  "EditPhoto": "Edit photo",
  "EditSubscriptionsBtn": "Edit subscriptions",
  "EditUserDialogTitle": "Edit profile",
-  "Error": "Error",
-  "ErrorUnknownFileImageType": "Unknown image file type",
-  "FemaleSexStatus": "Female",
  "InviteAgainLbl": "Invite again",
  "Language": "Language",
-  "LDAPLbl": "LDAP",
-  "Location": "Location",
  "LoginSettings": "Login settings",
  "MaleSexStatus": "Male",
  "maxSizeFileError": "Maximum file size exceeded",
--- a/products/ASC.People/Client/public/locales/en/ProfileAction.json
+++ b/products/ASC.People/Client/public/locales/en/ProfileAction.json
@ -15,12 +15,8 @@
  "EditPhoto": "Edit Photo",
  "EditUserDialogTitle": "Edit profile",
  "EmailPopupHelper": "The main email is used for notifications and restoring access. \u003C1\u003E You can create a new email on this domain for the user and set a one-time password for the first login.\u003C/1\u003E",
-  "Error": "Error",
-  "ErrorUnknownFileImageType": "Unknown image file type",
-  "FemaleSexStatus": "Female",
  "FirstName": "First Name",
  "LastName": "Last Name",
-  "Location": "Location",
  "Mail": "Mail",
  "MaleSexStatus": "Male",
  "maxSizeFileError": "Maximum file size exceeded",
--- a/products/ASC.People/Client/public/locales/en/Reassign.json
+++ b/products/ASC.People/Client/public/locales/en/Reassign.json
@ -1,4 +1,3 @@
 {
-  "LDAPLbl": "LDAP",
  "ReassignmentData": "Data reassignment"
 }
--- a/products/ASC.People/Client/public/locales/en/Translations.json
+++ b/products/ASC.People/Client/public/locales/en/Translations.json
@ -14,5 +14,9 @@
  "ReassignData": "Reassign data",
  "SuccessChangeUserStatus": "The user status was successfully changed",
  "SendInviteAgain": "Send invitation once again",
-  "EnableUserButton": "Enable"
+  "EnableUserButton": "Enable",
+  "ErrorUnknownFileImageType": "Unknown image file type",
+  "FemaleSexStatus": "Female",
+  "LDAPLbl": "LDAP",
+  "Location": "Location"
 }
--- a/products/ASC.People/Client/public/locales/ru/Profile.json
+++ b/products/ASC.People/Client/public/locales/ru/Profile.json
@ -10,13 +10,8 @@
  "EditPhoto": "Изменить фотографию",
  "EditSubscriptionsBtn": "Изменить подписки",
  "EditUserDialogTitle": "Редактировать",
-  "Error": "Ошибка",
-  "ErrorUnknownFileImageType": "Неизвестный тип файла изображения",
-  "FemaleSexStatus": "Женский",
  "InviteAgainLbl": "Активировать адрес email ещё раз",
  "Language": "Язык",
-  "LDAPLbl": "LDAP",
-  "Location": "Местоположение",
  "LoginSettings": "Вход через социальные сети",
  "MaleSexStatus": "Мужской",
  "maxSizeFileError": "Превышен максимальный размер файла",
--- a/products/ASC.People/Client/public/locales/ru/ProfileAction.json
+++ b/products/ASC.People/Client/public/locales/ru/ProfileAction.json
@ -15,12 +15,8 @@
  "EditPhoto": "Изменить фотографию",
  "EditUserDialogTitle": "Редактирование профиля",
  "EmailPopupHelper": "Основной email нужен для восстановления доступа к порталу в случае потери пароля, а также для отправки оповещений. \u003C1\u003EВы можете создать новый email на домене в качестве основного. В этом случае потребуется задать одноразовый пароль, чтобы пользователь смог войти на портал в первый раз.\u003C/1\u003E Основной email можно использовать как логин при входе на портал.",
-  "Error": "Ошибка",
-  "ErrorUnknownFileImageType": "Неизвестный тип файла изображения",
-  "FemaleSexStatus": "Женский",
  "FirstName": "Имя",
  "LastName": "Фамилия",
-  "Location": "Местоположение",
  "Mail": "Почта",
  "MaleSexStatus": "Мужской",
  "maxSizeFileError": "Превышен максимальный размер файла",
--- a/products/ASC.People/Client/public/locales/ru/Reassign.json
+++ b/products/ASC.People/Client/public/locales/ru/Reassign.json
@ -1,4 +1,3 @@
 {
-  "LDAPLbl": "LDAP",
  "ReassignmentData": "Переназначение данных"
 }
--- a/products/ASC.People/Client/public/locales/ru/Translations.json
+++ b/products/ASC.People/Client/public/locales/ru/Translations.json
@ -14,5 +14,9 @@
  "ReassignData": "Передать данные",
  "SuccessChangeUserStatus": "Статус пользователя успешно изменен",
  "SendInviteAgain": "Отправить приглашение ещё раз",
-  "EnableUserButton": "Разблокировать"
+  "EnableUserButton": "Разблокировать",
+  "ErrorUnknownFileImageType": "Неизвестный тип файла изображения",
+  "FemaleSexStatus": "Женский",
+  "LDAPLbl": "LDAP",
+  "Location": "Местоположение"
 }
--- a/products/ASC.People/Client/src/pages/Profile/Section/Body/ProfileInfo/ProfileInfo.js
+++ b/products/ASC.People/Client/src/pages/Profile/Section/Body/ProfileInfo/ProfileInfo.js
@ -231,7 +231,8 @@ class ProfileInfo extends React.PureComponent {
    const birthDayDate = new Date(birthday).toLocaleDateString(language);

    const formatedSex =
-      (sex === "male" && t("MaleSexStatus")) || t("FemaleSexStatus");
+      (sex === "male" && t("MaleSexStatus")) ||
+      t("Translations:FemaleSexStatus");

    const formatedDepartments =
      department && this.getFormattedDepartments(groups);
@ -329,7 +330,7 @@ class ProfileInfo extends React.PureComponent {
        )}
        {location && (
          <InfoItem>
-            <InfoItemLabel>{t("Location")}:</InfoItemLabel>
+            <InfoItemLabel>{t("Translations:Location")}:</InfoItemLabel>
            <InfoItemValue>{location}</InfoItemValue>
          </InfoItem>
        )}
--- a/products/ASC.People/Client/src/pages/Profile/Section/Header/index.js
+++ b/products/ASC.People/Client/src/pages/Profile/Section/Header/index.js
@ -439,7 +439,7 @@ class SectionHeaderContent extends React.PureComponent {
        />
        <Headline className="header-headline" type="content" truncate={true}>
          {profile.displayName}
-          {profile.isLDAP && ` (${t("LDAPLbl")})`}
+          {profile.isLDAP && ` (${t("Translations:LDAPLbl")})`}
        </Headline>
        {((isAdmin && !profile.isOwner) || isMe) && (
          <ContextMenuButton
@ -463,9 +463,9 @@ class SectionHeaderContent extends React.PureComponent {
          headerLabel={t("Common:EditAvatar")}
          selectNewPhotoLabel={t("Translations:selectNewPhotoLabel")}
          orDropFileHereLabel={t("orDropFileHereLabel")}
-          unknownTypeError={t("ErrorUnknownFileImageType")}
+          unknownTypeError={t("Translations:ErrorUnknownFileImageType")}
          maxSizeFileError={t("maxSizeFileError")}
-          unknownError={t("Error")}
+          unknownError={t("Common:Error")}
          saveButtonLabel={t("Common:SaveButton")}
        />

--- a/products/ASC.People/Client/src/pages/ProfileAction/Section/Body/avatarEditorPage.js
+++ b/products/ASC.People/Client/src/pages/ProfileAction/Section/Body/avatarEditorPage.js
@ -296,9 +296,9 @@ class AvatarEditorPage extends React.PureComponent {
          headerLabel={t("EditPhoto")}
          selectNewPhotoLabel={t("Translations:selectNewPhotoLabel")}
          orDropFileHereLabel={t("orDropFileHereLabel")}
-          unknownTypeError={t("ErrorUnknownFileImageType")}
+          unknownTypeError={t("Translations:ErrorUnknownFileImageType")}
          maxSizeFileError={t("maxSizeFileError")}
-          unknownError={t("Error")}
+          unknownError={t("Common:Error")}
          saveButtonLabel={
            this.state.isLoading ? t("UpdatingProcess") : t("Common:SaveButton")
          }
--- a/products/ASC.People/Client/src/pages/ProfileAction/Section/Body/createAvatarEditorPage.js
+++ b/products/ASC.People/Client/src/pages/ProfileAction/Section/Body/createAvatarEditorPage.js
@ -259,9 +259,9 @@ class CreateAvatarEditorPage extends React.PureComponent {
          headerLabel={t("EditPhoto")}
          selectNewPhotoLabel={t("Translations:selectNewPhotoLabel")}
          orDropFileHereLabel={t("orDropFileHereLabel")}
-          unknownTypeError={t("ErrorUnknownFileImageType")}
+          unknownTypeError={t("Translations:ErrorUnknownFileImageType")}
          maxSizeFileError={t("maxSizeFileError")}
-          unknownError={t("Error")}
+          unknownError={t("Common:Error")}
          saveButtonLabel={
            this.state.isLoading ? t("UpdatingProcess") : t("Common:SaveButton")
          }
--- a/products/ASC.People/Client/src/pages/ProfileAction/Section/Body/createUserForm.js
+++ b/products/ASC.People/Client/src/pages/ProfileAction/Section/Body/createUserForm.js
@ -459,9 +459,9 @@ class CreateUserForm extends React.Component {
              headerLabel={t("AddPhoto")}
              selectNewPhotoLabel={t("Translations:selectNewPhotoLabel")}
              orDropFileHereLabel={t("orDropFileHereLabel")}
-              unknownTypeError={t("ErrorUnknownFileImageType")}
+              unknownTypeError={t("Translations:ErrorUnknownFileImageType")}
              maxSizeFileError={t("maxSizeFileError")}
-              unknownError={t("Error")}
+              unknownError={t("Common:Error")}
              saveButtonLabel={t("Common:SaveButton")}
            />
          </AvatarContainer>
@ -554,7 +554,7 @@ class CreateUserForm extends React.Component {
              radioValue={profile.sex}
              radioOptions={[
                { value: "male", label: t("MaleSexStatus") },
-                { value: "female", label: t("FemaleSexStatus") },
+                { value: "female", label: t("Translations:FemaleSexStatus") },
              ]}
              radioIsDisabled={isLoading}
              radioOnChange={this.onInputChange}
@ -574,7 +574,7 @@ class CreateUserForm extends React.Component {
              }
            />
            <TextField
-              labelText={`${t("Location")}:`}
+              labelText={`${t("Translations:Location")}:`}
              inputName="location"
              inputValue={profile.location}
              inputIsDisabled={isLoading}
--- a/products/ASC.People/Client/src/pages/ProfileAction/Section/Body/updateUserForm.js
+++ b/products/ASC.People/Client/src/pages/ProfileAction/Section/Body/updateUserForm.js
@ -665,9 +665,9 @@ class UpdateUserForm extends React.Component {
              headerLabel={t("EditPhoto")}
              selectNewPhotoLabel={t("Translations:selectNewPhotoLabel")}
              orDropFileHereLabel={t("orDropFileHereLabel")}
-              unknownTypeError={t("ErrorUnknownFileImageType")}
+              unknownTypeError={t("Translations:ErrorUnknownFileImageType")}
              maxSizeFileError={t("maxSizeFileError")}
-              unknownError={t("Error")}
+              unknownError={t("Common:Error")}
              saveButtonLabel={
                this.state.isLoading
                  ? t("UpdatingProcess")
@ -769,7 +769,7 @@ class UpdateUserForm extends React.Component {
              radioValue={profile.sex}
              radioOptions={[
                { value: "male", label: t("MaleSexStatus") },
-                { value: "female", label: t("FemaleSexStatus") },
+                { value: "female", label: t("Translations:FemaleSexStatus") },
              ]}
              radioIsDisabled={isLoading}
              radioOnChange={this.onInputChange}
@ -804,7 +804,7 @@ class UpdateUserForm extends React.Component {
              }
            />
            <TextField
-              labelText={`${t("Location")}:`}
+              labelText={`${t("Translations:Location")}:`}
              inputName="location"
              inputValue={profile.location}
              inputIsDisabled={isLoading}
--- a/products/ASC.People/Client/src/pages/Reassign/Section/Header/index.js
+++ b/products/ASC.People/Client/src/pages/Reassign/Section/Header/index.js
@ -49,7 +49,7 @@ const SectionHeaderContent = (props) => {
      </div>
      <Headline type="content" truncate={true} style={textStyle}>
        {/* {profile.displayName}
-        {profile.isLDAP && ` (${t('LDAPLbl')})`}
+        {profile.isLDAP && ` (${t('Translations:LDAPLbl')})`}
        -  */}
        {t("ReassignmentData")}
      </Headline>
--- a/public/locales/de/Common.json
+++ b/public/locales/de/Common.json
@ -61,5 +61,6 @@
  "Profile": "Profil",
  "ClearButton": "Filter zurücksetzen",
  "CommunityProduct": "Community",
-  "EmptyFieldError": "Leeres Feld"
+  "EmptyFieldError": "Leeres Feld",
+  "Error": "Fehler"
 }
--- a/public/locales/en/Common.json
+++ b/public/locales/en/Common.json
@ -62,5 +62,6 @@
  "Profile": "Profile",
  "ClearButton": "Reset filter",
  "CommunityProduct": "Community",
-  "EmptyFieldError": "Empty field"
+  "EmptyFieldError": "Empty field",
+  "Error": "Error"
 }
--- a/public/locales/ru/Common.json
+++ b/public/locales/ru/Common.json
@ -62,5 +62,6 @@
  "Profile": "Профиль",
  "ClearButton": "Сбросить фильтр",
  "CommunityProduct": "Сообщество",
-  "EmptyFieldError": "Пустое поле"
+  "EmptyFieldError": "Пустое поле",
+  "Error": "Ошибка"
 }