From c40141cc4f6b0cdb57633875913a5625c845f88b Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Tue, 22 Aug 2023 18:47:33 +0100 Subject: [PATCH] Align `common_*` strings with Element X project in Localazy (#11434) --- src/AsyncWrapper.tsx | 2 +- .../security/CreateSecretStorageDialog.tsx | 2 +- src/components/structures/MatrixChat.tsx | 2 +- src/components/structures/RoomSearchView.tsx | 2 +- src/components/structures/SpaceRoomView.tsx | 4 +- src/components/structures/UserMenu.tsx | 2 +- src/components/structures/auth/SoftLogout.tsx | 2 +- .../auth/InteractiveAuthEntryComponents.tsx | 2 +- src/components/views/auth/LoginWithQRFlow.tsx | 2 +- src/components/views/auth/PassphraseField.tsx | 2 +- src/components/views/auth/PasswordLogin.tsx | 8 +-- .../views/auth/RegistrationForm.tsx | 4 +- .../views/avatars/DecoratedRoomAvatar.tsx | 2 +- .../views/context_menus/RoomContextMenu.tsx | 6 +- .../context_menus/RoomGeneralContextMenu.tsx | 2 +- .../views/context_menus/SpaceContextMenu.tsx | 2 +- .../dialogs/AddExistingToSpaceDialog.tsx | 4 +- .../dialogs/ConfirmAndWaitRedactDialog.tsx | 2 +- .../views/dialogs/ConfirmRedactDialog.tsx | 2 +- .../views/dialogs/DeactivateAccountDialog.tsx | 2 +- src/components/views/dialogs/ErrorDialog.tsx | 2 +- .../views/dialogs/FeedbackDialog.tsx | 2 +- .../views/dialogs/ForwardDialog.tsx | 4 +- .../dialogs/IntegrationsDisabledDialog.tsx | 2 +- src/components/views/dialogs/InviteDialog.tsx | 6 +- .../ManageRestrictedJoinRuleDialog.tsx | 2 +- .../views/dialogs/RoomSettingsDialog.tsx | 2 +- .../views/dialogs/SpacePreferencesDialog.tsx | 2 +- .../views/dialogs/TextInputDialog.tsx | 2 +- .../views/dialogs/UserSettingsDialog.tsx | 2 +- .../security/RestoreKeyBackupDialog.tsx | 6 +- .../dialogs/spotlight/SpotlightDialog.tsx | 6 +- src/components/views/elements/AppTile.tsx | 2 +- src/components/views/elements/Dropdown.tsx | 2 +- src/components/views/elements/ImageView.tsx | 2 +- .../views/elements/InlineSpinner.tsx | 2 +- src/components/views/elements/Pill.tsx | 2 +- src/components/views/elements/Spinner.tsx | 2 +- .../views/messages/EncryptionEvent.tsx | 4 +- src/components/views/messages/MFileBody.tsx | 2 +- src/components/views/messages/MImageBody.tsx | 6 +- .../views/messages/ReactionsRow.tsx | 2 +- .../views/right_panel/RoomSummaryCard.tsx | 4 +- src/components/views/right_panel/UserInfo.tsx | 12 ++-- .../views/right_panel/VerificationPanel.tsx | 2 +- .../views/rooms/LiveContentSummary.tsx | 2 +- .../views/rooms/MessageComposerButtons.tsx | 2 +- src/components/views/rooms/PresenceLabel.tsx | 2 +- src/components/views/rooms/RoomList.tsx | 2 +- src/components/views/rooms/RoomPreviewBar.tsx | 2 +- .../views/rooms/RoomTileCallSummary.tsx | 2 +- .../views/settings/AddPrivilegedUsers.tsx | 4 +- .../views/settings/LayoutSwitcher.tsx | 4 +- .../views/settings/account/PhoneNumbers.tsx | 2 +- .../tabs/room/PeopleRoomSettingsTab.tsx | 2 +- .../tabs/room/RolesRoomSettingsTab.tsx | 2 +- .../tabs/user/GeneralUserSettingsTab.tsx | 2 +- .../tabs/user/SecurityUserSettingsTab.tsx | 2 +- .../tabs/user/SidebarUserSettingsTab.tsx | 2 +- .../views/spaces/QuickSettingsButton.tsx | 4 +- .../views/spaces/SpaceChildrenPicker.tsx | 2 +- src/i18n/strings/ar.json | 36 +++++----- src/i18n/strings/az.json | 14 ++-- src/i18n/strings/be.json | 8 ++- src/i18n/strings/bg.json | 44 +++++++------ src/i18n/strings/ca.json | 20 +++--- src/i18n/strings/cs.json | 58 ++++++++-------- src/i18n/strings/da.json | 16 +++-- src/i18n/strings/de_DE.json | 58 ++++++++-------- src/i18n/strings/el.json | 56 ++++++++-------- src/i18n/strings/en_EN.json | 66 ++++++++++--------- src/i18n/strings/en_US.json | 22 ++++--- src/i18n/strings/eo.json | 56 ++++++++-------- src/i18n/strings/es.json | 58 ++++++++-------- src/i18n/strings/et.json | 58 ++++++++-------- src/i18n/strings/eu.json | 40 +++++------ src/i18n/strings/fa.json | 46 ++++++------- src/i18n/strings/fi.json | 58 ++++++++-------- src/i18n/strings/fr.json | 58 ++++++++-------- src/i18n/strings/ga.json | 38 ++++++----- src/i18n/strings/gl.json | 56 ++++++++-------- src/i18n/strings/he.json | 52 ++++++++------- src/i18n/strings/hi.json | 18 ++--- src/i18n/strings/hr.json | 8 ++- src/i18n/strings/hu.json | 58 ++++++++-------- src/i18n/strings/id.json | 58 ++++++++-------- src/i18n/strings/is.json | 56 ++++++++-------- src/i18n/strings/it.json | 58 ++++++++-------- src/i18n/strings/ja.json | 58 ++++++++-------- src/i18n/strings/jbo.json | 14 ++-- src/i18n/strings/ka.json | 6 +- src/i18n/strings/kab.json | 42 ++++++------ src/i18n/strings/ko.json | 36 +++++----- src/i18n/strings/lo.json | 56 ++++++++-------- src/i18n/strings/lt.json | 52 ++++++++------- src/i18n/strings/lv.json | 42 ++++++------ src/i18n/strings/ml.json | 10 +-- src/i18n/strings/nb_NO.json | 52 ++++++++------- src/i18n/strings/nl.json | 56 ++++++++-------- src/i18n/strings/nn.json | 30 +++++---- src/i18n/strings/oc.json | 24 +++---- src/i18n/strings/pl.json | 58 ++++++++-------- src/i18n/strings/pt.json | 24 +++---- src/i18n/strings/pt_BR.json | 56 ++++++++-------- src/i18n/strings/ro.json | 8 ++- src/i18n/strings/ru.json | 58 ++++++++-------- src/i18n/strings/sk.json | 58 ++++++++-------- src/i18n/strings/sl.json | 6 +- src/i18n/strings/sq.json | 58 ++++++++-------- src/i18n/strings/sr.json | 34 +++++----- src/i18n/strings/sr_Latn.json | 6 +- src/i18n/strings/sv.json | 58 ++++++++-------- src/i18n/strings/ta.json | 10 +-- src/i18n/strings/te.json | 10 +-- src/i18n/strings/th.json | 24 +++---- src/i18n/strings/tr.json | 42 ++++++------ src/i18n/strings/tzm.json | 12 ++-- src/i18n/strings/uk.json | 58 ++++++++-------- src/i18n/strings/vi.json | 58 ++++++++-------- src/i18n/strings/vls.json | 24 +++---- src/i18n/strings/zh_Hans.json | 56 ++++++++-------- src/i18n/strings/zh_Hant.json | 58 ++++++++-------- src/settings/Settings.tsx | 2 +- src/stores/spaces/index.ts | 2 +- src/toasts/IncomingCallToast.tsx | 2 +- .../components/structures/TabbedView-test.tsx | 11 ++-- .../context_menus/RoomContextMenu-test.tsx | 13 ++++ .../views/messages/MImageBody-test.tsx | 26 ++++++++ .../views/rooms/PresenceLabel-test.tsx | 35 ++++++++++ .../spaces/AddExistingToSpaceDialog-test.tsx | 23 ++++++- .../views/spaces/QuickSettingsButton-test.tsx | 5 ++ .../QuickSettingsButton-test.tsx.snap | 15 +++++ 132 files changed, 1491 insertions(+), 1247 deletions(-) create mode 100644 test/components/views/rooms/PresenceLabel-test.tsx create mode 100644 test/components/views/spaces/__snapshots__/QuickSettingsButton-test.tsx.snap diff --git a/src/AsyncWrapper.tsx b/src/AsyncWrapper.tsx index 1173ca3fd0..c0162ad95d 100644 --- a/src/AsyncWrapper.tsx +++ b/src/AsyncWrapper.tsx @@ -77,7 +77,7 @@ export default class AsyncWrapper extends React.Component { return ; } else if (this.state.error) { return ( - + {_t("Unable to load! Check your network connectivity and try again.")} { this.subTitleStatus = ""; if (state === SyncState.Error) { - this.subTitleStatus += `[${_t("Offline")}] `; + this.subTitleStatus += `[${_t("common|offline")}] `; } if (numUnreadRooms > 0) { this.subTitleStatus += `[${numUnreadRooms}]`; diff --git a/src/components/structures/RoomSearchView.tsx b/src/components/structures/RoomSearchView.tsx index 1b3d865194..a0726566df 100644 --- a/src/components/structures/RoomSearchView.tsx +++ b/src/components/structures/RoomSearchView.tsx @@ -199,7 +199,7 @@ export const RoomSearchView = forwardRef( if (!results?.results?.length) { ret.push(
  • -

    {_t("No results")}

    +

    {_t("common|no_results")}

  • , ); } else { diff --git a/src/components/structures/SpaceRoomView.tsx b/src/components/structures/SpaceRoomView.tsx index cf47e53047..ef586e24da 100644 --- a/src/components/structures/SpaceRoomView.tsx +++ b/src/components/structures/SpaceRoomView.tsx @@ -253,7 +253,7 @@ const SpaceLanding: React.FC<{ space: Room }> = ({ space }) => { onClick={() => { showSpaceSettings(space); }} - title={_t("Settings")} + title={_t("common|settings")} /> ); } @@ -313,7 +313,7 @@ const SpaceSetupFirstRooms: React.FC<{ key={name} name={name} type="text" - label={_t("Room name")} + label={_t("common|room_name")} placeholder={placeholders[i]} value={roomNames[i]} onChange={(ev: React.ChangeEvent) => setRoomName(i, ev.target.value)} diff --git a/src/components/structures/UserMenu.tsx b/src/components/structures/UserMenu.tsx index 3a4d89faa6..e66a443318 100644 --- a/src/components/structures/UserMenu.tsx +++ b/src/components/structures/UserMenu.tsx @@ -378,7 +378,7 @@ export default class UserMenu extends React.Component { {homeButton} this.onSettingsOpen(e)} /> {feedbackButton} diff --git a/src/components/structures/auth/SoftLogout.tsx b/src/components/structures/auth/SoftLogout.tsx index 20838f2e62..27078fbca3 100644 --- a/src/components/structures/auth/SoftLogout.tsx +++ b/src/components/structures/auth/SoftLogout.tsx @@ -234,7 +234,7 @@ export default class SoftLogout extends React.Component { {error} { buttons = this.cancelButton(); break; case Phase.Verifying: - title = _t("Success"); + title = _t("common|success"); centreTitle = true; main = this.simpleSpinner(_t("Completing set up of your new device")); break; diff --git a/src/components/views/auth/PassphraseField.tsx b/src/components/views/auth/PassphraseField.tsx index 0fdfeb3d67..4efd06e4e4 100644 --- a/src/components/views/auth/PassphraseField.tsx +++ b/src/components/views/auth/PassphraseField.tsx @@ -45,7 +45,7 @@ interface IProps extends Omit { class PassphraseField extends PureComponent { public static defaultProps = { - label: _td("Password"), + label: _td("common|password"), labelEnterPassword: _td("Enter password"), labelStrongPassword: _td("Nice, strong password!"), labelAllowedButUnsafe: _td("Password is allowed, but unsafe"), diff --git a/src/components/views/auth/PasswordLogin.tsx b/src/components/views/auth/PasswordLogin.tsx index bbab2242f4..8666964fff 100644 --- a/src/components/views/auth/PasswordLogin.tsx +++ b/src/components/views/auth/PasswordLogin.tsx @@ -308,8 +308,8 @@ export default class PasswordLogin extends React.PureComponent { autoComplete="username" key="username_input" type="text" - label={_t("Username")} - placeholder={_t("Username").toLocaleLowerCase()} + label={_t("common|username")} + placeholder={_t("common|username").toLocaleLowerCase()} value={this.props.username} onChange={this.onUsernameChanged} onBlur={this.onUsernameBlur} @@ -404,7 +404,7 @@ export default class PasswordLogin extends React.PureComponent { disabled={this.props.busy} >