Create more action_* common strings

matrix-org · Aug 23, 2023 · 1c2a115 · 1c2a115
1 parent df4a221
commit 1c2a115
Show file tree

Hide file tree

Showing 160 changed files with 1,306 additions and 1,325 deletions.
diff --git a/cypress/e2e/timeline/timeline.spec.ts b/cypress/e2e/timeline/timeline.spec.ts
@@ -197,10 +197,10 @@ describe("Timeline", () => {
 
             cy.get(".mx_GenericEventListSummary").within(() => {
                 // Click "expand" link button
-                cy.findByRole("button", { name: "expand" }).click();
+                cy.findByRole("button", { name: "Expand" }).click();
 
                 // Assert that the "expand" link button worked
-                cy.findByRole("button", { name: "collapse" }).should("exist");
+                cy.findByRole("button", { name: "Collapse" }).should("exist");
             });
 
             cy.get(".mx_MainSplit").percySnapshotElement("Expanded GELS on IRC layout", { percyCSS });
@@ -224,10 +224,10 @@ describe("Timeline", () => {
 
             cy.get(".mx_GenericEventListSummary").within(() => {
                 // Click "expand" link button
-                cy.findByRole("button", { name: "expand" }).click();
+                cy.findByRole("button", { name: "Expand" }).click();
 
                 // Assert that the "expand" link button worked
-                cy.findByRole("button", { name: "collapse" }).should("exist");
+                cy.findByRole("button", { name: "Collapse" }).should("exist");
             });
 
             cy.get(".mx_MainSplit").percySnapshotElement("Expanded GELS on modern layout", { percyCSS });
@@ -247,10 +247,10 @@ describe("Timeline", () => {
 
             cy.get(".mx_GenericEventListSummary").within(() => {
                 // Click "expand" link button
-                cy.findByRole("button", { name: "expand" }).click();
+                cy.findByRole("button", { name: "Expand" }).click();
 
                 // Assert that the "expand" link button worked
-                cy.findByRole("button", { name: "collapse" }).should("exist");
+                cy.findByRole("button", { name: "Collapse" }).should("exist");
             });
 
             // Make sure spacer is not visible on bubble layout
@@ -270,10 +270,10 @@ describe("Timeline", () => {
                     .realHover()
                     .findByRole("toolbar", { name: "Message Actions" })
                     .should("be.visible");
-                cy.findByRole("button", { name: "collapse" }).click();
+                cy.findByRole("button", { name: "Collapse" }).click();
 
                 // Assert that "collapse" link button worked
-                cy.findByRole("button", { name: "expand" }).should("exist");
+                cy.findByRole("button", { name: "Expand" }).should("exist");
             });
 
             // Save snapshot of collapsed generic event list summary on bubble layout
@@ -292,7 +292,7 @@ describe("Timeline", () => {
             });
 
             // Click "expand" link button
-            cy.get(".mx_GenericEventListSummary").findByRole("button", { name: "expand" }).click();
+            cy.get(".mx_GenericEventListSummary").findByRole("button", { name: "Expand" }).click();
 
             // Check the event line has margin instead of inset property
             // cf. _EventTile.pcss
@@ -388,7 +388,7 @@ describe("Timeline", () => {
 
             // 2. Alignment of expanded GELS and messages
             // Click "expand" link button
-            cy.get(".mx_GenericEventListSummary").findByRole("button", { name: "expand" }).click();
+            cy.get(".mx_GenericEventListSummary").findByRole("button", { name: "Expand" }).click();
             // Check inline start spacing of info line on expanded GELS
             cy.get(".mx_EventTile[data-layout=irc].mx_EventTile_info:first-of-type .mx_EventTile_line")
                 // See: _EventTile.pcss

diff --git a/res/css/views/elements/_GenericEventListSummary.pcss b/res/css/views/elements/_GenericEventListSummary.pcss
@@ -31,6 +31,11 @@ limitations under the License.
         }
     }
 
+    .mx_GenericEventListSummary_toggle {
+        // We reuse a title cased translation
+        text-transform: lowercase;
+    }
+
     &[data-layout="irc"],
     &[data-layout="group"] {
         .mx_GenericEventListSummary_toggle {

diff --git a/src/AddThreepid.ts b/src/AddThreepid.ts
@@ -226,7 +226,7 @@ export default class AddThreepid {
                         [SSOAuthEntry.PHASE_POSTAUTH]: {
                             title: _t("Confirm adding email"),
                             body: _t("Click the button below to confirm adding this email address."),
-                            continueText: _t("Confirm"),
+                            continueText: _t("action|confirm"),
                             continueKind: "primary",
                         },
                     };
@@ -329,7 +329,7 @@ export default class AddThreepid {
                     [SSOAuthEntry.PHASE_POSTAUTH]: {
                         title: _t("Confirm adding phone number"),
                         body: _t("Click the button below to confirm adding this phone number."),
-                        continueText: _t("Confirm"),
+                        continueText: _t("action|confirm"),
                         continueKind: "primary",
                     },
                 };

diff --git a/src/AsyncWrapper.tsx b/src/AsyncWrapper.tsx
@@ -80,7 +80,7 @@ export default class AsyncWrapper extends React.Component<IProps, IState> {
                 <BaseDialog onFinished={this.props.onFinished} title={_t("common|error")}>
                     {_t("Unable to load! Check your network connectivity and try again.")}
                     <DialogButtons
-                        primaryButton={_t("Dismiss")}
+                        primaryButton={_t("action|dismiss")}
                         onPrimaryButtonClick={this.onWrapperCancelClick}
                         hasCancel={false}
                     />

diff --git a/src/IdentityAuthClient.tsx b/src/IdentityAuthClient.tsx
@@ -151,7 +151,7 @@ export default class IdentityAuthClient {
                         <p>{_t("Only continue if you trust the owner of the server.")}</p>
                     </div>
                 ),
-                button: _t("Trust"),
+                button: _t("action|trust"),
             });
             const [confirmed] = await finished;
             if (confirmed) {

diff --git a/src/MatrixClientPeg.ts b/src/MatrixClientPeg.ts
@@ -212,7 +212,7 @@ class MatrixClientPegClass implements IMatrixClientPeg {
                 description: _t(
                     "This may be caused by having the app open in multiple tabs or due to clearing browser data.",
                 ),
-                button: _t("Reload"),
+                button: _t("action|reload"),
             });
             const [reload] = await finished;
             if (!reload) return;

diff --git a/src/SecurityManager.ts b/src/SecurityManager.ts
@@ -76,7 +76,7 @@ async function confirmToDismiss(): Promise<boolean> {
         description: _t("Are you sure you want to cancel entering passphrase?"),
         danger: false,
         button: _t("Go Back"),
-        cancelButton: _t("Cancel"),
+        cancelButton: _t("action|cancel"),
     }).finished;
     return !sure;
 }

diff --git a/src/async-components/views/dialogs/security/CreateSecretStorageDialog.tsx b/src/async-components/views/dialogs/security/CreateSecretStorageDialog.tsx
@@ -309,7 +309,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent<IProp
                 [SSOAuthEntry.PHASE_POSTAUTH]: {
                     title: _t("Confirm encryption setup"),
                     body: _t("Click the button below to confirm setting up encryption."),
-                    continueText: _t("Confirm"),
+                    continueText: _t("action|confirm"),
                     continueKind: "primary",
                 },
             };
@@ -621,7 +621,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent<IProp
                     primaryDisabled={!!this.state.canUploadKeysWithPasswordOnly && !this.state.accountPassword}
                 >
                     <button type="button" className="danger" onClick={this.onCancelClick}>
-                        {_t("Skip")}
+                        {_t("action|skip")}
                     </button>
                 </DialogButtons>
             </form>
@@ -660,7 +660,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent<IProp
                     disabled={!this.state.passPhraseValid}
                 >
                     <button type="button" onClick={this.onCancelClick} className="danger">
-                        {_t("Cancel")}
+                        {_t("action|cancel")}
                     </button>
                 </DialogButtons>
             </form>
@@ -718,7 +718,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent<IProp
                     disabled={this.state.passPhrase !== this.state.passPhraseConfirm}
                 >
                     <button type="button" onClick={this.onCancelClick} className="danger">
-                        {_t("Skip")}
+                        {_t("action|skip")}
                     </button>
                 </DialogButtons>
             </form>
@@ -837,7 +837,7 @@ export default class CreateSecretStorageDialog extends React.PureComponent<IProp
                     hasCancel={false}
                 >
                     <button type="button" className="danger" onClick={this.onCancel}>
-                        {_t("Cancel")}
+                        {_t("action|cancel")}
                     </button>
                 </DialogButtons>
             </div>

diff --git a/src/async-components/views/dialogs/security/ExportE2eKeysDialog.tsx b/src/async-components/views/dialogs/security/ExportE2eKeysDialog.tsx
@@ -220,7 +220,7 @@ export default class ExportE2eKeysDialog extends React.Component<IProps, IState>
                             disabled={disableForm}
                         />
                         <button onClick={this.onCancelClick} disabled={disableForm}>
-                            {_t("Cancel")}
+                            {_t("action|cancel")}
                         </button>
                     </div>
                 </form>

diff --git a/src/async-components/views/dialogs/security/ImportE2eKeysDialog.tsx b/src/async-components/views/dialogs/security/ImportE2eKeysDialog.tsx
@@ -191,7 +191,7 @@ export default class ImportE2eKeysDialog extends React.Component<IProps, IState>
                             disabled={!this.state.enableSubmit || disableForm}
                         />
                         <button onClick={this.onCancelClick} disabled={disableForm}>
-                            {_t("Cancel")}
+                            {_t("action|cancel")}
                         </button>
                     </div>
                 </form>

diff --git a/src/components/structures/MatrixChat.tsx b/src/components/structures/MatrixChat.tsx
@@ -1597,7 +1597,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
                         </div>
                     ),
                     button: _t("Review terms and conditions"),
-                    cancelButton: _t("Dismiss"),
+                    cancelButton: _t("action|dismiss"),
                     onFinished: (confirmed) => {
                         if (confirmed) {
                             const wnd = window.open(consentUri, "_blank")!;
@@ -2098,7 +2098,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
                         <Spinner />
                         <div className="mx_MatrixChat_splashButtons">
                             <AccessibleButton kind="link_inline" onClick={this.onLogoutClick}>
-                                {_t("Logout")}
+                                {_t("action|logout")}
                             </AccessibleButton>
                         </div>
                     </div>

diff --git a/src/components/structures/SpaceHierarchy.tsx b/src/components/structures/SpaceHierarchy.tsx
@@ -163,13 +163,13 @@ const Tile: React.FC<ITileProps> = ({
                 onFocus={onFocus}
                 tabIndex={isActive ? 0 : -1}
             >
-                {_t("View")}
+                {_t("action|view")}
             </AccessibleButton>
         );
     } else {
         button = (
             <AccessibleButton onClick={onJoinClick} kind="primary" onFocus={onFocus} tabIndex={isActive ? 0 : -1}>
-                {_t("Join")}
+                {_t("action|join")}
             </AccessibleButton>
         );
     }

diff --git a/src/components/views/auth/InteractiveAuthEntryComponents.tsx b/src/components/views/auth/InteractiveAuthEntryComponents.tsx
@@ -396,7 +396,7 @@ export class TermsAuthEntry extends React.Component<ITermsAuthEntryProps, ITerms
                     onClick={this.trySubmit}
                     disabled={!allChecked}
                 >
-                    {_t("Accept")}
+                    {_t("action|accept")}
                 </AccessibleButton>
             );
         }
@@ -868,7 +868,7 @@ export class SSOAuthEntry extends React.Component<ISSOAuthEntryProps, ISSOAuthEn
                 onClick={this.props.onCancel ?? null}
                 kind={this.props.continueKind ? this.props.continueKind + "_outline" : "primary_outline"}
             >
-                {_t("Cancel")}
+                {_t("action|cancel")}
             </AccessibleButton>
         );
         if (this.state.phase === SSOAuthEntry.PHASE_PREAUTH) {
@@ -880,7 +880,7 @@ export class SSOAuthEntry extends React.Component<ISSOAuthEntryProps, ISSOAuthEn
         } else {
             continueButton = (
                 <AccessibleButton onClick={this.onConfirmClick} kind={this.props.continueKind || "primary"}>
-                    {this.props.continueText || _t("Confirm")}
+                    {this.props.continueText || _t("action|confirm")}
                 </AccessibleButton>
             );
         }

diff --git a/src/components/views/auth/LoginWithQRFlow.tsx b/src/components/views/auth/LoginWithQRFlow.tsx
@@ -54,7 +54,7 @@ export default class LoginWithQRFlow extends React.Component<IProps> {
 
     private cancelButton = (): JSX.Element => (
         <AccessibleButton data-testid="cancel-button" kind="primary_outline" onClick={this.handleClick(Click.Cancel)}>
-            {_t("Cancel")}
+            {_t("action|cancel")}
         </AccessibleButton>
     );
 
@@ -156,7 +156,7 @@ export default class LoginWithQRFlow extends React.Component<IProps> {
                             kind="primary_outline"
                             onClick={this.handleClick(Click.Decline)}
                         >
-                            {_t("Cancel")}
+                            {_t("action|cancel")}
                         </AccessibleButton>
                         <AccessibleButton
                             data-testid="approve-login-button"

diff --git a/src/components/views/beacon/BeaconViewDialog.tsx b/src/components/views/beacon/BeaconViewDialog.tsx
@@ -166,7 +166,7 @@ const BeaconViewDialog: React.FC<IProps> = ({ initialFocusedBeacon, roomId, matr
                             onClick={onFinished}
                             data-testid="beacon-view-dialog-fallback-close"
                         >
-                            {_t("Close")}
+                            {_t("action|close")}
                         </AccessibleButton>
                     </MapFallback>
                 )}

diff --git a/src/components/views/beacon/OwnBeaconStatus.tsx b/src/components/views/beacon/OwnBeaconStatus.tsx
@@ -65,7 +65,7 @@ const OwnBeaconStatus: React.FC<Props & HTMLProps<HTMLDivElement>> = ({ beacon,
                     className="mx_OwnBeaconStatus_button mx_OwnBeaconStatus_destructiveButton"
                     disabled={stoppingInProgress}
                 >
-                    {_t("Stop")}
+                    {_t("action|stop")}
                 </AccessibleButton>
             )}
             {hasLocationPublishError && (

diff --git a/src/components/views/beacon/RoomCallBanner.tsx b/src/components/views/beacon/RoomCallBanner.tsx
@@ -77,7 +77,7 @@ const RoomCallBannerInner: React.FC<RoomCallBannerProps> = ({ roomId, call }) =>
             </div>
 
             <AccessibleButton onClick={connect} kind="primary" element="button" disabled={false}>
-                {_t("Join")}
+                {_t("action|join")}
             </AccessibleButton>
         </div>
     );

diff --git a/src/components/views/beacon/RoomLiveShareWarning.tsx b/src/components/views/beacon/RoomLiveShareWarning.tsx
@@ -111,7 +111,7 @@ const RoomLiveShareWarningInner: React.FC<RoomLiveShareWarningInnerProps> = ({ l
                 element="button"
                 disabled={stoppingInProgress}
             >
-                {hasError ? _t("action|retry") : _t("Stop")}
+                {hasError ? _t("action|retry") : _t("action|stop")}
             </AccessibleButton>
             {hasLocationPublishError && (
                 <AccessibleButton

diff --git a/src/components/views/context_menus/MessageContextMenu.tsx b/src/components/views/context_menus/MessageContextMenu.tsx
@@ -499,7 +499,7 @@ export default class MessageContextMenu extends React.Component<IProps, IState>
                 <IconizedContextMenuOption
                     iconClassName="mx_MessageContextMenu_iconPermalink"
                     onClick={this.onShareClick}
-                    label={_t("Share")}
+                    label={_t("action|share")}
                     element="a"
                     {
                         // XXX: Typescript signature for AccessibleButton doesn't work properly for non-inputs like `a`

diff --git a/src/components/views/dialogs/AskInviteAnywayDialog.tsx b/src/components/views/dialogs/AskInviteAnywayDialog.tsx
@@ -87,7 +87,7 @@ export default function AskInviteAnywayDialog({
             </div>
 
             <div className="mx_Dialog_buttons">
-                <button onClick={onGiveUpClicked}>{_t("Close")}</button>
+                <button onClick={onGiveUpClicked}>{_t("action|close")}</button>
                 <button onClick={onInviteNeverWarnClicked}>
                     {inviteNeverWarnLabel ?? _t("Invite anyway and never warn me again")}
                 </button>

diff --git a/src/components/views/dialogs/ChangelogDialog.tsx b/src/components/views/dialogs/ChangelogDialog.tsx
@@ -119,7 +119,7 @@ export default class ChangelogDialog extends React.Component<IProps, State> {
             <QuestionDialog
                 title={_t("Changelog")}
                 description={content}
-                button={_t("Update")}
+                button={_t("action|update")}
                 onFinished={this.props.onFinished}
             />
         );

diff --git a/src/components/views/dialogs/ConfirmWipeDeviceDialog.tsx b/src/components/views/dialogs/ConfirmWipeDeviceDialog.tsx
@@ -52,7 +52,7 @@ export default class ConfirmWipeDeviceDialog extends React.Component<IProps> {
                     primaryButton={_t("Clear all data")}
                     onPrimaryButtonClick={this.onConfirm}
                     primaryButtonClass="danger"
-                    cancelButton={_t("Cancel")}
+                    cancelButton={_t("action|cancel")}
                     onCancel={this.onDecline}
                 />
             </BaseDialog>

diff --git a/src/components/views/dialogs/CreateSubspaceDialog.tsx b/src/components/views/dialogs/CreateSubspaceDialog.tsx
@@ -188,7 +188,7 @@ const CreateSubspaceDialog: React.FC<IProps> = ({ space, onAddExistingSpaceClick
                     </div>
 
                     <AccessibleButton kind="primary_outline" disabled={busy} onClick={() => onFinished(false)}>
-                        {_t("Cancel")}
+                        {_t("action|cancel")}
                     </AccessibleButton>
                     <AccessibleButton kind="primary" disabled={busy} onClick={onCreateSubspaceClick}>
                         {busy ? _t("Adding…") : _t("Add")}

diff --git a/src/components/views/dialogs/ExportDialog.tsx b/src/components/views/dialogs/ExportDialog.tsx
@@ -312,7 +312,7 @@ const ExportDialog: React.FC<IProps> = ({ room, onFinished }) => {
             >
                 <p>{_t("Are you sure you want to stop exporting your data? If you do, you'll need to start over.")}</p>
                 <DialogButtons
-                    primaryButton={_t("Stop")}
+                    primaryButton={_t("action|stop")}
                     primaryButtonClass="danger"
                     hasCancel={true}
                     cancelButton={_t("action|continue")}
@@ -402,7 +402,7 @@ const ExportDialog: React.FC<IProps> = ({ room, onFinished }) => {
                         <Spinner w={24} h={24} />
                         <p>{exportProgressText}</p>
                         <DialogButtons
-                            primaryButton={_t("Cancel")}
+                            primaryButton={_t("action|cancel")}
                             primaryButtonClass="danger"
                             hasCancel={false}
                             onPrimaryButtonClick={onCancel}

diff --git a/src/components/views/dialogs/GenericFeatureFeedbackDialog.tsx b/src/components/views/dialogs/GenericFeatureFeedbackDialog.tsx
@@ -53,7 +53,7 @@ const GenericFeatureFeedbackDialog: React.FC<IProps> = ({
         Modal.createDialog(InfoDialog, {
             title,
             description: _t("Feedback sent! Thanks, we appreciate it!"),
-            button: _t("Close"),
+            button: _t("action|close"),
             hasCloseButton: false,
             fixedWidth: false,
         });