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

18n: Cleanup strings to be translated in add_subscriptions_backend. 

Also expand the test to check the details of the user who created the
stream.
This commit is contained in:
Vishnu KS 2020-06-30 17:42:27 +05:30 committed by Tim Abbott
parent eb50ecf07a
commit a74cdf3123
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
zerver/tests/test_subs.py
View File

@ -2644,7 +2644,7 @@ class SubscriptionAPITest(ZulipTestCase):
self.assertEqual(msg.recipient.type, msg.recipient.STREAM) self.assertEqual(msg.recipient.type, msg.recipient.STREAM)
self.assertEqual(msg.topic_name(), 'stream events') self.assertEqual(msg.topic_name(), 'stream events')
self.assertEqual(msg.sender.email, settings.NOTIFICATION_BOT) self.assertEqual(msg.sender.email, settings.NOTIFICATION_BOT)
self.assertIn('Stream created by @_**', msg.content) self.assertIn(f"Stream created by @_**{self.test_user.full_name}|{self.test_user.id}**", msg.content)
def test_multi_user_subscription(self) -> None: def test_multi_user_subscription(self) -> None:
user1 = self.example_user("cordelia") user1 = self.example_user("cordelia")

17
zerver/views/streams.py
View File

@ -535,15 +535,15 @@ def add_subscriptions_backend(
if notifications_stream is not None: if notifications_stream is not None:
with override_language(notifications_stream.realm.default_language): with override_language(notifications_stream.realm.default_language):
if len(created_streams) > 1: if len(created_streams) > 1:
content = _("@_**%(user_name)s|%(user_id)d** created the following streams: %(stream_str)s.") content = _("{user_name} created the following streams: {stream_str}.")
else: else:
content = _("@_**%(user_name)s|%(user_id)d** created a new stream %(stream_str)s.") content = _("{user_name} created a new stream {stream_str}.")
topic = _('new streams') topic = _('new streams')
content = content % { content = content.format(
'user_name': user_profile.full_name, user_name=f"@_**{user_profile.full_name}|{user_profile.id}**",
'user_id': user_profile.id, stream_str=", ".join(f'#**{s.name}**' for s in created_streams)
'stream_str': ", ".join(f'#**{s.name}**' for s in created_streams)} )
sender = get_system_bot(settings.NOTIFICATION_BOT) sender = get_system_bot(settings.NOTIFICATION_BOT)
@ -567,9 +567,8 @@ def add_subscriptions_backend(
sender=sender, sender=sender,
stream=stream, stream=stream,
topic=Realm.STREAM_EVENTS_NOTIFICATION_TOPIC, topic=Realm.STREAM_EVENTS_NOTIFICATION_TOPIC,
content=_('Stream created by @_**{user_name}|{user_id}**.').format( content=_('Stream created by {user_name}.').format(
user_name=user_profile.full_name, user_name=f"@_**{user_profile.full_name}|{user_profile.id}**",
user_id=user_profile.id,
), ),
), ),
) )