Fix instances of double translation and guard translation calls using typescript by t3chguy · Pull Request #11443 · matrix-org/matrix-react-sdk

t3chguy · 2023-08-21T15:19:39Z

Recommendation is to pretend the first commit doesn't exist as it is a necessary awful to ensure typescript uses the literal string type vs string - without this we cannot have types protect us from accidentally breaking keys during the great re-keying in the move to Localazy.

Here's what your changelog entry will look like:

🐛 Bug Fixes

Fix instances of double translation and guard translation calls using typescript (#11443).

src/@types/common.ts

src/languageHandler.tsx

src/accessibility/KeyboardShortcutUtils.ts

richvdh · 2023-08-21T17:59:22Z

src/components/views/elements/DesktopCapturerSourcePicker.tsx

+            this.getTab("screen", _td("Share entire screen")),
+            this.getTab("window", _td("Application window")),


is this a bug fix?

Yes this fixes the string being passed through the translation function twice (once here and once by TabbedView)

src/components/views/settings/tabs/room/RolesRoomSettingsTab.tsx

src/@types/common.ts

src/languageHandler.tsx

richvdh · 2023-08-22T11:47:55Z

test/utils/AutoDiscoveryUtils-test.tsx

            expect(logger.error).toHaveBeenCalled();
        });

+        it("throws an error when homeserver config has fail error and recognised error string", () => {


have these AutoDiscovery tests made it into the wrong PR? I'm struggling to see how they are related.

I was trying to make the coverage happier, but the bar is too high

Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>

… t3chguy/localazy-i18n-types # Conflicts: # test/languageHandler-test.ts # test/languageHandler-test.tsx

@kerryarchibald

Changes in [1.11.40](https://github.com/vector-im/element-web/releases/tag/v1.11.40) (2023-08-29) ================================================================================================= ## ✨ Features * Hide account deactivation for externally managed accounts ([\#11445](matrix-org/matrix-react-sdk#11445)). Fixes #26022. Contributed by @kerryarchibald. * OIDC: Redirect to delegated auth provider when signing out ([\#11432](matrix-org/matrix-react-sdk#11432)). Fixes #26000. Contributed by @kerryarchibald. * Disable 3pid fields in settings when `m.3pid_changes` capability is disabled ([\#11430](matrix-org/matrix-react-sdk#11430)). Fixes #25995. Contributed by @kerryarchibald. * OIDC: disable multi session signout for OIDC-aware servers in session manager ([\#11431](matrix-org/matrix-react-sdk#11431)). Contributed by @kerryarchibald. * Implement updated open dialog method of the Module API ([\#11395](matrix-org/matrix-react-sdk#11395)). Contributed by @dhenneke. * Polish & delabs `Exploring public spaces` feature ([\#11423](matrix-org/matrix-react-sdk#11423)). * Treat lists with a single empty item as plain text, not Markdown. ([\#6833](matrix-org/matrix-react-sdk#6833)). Fixes element-hq/element-meta#1265. * Allow managing room knocks ([\#11404](matrix-org/matrix-react-sdk#11404)). Contributed by @charlynguyen. * Pin the action buttons to the bottom of the scrollable dialogs ([\#11407](matrix-org/matrix-react-sdk#11407)). Contributed by @dhenneke. * Support Matrix 1.1 (drop legacy r0 versions) ([\#9819](matrix-org/matrix-react-sdk#9819)). ## 🐛 Bug Fixes * Fix path separator for Windows based systems ([\#25997](element-hq/element-web#25997)). * Fix instances of double translation and guard translation calls using typescript ([\#11443](matrix-org/matrix-react-sdk#11443)). * Fix export type "Current timeline" to match its behaviour to its name ([\#11426](matrix-org/matrix-react-sdk#11426)). Fixes #25988. * Fix Room Settings > Notifications file upload input being shown superfluously ([\#11415](matrix-org/matrix-react-sdk#11415)). Fixes #18392. * Simplify registration with email validation ([\#11398](matrix-org/matrix-react-sdk#11398)). Fixes #25832 #23601 and #22297. * correct home server URL ([\#11391](matrix-org/matrix-react-sdk#11391)). Fixes #25931. Contributed by @NSV1991. * Include non-matching DMs in Spotlight recent conversations when the DM's userId is part of the search API results ([\#11374](matrix-org/matrix-react-sdk#11374)). Contributed by @mgcm. * Fix useRoomMembers missing updates causing incorrect membership counts ([\#11392](matrix-org/matrix-react-sdk#11392)). Fixes #17096. * Show error when searching public rooms fails ([\#11378](matrix-org/matrix-react-sdk#11378)).

@kerryarchibald

Changes in [1.11.45](https://github.com/vector-im/element-web/releases/tag/v1.11.45) (2023-09-29) ================================================================================================= ## 🐛 Bug Fixes * Fix Emoji font on Safari 17 ([\#11673](matrix-org/matrix-react-sdk#11673)). Changes in [1.11.44](https://github.com/vector-im/element-web/releases/tag/v1.11.44) (2023-09-26) ================================================================================================= ## ✨ Features * Make video & voice call buttons pin conference widget if unpinned ([\#11576](matrix-org/matrix-react-sdk#11576)). Fixes vector-im/customer-retainer#72. * OIDC: persist refresh token ([\#11249](matrix-org/matrix-react-sdk#11249)). Contributed by @kerryarchibald. * ElementR: Cross user verification ([\#11364](matrix-org/matrix-react-sdk#11364)). Fixes #25752. Contributed by @florianduros. * Default intentional mentions ([\#11602](matrix-org/matrix-react-sdk#11602)). * Notify users about denied access on ask-to-join rooms ([\#11480](matrix-org/matrix-react-sdk#11480)). Contributed by @nurjinjafar. * Allow setting knock room directory visibility ([\#11529](matrix-org/matrix-react-sdk#11529)). Contributed by @charlynguyen. ## 🐛 Bug Fixes * Revert "Fix regression around FacePile with overflow (#11527)" ([\#11634](matrix-org/matrix-react-sdk#11634)). Fixes #26209. * Escape placeholder before injecting it into the style ([\#11607](matrix-org/matrix-react-sdk#11607)). * Move ViewUser action callback to RoomView ([\#11495](matrix-org/matrix-react-sdk#11495)). Fixes #26040. * Fix room timeline search toggling behaviour edge case ([\#11605](matrix-org/matrix-react-sdk#11605)). Fixes #26105. * Avoid rendering view-message link in RoomKnocksBar unnecessarily ([\#11598](matrix-org/matrix-react-sdk#11598)). Contributed by @charlynguyen. * Use knock rooms sync to reflect the knock state ([\#11596](matrix-org/matrix-react-sdk#11596)). Fixes #26043 and #26044. Contributed by @charlynguyen. * Fix avatar in right panel not using the correct font ([\#11593](matrix-org/matrix-react-sdk#11593)). Fixes #26061. Contributed by @MidhunSureshR. * Add waits in Spotlight Cypress tests, hoping this unflakes them ([\#11590](matrix-org/matrix-react-sdk#11590)). Fixes #26053, #26140 #26139 and #26138. Contributed by @andybalaam. * Fix vertical alignment of default avatar font ([\#11582](matrix-org/matrix-react-sdk#11582)). Fixes #26081. * Fix avatars in public room & space search being flex shrunk ([\#11580](matrix-org/matrix-react-sdk#11580)). Fixes #26133. * Fix EventTile avatars being rendered with a size of 0 instead of hidden ([\#11558](matrix-org/matrix-react-sdk#11558)). Fixes #26075. Changes in [1.11.43](https://github.com/vector-im/element-web/releases/tag/v1.11.43) (2023-09-15) ================================================================================================= (No changes - bumping the version number for an element-desktop release.) Changes in [1.11.42](https://github.com/vector-im/element-web/releases/tag/v1.11.42) (2023-09-13) ================================================================================================= ## 🐛 Bug Fixes * Update Compound to fix Firefox-specific avatar regression ([\#11604](matrix-org/matrix-react-sdk#11604)). Fixes #26155. Changes in [1.11.41](https://github.com/vector-im/element-web/releases/tag/v1.11.41) (2023-09-12) ================================================================================================= ## 🦖 Deprecations * Deprecate customisations in favour of Module API ([\#25736](element-hq/element-web#25736)). Fixes #25733. ## ✨ Features * Make SVGR icons use forward ref ([\#26082](element-hq/element-web#26082)). * Add support for rendering a custom wrapper around Element ([\#25537](element-hq/element-web#25537)). Contributed by @maheichyk. * Allow creating public knock rooms ([\#11481](matrix-org/matrix-react-sdk#11481)). Contributed by @charlynguyen. * Render custom images in reactions according to MSC4027 ([\#11087](matrix-org/matrix-react-sdk#11087)). Contributed by @sumnerevans. * Introduce room knocks bar ([\#11475](matrix-org/matrix-react-sdk#11475)). Contributed by @charlynguyen. * Room header UI updates ([\#11507](matrix-org/matrix-react-sdk#11507)). Fixes #25892. * Remove green "verified" bar for encrypted events ([\#11496](matrix-org/matrix-react-sdk#11496)). * Update member count on room summary update ([\#11488](matrix-org/matrix-react-sdk#11488)). * Support for E2EE in Element Call ([\#11492](matrix-org/matrix-react-sdk#11492)). * Allow requesting to join knock rooms via spotlight ([\#11482](matrix-org/matrix-react-sdk#11482)). Contributed by @charlynguyen. * Lock out the first tab if Element is opened in a second tab. ([\#11425](matrix-org/matrix-react-sdk#11425)). Fixes #25157. * Change avatar to use Compound implementation ([\#11448](matrix-org/matrix-react-sdk#11448)). ## 🐛 Bug Fixes * Fix vertical alignment of default avatar font ([\#11582](matrix-org/matrix-react-sdk#11582)). Fixes #26081. * Fix avatars in public room & space search being flex shrunk ([\#11580](matrix-org/matrix-react-sdk#11580)). Fixes #26133. * Fix EventTile avatars being rendered with a size of 0 instead of hidden ([\#11558](matrix-org/matrix-react-sdk#11558)). Fixes #26075. * Fix compound external assets path in bundle ([\#26069](element-hq/element-web#26069)). * Use RoomStateEvent.Update for knocks ([\#11516](matrix-org/matrix-react-sdk#11516)). Contributed by @charlynguyen. * Prevent event propagation when clicking icon buttons ([\#11515](matrix-org/matrix-react-sdk#11515)). * Only display RoomKnocksBar when feature flag is enabled ([\#11513](matrix-org/matrix-react-sdk#11513)). Contributed by @andybalaam. * Fix avatars of knock members for people tab of room settings ([\#11506](matrix-org/matrix-react-sdk#11506)). Fixes #26083. Contributed by @charlynguyen. * Fixes read receipt avatar offset ([\#11483](matrix-org/matrix-react-sdk#11483)). Fixes #26067, #26064 #26059 and #26061. * Fix avatar defects ([\#11473](matrix-org/matrix-react-sdk#11473)). Fixes #26051 and #26046. * Fix consistent avatar output for Percy ([\#11472](matrix-org/matrix-react-sdk#11472)). Fixes #26049 and #26052. * Fix colour of avatar and colour matching with username ([\#11470](matrix-org/matrix-react-sdk#11470)). Fixes #26042. * Fix incompatibility of Soft Logout with Element-R ([\#11468](matrix-org/matrix-react-sdk#11468)). * Fix instances of double translation and guard translation calls using typescript ([\#11443](matrix-org/matrix-react-sdk#11443)).

t3chguy added 4 commits August 21, 2023 16:12

Unwrap string literals for Typescript to be happy

0cee325

Create TranslationKey type and use it for _t and derivatives

dbcb1e8

Fix instances of double-translation

97706ff

Export ErrorOptions

ff765df

t3chguy added the T-Task Refactoring, enabling or disabling functionality, other engineering tasks label Aug 21, 2023

t3chguy mentioned this pull request Aug 21, 2023

Guard translation methods with typescript to protect against invalid usage element-hq/element-web#26021

Merged

t3chguy changed the title ~~Unwrap string literals for Typescript to be happy~~ Guard translation methods with typescript to protect against invalid usage Aug 21, 2023

t3chguy self-assigned this Aug 21, 2023

t3chguy mentioned this pull request Aug 21, 2023

Migrate from Weblate to Localazy for translations element-hq/element-web#25608

Closed

github-actions bot deployed to Netlify August 21, 2023 15:24 View deployment

t3chguy marked this pull request as ready for review August 21, 2023 15:41

t3chguy requested a review from a team as a code owner August 21, 2023 15:41

t3chguy requested review from dbkr and richvdh August 21, 2023 15:41

richvdh suggested changes Aug 21, 2023

View reviewed changes

Iterate PR

6f5477b

github-actions bot deployed to Netlify August 21, 2023 18:33 View deployment

t3chguy added 2 commits August 21, 2023 19:53

Fix types

f459aac

Fix comment

702ea71

t3chguy requested a review from richvdh August 21, 2023 18:54

github-actions bot deployed to Netlify August 21, 2023 18:59 View deployment

Improve coverage

fd27f46

github-actions bot deployed to Netlify August 21, 2023 19:07 View deployment

Move snapshot

986c5ce

github-actions bot deployed to Netlify August 21, 2023 19:36 View deployment

t3chguy added T-Defect Bugs, crashes, hangs, vulnerabilities, or other reported problems and removed T-Task Refactoring, enabling or disabling functionality, other engineering tasks labels Aug 22, 2023

t3chguy changed the title ~~Guard translation methods with typescript to protect against invalid usage~~ Fix instances of double translation and guard translation calls using typescript Aug 22, 2023

richvdh reviewed Aug 22, 2023

View reviewed changes

src/@types/common.ts Outdated Show resolved Hide resolved

src/languageHandler.tsx Outdated Show resolved Hide resolved

richvdh approved these changes Aug 22, 2023

View reviewed changes

Update src/@types/common.ts

fe1470f

Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>

github-actions bot deployed to Netlify August 22, 2023 11:54 View deployment

Merge branch 'develop' into t3chguy/localazy-i18n-types

cb23722

github-actions bot deployed to Netlify August 22, 2023 12:47 View deployment

Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into…

1abe0f4

… t3chguy/localazy-i18n-types # Conflicts: # test/languageHandler-test.ts # test/languageHandler-test.tsx

github-actions bot deployed to Netlify August 22, 2023 15:00 View deployment

t3chguy merged commit ac70f7a into develop Aug 22, 2023

t3chguy deleted the t3chguy/localazy-i18n-types branch August 22, 2023 15:32

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Fix instances of double translation and guard translation calls using typescript#11443

Fix instances of double translation and guard translation calls using typescript#11443
t3chguy merged 12 commits intodevelopfrom
t3chguy/localazy-i18n-types

t3chguy commented Aug 21, 2023 •

edited by github-actions bot

Loading

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

richvdh Aug 21, 2023

Uh oh!

t3chguy Aug 21, 2023

Uh oh!

Uh oh!

Uh oh!

Uh oh!

richvdh Aug 22, 2023

Uh oh!

t3chguy Aug 22, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

		this.getTab("screen", _td("Share entire screen")),
		this.getTab("window", _td("Application window")),

Uh oh!

Conversation

t3chguy commented Aug 21, 2023 • edited by github-actions bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

🐛 Bug Fixes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

richvdh Aug 21, 2023

Choose a reason for hiding this comment

Uh oh!

t3chguy Aug 21, 2023

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

richvdh Aug 22, 2023

Choose a reason for hiding this comment

Uh oh!

t3chguy Aug 22, 2023

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

t3chguy commented Aug 21, 2023 •

edited by github-actions bot

Loading