From aa6e3654b8d64bfc3d632e79a02f551c4023bdcf Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Wed, 23 Aug 2023 10:25:33 +0100 Subject: [PATCH] Create more `common_*` common strings (#11439) --- src/ContentMessages.ts | 2 +- src/accessibility/KeyboardShortcuts.ts | 4 +- src/components/structures/RoomSearchView.tsx | 2 +- src/components/structures/ThreadPanel.tsx | 2 +- src/components/structures/ThreadView.tsx | 2 +- src/components/structures/UserMenu.tsx | 2 +- src/components/views/beta/BetaCard.tsx | 4 +- .../views/context_menus/SpaceContextMenu.tsx | 2 +- .../views/dialogs/CreateRoomDialog.tsx | 2 +- .../views/dialogs/DevtoolsDialog.tsx | 4 +- src/components/views/dialogs/ExportDialog.tsx | 2 +- .../views/dialogs/SpacePreferencesDialog.tsx | 2 +- .../views/dialogs/UserSettingsDialog.tsx | 4 +- src/components/views/elements/AppTile.tsx | 2 +- src/components/views/elements/ImageView.tsx | 2 +- .../views/elements/ServerPicker.tsx | 8 ++- src/components/views/messages/MFileBody.tsx | 8 +-- src/components/views/messages/MImageBody.tsx | 2 +- .../views/messages/MessageActionBar.tsx | 2 +- .../right_panel/LegacyRoomHeaderButtons.tsx | 2 +- .../views/right_panel/RoomSummaryCard.tsx | 2 +- src/components/views/right_panel/UserInfo.tsx | 2 +- .../views/right_panel/WidgetCard.tsx | 2 +- .../views/rooms/MessageComposerButtons.tsx | 2 +- src/components/views/rooms/RoomList.tsx | 2 +- src/components/views/rooms/RoomSublist.tsx | 2 +- .../views/settings/JoinRuleSettings.tsx | 2 +- .../views/settings/ThemeChoicePanel.tsx | 2 +- .../settings/devices/CurrentDeviceSection.tsx | 2 +- .../views/settings/devices/DeviceDetails.tsx | 2 +- .../devices/OtherSessionsSectionHeading.tsx | 2 +- .../tabs/user/GeneralUserSettingsTab.tsx | 2 +- .../tabs/user/SidebarUserSettingsTab.tsx | 4 +- .../views/spaces/QuickSettingsButton.tsx | 2 +- .../views/spaces/QuickThemeSwitcher.tsx | 2 +- .../views/spaces/SpaceBasicSettings.tsx | 4 +- .../views/spaces/SpaceCreateMenu.tsx | 8 +-- src/components/views/spaces/SpacePanel.tsx | 4 +- src/hooks/usePermalink.ts | 4 +- src/i18n/strings/ar.json | 22 ++++----- src/i18n/strings/az.json | 17 ++++--- src/i18n/strings/be.json | 2 +- src/i18n/strings/bg.json | 37 +++++++------- src/i18n/strings/ca.json | 27 +++++----- src/i18n/strings/cs.json | 49 ++++++++++--------- src/i18n/strings/da.json | 14 +++--- src/i18n/strings/de_DE.json | 49 ++++++++++--------- src/i18n/strings/el.json | 45 ++++++++--------- src/i18n/strings/en_EN.json | 45 ++++++++--------- src/i18n/strings/en_US.json | 23 ++++----- src/i18n/strings/eo.json | 45 ++++++++--------- src/i18n/strings/es.json | 47 +++++++++--------- src/i18n/strings/et.json | 49 ++++++++++--------- src/i18n/strings/eu.json | 31 ++++++------ src/i18n/strings/fa.json | 43 ++++++++-------- src/i18n/strings/fi.json | 49 ++++++++++--------- src/i18n/strings/fr.json | 49 ++++++++++--------- src/i18n/strings/ga.json | 43 ++++++++-------- src/i18n/strings/gl.json | 47 +++++++++--------- src/i18n/strings/he.json | 43 ++++++++-------- src/i18n/strings/hi.json | 12 ++--- src/i18n/strings/hr.json | 2 +- src/i18n/strings/hu.json | 49 ++++++++++--------- src/i18n/strings/id.json | 49 ++++++++++--------- src/i18n/strings/is.json | 47 +++++++++--------- src/i18n/strings/it.json | 49 ++++++++++--------- src/i18n/strings/ja.json | 47 +++++++++--------- src/i18n/strings/jbo.json | 8 +-- src/i18n/strings/ka.json | 4 +- src/i18n/strings/kab.json | 33 +++++++------ src/i18n/strings/ko.json | 37 +++++++------- src/i18n/strings/lo.json | 45 ++++++++--------- src/i18n/strings/lt.json | 41 ++++++++-------- src/i18n/strings/lv.json | 37 +++++++------- src/i18n/strings/ml.json | 6 +-- src/i18n/strings/nb_NO.json | 45 ++++++++--------- src/i18n/strings/nl.json | 47 +++++++++--------- src/i18n/strings/nn.json | 33 +++++++------ src/i18n/strings/oc.json | 29 +++++------ src/i18n/strings/pl.json | 49 ++++++++++--------- src/i18n/strings/pt.json | 25 +++++----- src/i18n/strings/pt_BR.json | 41 ++++++++-------- src/i18n/strings/ro.json | 2 +- src/i18n/strings/ru.json | 47 +++++++++--------- src/i18n/strings/sk.json | 49 ++++++++++--------- src/i18n/strings/sl.json | 4 +- src/i18n/strings/sq.json | 49 ++++++++++--------- src/i18n/strings/sr.json | 35 ++++++------- src/i18n/strings/sr_Latn.json | 4 +- src/i18n/strings/sv.json | 49 ++++++++++--------- src/i18n/strings/ta.json | 6 +-- src/i18n/strings/te.json | 8 +-- src/i18n/strings/th.json | 23 ++++----- src/i18n/strings/tr.json | 35 ++++++------- src/i18n/strings/tzm.json | 15 +++--- src/i18n/strings/uk.json | 49 ++++++++++--------- src/i18n/strings/vi.json | 49 ++++++++++--------- src/i18n/strings/vls.json | 27 +++++----- src/i18n/strings/zh_Hans.json | 47 +++++++++--------- src/i18n/strings/zh_Hant.json | 49 ++++++++++--------- .../right-panel/RightPanelStorePhases.ts | 2 +- src/stores/spaces/index.ts | 4 +- src/theme.ts | 4 +- src/toasts/ServerLimitToast.tsx | 2 +- src/utils/FileUtils.ts | 2 +- .../components/structures/TabbedView-test.tsx | 6 +-- 106 files changed, 1121 insertions(+), 1069 deletions(-) diff --git a/src/ContentMessages.ts b/src/ContentMessages.ts index 14208e0d9e..a5a5ffb137 100644 --- a/src/ContentMessages.ts +++ b/src/ContentMessages.ts @@ -536,7 +536,7 @@ export default class ContentMessages { replyToEvent: MatrixEvent | undefined, promBefore?: Promise, ): Promise { - const fileName = file.name || _t("Attachment"); + const fileName = file.name || _t("common|attachment"); const content: Omit & { info: Partial } = { body: fileName, info: { diff --git a/src/accessibility/KeyboardShortcuts.ts b/src/accessibility/KeyboardShortcuts.ts index 67a835f546..dbb7337220 100644 --- a/src/accessibility/KeyboardShortcuts.ts +++ b/src/accessibility/KeyboardShortcuts.ts @@ -233,7 +233,7 @@ export const CATEGORIES: Record = { settingNames: [KeyBindingAction.ToggleMicInCall, KeyBindingAction.ToggleWebcamInCall], }, [CategoryName.ROOM]: { - categoryLabel: _td("Room"), + categoryLabel: _td("common|room"), settingNames: [ KeyBindingAction.SearchInRoom, KeyBindingAction.UploadFile, @@ -303,7 +303,7 @@ export const CATEGORIES: Record = { ], }, [CategoryName.LABS]: { - categoryLabel: _td("Labs"), + categoryLabel: _td("common|labs"), settingNames: [KeyBindingAction.ToggleHiddenEventVisibility], }, }; diff --git a/src/components/structures/RoomSearchView.tsx b/src/components/structures/RoomSearchView.tsx index a0726566df..bb701ed575 100644 --- a/src/components/structures/RoomSearchView.tsx +++ b/src/components/structures/RoomSearchView.tsx @@ -256,7 +256,7 @@ export const RoomSearchView = forwardRef( ret.push(
  • - {_t("Room")}: {room.name} + {_t("common|room")}: {room.name}

  • , ); diff --git a/src/components/structures/ThreadPanel.tsx b/src/components/structures/ThreadPanel.tsx index c4267d7063..8386b5e182 100644 --- a/src/components/structures/ThreadPanel.tsx +++ b/src/components/structures/ThreadPanel.tsx @@ -112,7 +112,7 @@ export const ThreadPanelHeader: React.FC<{ return (
    - {_t("Threads")} + {_t("common|threads")} {!empty && ( <> diff --git a/src/components/structures/ThreadView.tsx b/src/components/structures/ThreadView.tsx index 811d5bd544..a345faf9f7 100644 --- a/src/components/structures/ThreadView.tsx +++ b/src/components/structures/ThreadView.tsx @@ -369,7 +369,7 @@ export default class ThreadView extends React.Component { return (
    - {_t("Thread")} + {_t("common|thread")}
    diff --git a/src/components/structures/UserMenu.tsx b/src/components/structures/UserMenu.tsx index e66a443318..b67d23ffa0 100644 --- a/src/components/structures/UserMenu.tsx +++ b/src/components/structures/UserMenu.tsx @@ -327,7 +327,7 @@ export default class UserMenu extends React.Component { homeButton = ( ); diff --git a/src/components/views/beta/BetaCard.tsx b/src/components/views/beta/BetaCard.tsx index 7fbf68b290..a604aee1ec 100644 --- a/src/components/views/beta/BetaCard.tsx +++ b/src/components/views/beta/BetaCard.tsx @@ -61,12 +61,12 @@ export const BetaPill: React.FC = ({ } onClick={onClick} > - {_t("Beta")} + {_t("common|beta")} ); } - return {_t("Beta")}; + return {_t("common|beta")}; }; const BetaCard: React.FC = ({ title: titleOverride, featureId }) => { diff --git a/src/components/views/context_menus/SpaceContextMenu.tsx b/src/components/views/context_menus/SpaceContextMenu.tsx index 2e002ab1e6..4cc6fb7d76 100644 --- a/src/components/views/context_menus/SpaceContextMenu.tsx +++ b/src/components/views/context_menus/SpaceContextMenu.tsx @@ -179,7 +179,7 @@ const SpaceContextMenu: React.FC = ({ space, hideHeader, onFinished, ... )} diff --git a/src/components/views/dialogs/CreateRoomDialog.tsx b/src/components/views/dialogs/CreateRoomDialog.tsx index 41cea443ef..276f1195b3 100644 --- a/src/components/views/dialogs/CreateRoomDialog.tsx +++ b/src/components/views/dialogs/CreateRoomDialog.tsx @@ -359,7 +359,7 @@ export default class CreateRoomDialog extends React.Component {
    = { - [Category.Room]: _td("Room"), + [Category.Room]: _td("common|room"), [Category.Other]: _td("Other"), }; @@ -106,7 +106,7 @@ const DevtoolsDialog: React.FC = ({ roomId, threadRootId, onFinished })
    ))}
    -

    {_t("Options")}

    +

    {_t("common|options")}

    diff --git a/src/components/views/dialogs/ExportDialog.tsx b/src/components/views/dialogs/ExportDialog.tsx index b1bb05eb22..53e692c3e3 100644 --- a/src/components/views/dialogs/ExportDialog.tsx +++ b/src/components/views/dialogs/ExportDialog.tsx @@ -304,7 +304,7 @@ const ExportDialog: React.FC = ({ room, onFinished }) => { // Display cancel warning return ( = ({ space, initialTabId, onFinis const tabs: NonEmptyArray> = [ new Tab( SpacePreferenceTab.Appearance, - _td("Appearance"), + _td("common|appearance"), "mx_SpacePreferencesDialog_appearanceIcon", , ), diff --git a/src/components/views/dialogs/UserSettingsDialog.tsx b/src/components/views/dialogs/UserSettingsDialog.tsx index 00c38cf340..e35bed4839 100644 --- a/src/components/views/dialogs/UserSettingsDialog.tsx +++ b/src/components/views/dialogs/UserSettingsDialog.tsx @@ -86,7 +86,7 @@ export default class UserSettingsDialog extends React.Component tabs.push( new Tab( UserTab.Appearance, - _td("Appearance"), + _td("common|appearance"), "mx_UserSettingsDialog_appearanceIcon", , "UserSettingsAppearance", @@ -168,7 +168,7 @@ export default class UserSettingsDialog extends React.Component tabs.push( new Tab( UserTab.Labs, - _td("Labs"), + _td("common|labs"), "mx_UserSettingsDialog_labsIcon", , "UserSettingsLabs", diff --git a/src/components/views/elements/AppTile.tsx b/src/components/views/elements/AppTile.tsx index 78030dc785..7b02dedef1 100644 --- a/src/components/views/elements/AppTile.tsx +++ b/src/components/views/elements/AppTile.tsx @@ -785,7 +785,7 @@ export default class AppTile extends React.Component { {this.state.hasContextMenuOptions && ( { contextMenuButton = ( = ({ title, dialogTitle, serverConfig, onSe return (
    -

    {title || _t("Homeserver")}

    +

    {title || _t("common|homeserver")}

    {!disableCustomUrls ? ( - + ) : null} {serverName} diff --git a/src/components/views/messages/MFileBody.tsx b/src/components/views/messages/MFileBody.tsx index e69b777ae5..f430b0f9bd 100644 --- a/src/components/views/messages/MFileBody.tsx +++ b/src/components/views/messages/MFileBody.tsx @@ -133,7 +133,7 @@ export default class MFileBody extends React.Component { } private get fileName(): string { - return this.content.body && this.content.body.length > 0 ? this.content.body : _t("Attachment"); + return this.content.body && this.content.body.length > 0 ? this.content.body : _t("common|attachment"); } private get linkText(): string { @@ -205,9 +205,9 @@ export default class MFileBody extends React.Component { placeholder = ( - + - {presentableTextForFile(this.content, _t("Attachment"), true, true)} + {presentableTextForFile(this.content, _t("common|attachment"), true, true)} @@ -284,7 +284,7 @@ export default class MFileBody extends React.Component { */}