diff --git a/templates/zerver/app/search_operators.html b/templates/zerver/app/search_operators.html index 9af851d708..d757241280 100644 --- a/templates/zerver/app/search_operators.html +++ b/templates/zerver/app/search_operators.html @@ -81,28 +81,33 @@ {% trans %}Exclude messages with topic topic{% endtrans %} - {% trans %} -

You can use any combination of these search operators in a single query. For example:

+ +

{% trans %}You can use any combination of these search operators in a single query. Consider the following example:{% endtrans %}

+ + {% set placeholder_stream = _("streamname") %} + {% set placeholder_email = _("user@example.com") %} + {% set placeholder_keyword = _("keyword") %}

  - stream:streamname - sender:user@example.com - keyword + stream:{{ placeholder_email }} + sender:{{ placeholder_email }} + {{ placeholder_keyword }}

- would search for messages sent by - user@example.com + {% trans %} + That query would search for messages sent by + {{ placeholder_email }} to stream - streamname + {{ placeholder_stream }} containing the keyword - keyword. + {{ placeholder_keyword }}. + {% endtrans %}

- {% endtrans %}
- Detailed search operators documentation + {% trans %}Detailed search operators documentation{% endtrans %} diff --git a/tools/lib/capitalization.py b/tools/lib/capitalization.py index 87194da5bc..1c691bf24e 100644 --- a/tools/lib/capitalization.py +++ b/tools/lib/capitalization.py @@ -73,7 +73,10 @@ IGNORED_PHRASES = [ r"enabled", r"disabled", r"zulip_org_id", - + # Placeholders + r"keyword", + r"streamname", + r"user@example.com", # Fragments of larger strings (r'your subscriptions on your Streams page'), (r'Change notification settings for individual streams on your '