mirror of
				https://github.com/zulip/zulip.git
				synced 2025-11-03 21:43:21 +00:00 
			
		
		
		
	resolved: Rename "Topics marked as resolved" -> "Resolved topics".
Fixes part of #31725.
This commit is contained in:
		
				
					committed by
					
						
						Tim Abbott
					
				
			
			
				
	
			
			
			
						parent
						
							b9561daefb
						
					
				
				
					commit
					3f88fe5903
				
			@@ -1422,7 +1422,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
 | 
			
		||||
 
 | 
			
		||||
@@ -704,7 +704,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"},
 | 
			
		||||
 
 | 
			
		||||
@@ -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 --~}}
 | 
			
		||||
 
 | 
			
		||||
@@ -2251,7 +2251,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",
 | 
			
		||||
        },
 | 
			
		||||
        {
 | 
			
		||||
 
 | 
			
		||||
@@ -396,7 +396,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");
 | 
			
		||||
@@ -496,7 +496,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";
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user