Skip to content

Check HTML-encoded quotes when handling translations for embedded pages (such as welcome.html) #30743

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 11, 2025
Merged

Check HTML-encoded quotes when handling translations for embedded pages (such as welcome.html) #30743

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
10f5d22
Check HTML encoding on embedded page
Half-Shot Sep 11, 2025
38ef503
Add tests
Half-Shot Sep 11, 2025
1fa8dbb
lint
Half-Shot Sep 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/components/structures/EmbeddedPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,11 @@ export default class EmbeddedPage extends React.PureComponent<IProps, IState> {
return;
}

let body = (await res.text()).replace(/_t\(['"]([\s\S]*?)['"]\)/gm, (match, g1) => this.translate(g1));
// Replace '," and HTML encoded variants
let body = (await res.text()).replace(
/_t\((?:['"]|(?:&#(?:34|27);))([\s\S]*?)(?:['"]|(?:&#(?:34|27);))\)/gm,
(match, g1) => this.translate(g1),
);

if (this.props.replaceMap) {
Object.keys(this.props.replaceMap).forEach((key) => {
Expand Down
4 changes: 2 additions & 2 deletions test/unit-tests/components/views/context_menus/EmbeddedPage-test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ jest.mock("../../../../../src/languageHandler", () => ({
}));

describe("<EmbeddedPage />", () => {
it("should translate _t strings", async () => {
it.each([`"`, `'`, `&#x27;`, `&#x34;`])("should translate _t strings", async (character) => {
mocked(_t).mockReturnValue("Przeglądaj pokoje");
fetchMock.get("https://home.page", {
body: '<h1>_t("Explore rooms")</h1>',
body: `<h1>_t(${character}Explore rooms${character})</h1>`,
});

const { asFragment } = render(<EmbeddedPage url="https://home.page" />);
Expand Down
48 changes: 48 additions & 0 deletions test/unit-tests/components/views/context_menus/__snapshots__/EmbeddedPage-test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,3 +41,51 @@ exports[`<EmbeddedPage /> should translate _t strings 1`] = `
</div>
</DocumentFragment>
`;

exports[`<EmbeddedPage /> should translate _t strings 2`] = `
<DocumentFragment>
<div
class="undefined_guest"
>
<div
class="undefined_body"
>
<h1>
Przeglądaj pokoje
</h1>
</div>
</div>
</DocumentFragment>
`;

exports[`<EmbeddedPage /> should translate _t strings 3`] = `
<DocumentFragment>
<div
class="undefined_guest"
>
<div
class="undefined_body"
>
<h1>
Przeglądaj pokoje
</h1>
</div>
</div>
</DocumentFragment>
`;

exports[`<EmbeddedPage /> should translate _t strings 4`] = `
<DocumentFragment>
<div
class="undefined_guest"
>
<div
class="undefined_body"
>
<h1>
Przeglądaj pokoje
</h1>
</div>
</div>
</DocumentFragment>
`;
Loading