paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-02 04:53:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

confirm_merge_topics: Show realm_empty_topic_display_name for topic="".

Browse Source 
This commit adds support to display `realm_empty_topic_display_name`
value in the confirm_merge_topics_with_rename modal for topics having
the actual value of empty string.
This commit is contained in:
Prakhar Pratyush
2025-01-13 12:45:09 +05:30
committed by Tim Abbott
parent 6252e3b3cf
commit 79da2e38c5
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
web/templates/confirm_dialog/confirm_merge_topics_with_rename.hbs
View File

@@ -1,7 +1,7 @@
<p>
{{#tr}}
The topic <z-topic-name>{topic_name}</z-topic-name> already exists in this channel.
The topic <z-topic-name>{topic_display_name}</z-topic-name> already exists in this channel.
Are you sure you want to combine messages from these topics? This cannot be undone.
{{#*inline "z-topic-name"}}<strong class="white-space-preserve-wrap">{{> @partial-block}}</strong>{{/inline}}
{{#*inline "z-topic-name"}}<strong class="white-space-preserve-wrap {{#if is_empty_string_topic}}empty-topic-display{{/if}}">{{> @partial-block}}</strong>{{/inline}}
{{/tr}}
</p>