Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Commit

Permalink
replace Polls history strings with Poll history (#10454)
Browse files Browse the repository at this point in the history
Co-authored-by: Michael Weimann <[email protected]>
  • Loading branch information
Kerry and weeman1337 authored Mar 28, 2023
1 parent f5115e0 commit 6eda1fa
Show file tree
Hide file tree
Showing 11 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion cypress/e2e/polls/pollHistory.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ describe("Poll history", () => {
function openPollHistory(): void {
cy.get('.mx_HeaderButtons [aria-label="Room info"]').click();
cy.get(".mx_RoomSummaryCard").within(() => {
cy.contains("Polls history").click();
cy.contains("Poll history").click();
});
}

Expand Down
2 changes: 1 addition & 1 deletion src/components/views/dialogs/RoomSettingsDialog.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ export default class RoomSettingsDialog extends React.Component<IProps, IState>
tabs.push(
new Tab(
ROOM_POLL_HISTORY_TAB,
_td("Polls history"),
_td("Poll history"),
"mx_RoomSettingsDialog_pollsIcon",
<PollHistoryTab roomId={this.props.roomId} onFinished={() => this.props.onFinished(true)} />,
),
Expand Down
2 changes: 1 addition & 1 deletion src/components/views/polls/pollHistory/PollHistory.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ export const PollHistory: React.FC<PollHistoryProps> = ({ room, matrixClient, pe
const title = focusedPoll ? (
<PollDetailHeader filter={filter} onNavigateBack={() => setFocusedPollId(null)} />
) : (
_t("Polls history")
_t("Poll history")
);

return (
Expand Down
2 changes: 1 addition & 1 deletion src/components/views/right_panel/RoomSummaryCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,7 @@ const RoomSummaryCard: React.FC<IProps> = ({ room, permalinkCreator, onClose })
)}
{!isVideoRoom && (
<Button className="mx_RoomSummaryCard_icon_poll" onClick={onRoomPollHistoryClick}>
{_t("Polls history")}
{_t("Poll history")}
</Button>
)}
{pinningEnabled && !isVideoRoom && (
Expand Down
2 changes: 1 addition & 1 deletion src/i18n/strings/en_EN.json
Original file line number Diff line number Diff line change
Expand Up @@ -2237,7 +2237,7 @@
"Not encrypted": "Not encrypted",
"About": "About",
"Files": "Files",
"Polls history": "Polls history",
"Poll history": "Poll history",
"Pinned": "Pinned",
"Export chat": "Export chat",
"Share room": "Share room",
Expand Down
2 changes: 1 addition & 1 deletion test/components/views/dialogs/RoomSettingsDialog-test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ describe("<RoomSettingsDialog />", () => {
it("displays poll history when tab clicked", () => {
const { container } = getComponent();

fireEvent.click(screen.getByText("Polls history"));
fireEvent.click(screen.getByText("Poll history"));

expect(container.querySelector(".mx_SettingsTab")).toMatchSnapshot();
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ NodeList [
<span
class="mx_TabbedView_tabLabel_text"
>
Polls history
Poll history
</span>
</div>,
]
Expand All @@ -90,7 +90,7 @@ exports[`<RoomSettingsDialog /> poll history displays poll history when tab clic
<h2
class="mx_Heading_h2 mx_PollHistory_header"
>
Polls history
Poll history
</h2>
<div
class="mx_PollHistoryList"
Expand Down
6 changes: 3 additions & 3 deletions test/components/views/polls/pollHistory/PollHistory-test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,7 @@ describe("<PollHistory />", () => {

fireEvent.click(getByText("Question?"));

expect(queryByText("Polls history")).not.toBeInTheDocument();
expect(queryByText("Poll history")).not.toBeInTheDocument();
// elements from MPollBody
expect(getByText("Question?")).toMatchSnapshot();
expect(getByText("Socks")).toBeInTheDocument();
Expand Down Expand Up @@ -394,13 +394,13 @@ describe("<PollHistory />", () => {
expect(getByText("Question?")).toBeInTheDocument();

// header not shown
expect(queryByText("Polls history")).not.toBeInTheDocument();
expect(queryByText("Poll history")).not.toBeInTheDocument();

expect(getByText("Active polls")).toMatchSnapshot();
fireEvent.click(getByText("Active polls"));

// main list header displayed again
expect(getByText("Polls history")).toBeInTheDocument();
expect(getByText("Poll history")).toBeInTheDocument();
// active filter still active
expect(getByTestId("filter-tab-PollHistory_filter-ACTIVE").firstElementChild).toBeChecked();
// list displayed
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ exports[`<PollHistory /> renders a list of active polls when there are polls in
<h2
class="mx_Heading_h2 mx_PollHistory_header"
>
Polls history
Poll history
</h2>
<div
class="mx_PollHistoryList"
Expand Down
4 changes: 2 additions & 2 deletions test/components/views/right_panel/RoomSummaryCard-test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -137,13 +137,13 @@ describe("<RoomSummaryCard />", () => {
it("renders poll history option", () => {
const { getByText } = getComponent();

expect(getByText("Polls history")).toBeInTheDocument();
expect(getByText("Poll history")).toBeInTheDocument();
});

it("opens poll history dialog on button click", () => {
const { getByText } = getComponent();

fireEvent.click(getByText("Polls history"));
fireEvent.click(getByText("Poll history"));

expect(modalSpy).toHaveBeenCalledWith(PollHistoryDialog, {
room,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ exports[`<RoomSummaryCard /> renders the room summary 1`] = `
role="button"
tabindex="0"
>
Polls history
Poll history
</div>
<div
class="mx_AccessibleButton mx_BaseCard_Button mx_RoomSummaryCard_Button mx_RoomSummaryCard_icon_export"
Expand Down

0 comments on commit 6eda1fa

Please sign in to comment.