Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

i18n: Fix strings in send_pm_if_empty_stream. 

The previous iteration did not properly handle languages with a
different word order than English.

Discovered via warning output in `manage.py makemessages`.
This commit is contained in:
Tim Abbott 2019-07-21 14:37:47 -07:00
parent 7d8d0b2284
commit 21c8a7ec36
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
zerver/lib/actions.py
View File

@ -2116,20 +2116,26 @@ def send_pm_if_empty_stream(stream: Optional[Stream],
if not sender.is_bot or sender.bot_owner is None: if not sender.is_bot or sender.bot_owner is None:
return return
arg_dict = {
"bot_identity": sender.delivery_email,
"stream_id": stream_id,
"stream_name": stream_name,
}
if stream is None: if stream is None:
if stream_id is not None: if stream_id is not None:
content = _("Your bot `%s` tried to send a message to stream ID %s, but there " content = _("Your bot `%(bot_identity)s` tried to send a message to stream ID "
"is no stream with that ID." % (sender.delivery_email, stream_id)) "%(stream_id)s, but there is no stream with that ID.") % arg_dict
else: else:
assert(stream_name is not None) assert(stream_name is not None)
content = _("Your bot `%s` tried to send a message to stream #**%s**, but that " content = _("Your bot `%(bot_identity)s` tried to send a message to stream "
"stream does not exist. Click [here](#streams/new) to create it.") % ( "#**%(stream_name)s**, but that stream does not exist. "
sender.delivery_email, stream_name) "Click [here](#streams/new) to create it.") % arg_dict
else: else:
if num_subscribers_for_stream_id(stream.id) > 0: if num_subscribers_for_stream_id(stream.id) > 0:
return return
content = _("Your bot `%s` tried to send a message to stream #**%s**. The stream exists but " content = _("Your bot `%(bot_identity)s` tried to send a message to "
"does not have any subscribers.") % (sender.delivery_email, stream.name) "stream #**%(stream_name)s**. The stream exists but "
"does not have any subscribers.") % arg_dict
send_rate_limited_pm_notification_to_bot_owner(sender, realm, content) send_rate_limited_pm_notification_to_bot_owner(sender, realm, content)