Skip to content

Commit

Permalink
resolved: Rename "Topics marked as resolved" -> "Resolved topics".
Browse files Browse the repository at this point in the history
  • Loading branch information
shuklamaneesh23 committed Jan 23, 2025
1 parent 403e911 commit 2b417bc
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion web/src/filter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1412,7 +1412,7 @@ export class Filter {
case "is-dm":
return $t({defaultMessage: "Direct message feed"});
case "is-resolved":
return $t({defaultMessage: "Topics marked as resolved"});
return $t({defaultMessage: "Resolved topics"});
case "is-followed":
return $t({defaultMessage: "Followed topics"});
// These cases return false for is_common_narrow, and therefore are not
Expand Down
4 changes: 2 additions & 2 deletions web/src/search_suggestion.ts
Original file line number Diff line number Diff line change
Expand Up @@ -591,7 +591,7 @@ function get_special_filter_suggestions(
if (last.negated === true || is_search_operand_negated) {
suggestions = suggestions
.map((suggestion) => {
if (suggestion.description_html === "topics marked as resolved") {
if (suggestion.description_html === "resolved topics") {
return {
...suggestion,
search_string: "-" + suggestion.search_string,
Expand Down Expand Up @@ -718,7 +718,7 @@ function get_is_filter_suggestions(last: NarrowTerm, terms: NarrowTerm[]): Sugge
},
{
search_string: "is:resolved",
description_html: "topics marked as resolved",
description_html: "resolved topics",
is_people: false,
incompatible_patterns: [
{operator: "is", operand: "resolved"},
Expand Down
2 changes: 1 addition & 1 deletion web/templates/search_description.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
{{~!-- squash whitespace --~}}
{{else if (eq this.operand "resolved")}}
{{~!-- squash whitespace --~}}
{{this.verb}}topics marked as resolved
{{this.verb}}resolved topics
{{~!-- squash whitespace --~}}
{{else if (eq this.operand "followed")}}
{{~!-- squash whitespace --~}}
Expand Down
2 changes: 1 addition & 1 deletion web/tests/filter.test.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -2238,7 +2238,7 @@ test("navbar_helpers", ({override}) => {
terms: is_resolved,
is_common_narrow: true,
icon: "check",
title: "translated: Topics marked as resolved",
title: "translated: Resolved topics",
redirect_url_with_search: "/#narrow/topics/is/resolved",
},
{
Expand Down
4 changes: 2 additions & 2 deletions web/tests/search_suggestion.test.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -397,7 +397,7 @@ test("empty_query_suggestions", () => {
assert.equal(describe("is:mentioned"), "@-mentions");
assert.equal(describe("is:alerted"), "Alerted messages");
assert.equal(describe("is:unread"), "Unread messages");
assert.equal(describe("is:resolved"), "Topics marked as resolved");
assert.equal(describe("is:resolved"), "Resolved topics");
assert.equal(describe("is:followed"), "Followed topics");
assert.equal(describe("sender:myself@zulip.com"), "Sent by me");
assert.equal(describe("has:link"), "Messages with links");
Expand Down Expand Up @@ -497,7 +497,7 @@ test("check_is_suggestions", ({override, mock_template}) => {
assert.equal(describe("is:mentioned"), "@-mentions");
assert.equal(describe("is:alerted"), "Alerted messages");
assert.equal(describe("is:unread"), "Unread messages");
assert.equal(describe("is:resolved"), "Topics marked as resolved");
assert.equal(describe("is:resolved"), "Resolved topics");
assert.equal(describe("is:followed"), "Followed topics");

query = "-i";
Expand Down

0 comments on commit 2b417bc

Please sign in to comment.