From 8c4651d716e59f754a1e22956625cabc68d07757 Mon Sep 17 00:00:00 2001
From: Rhea Parekh <rheaparekh12@gmail.com>
Date: Thu, 16 Nov 2017 05:35:08 +0530
Subject: [PATCH] zerver/lib/actions.py: Fix translation bugs.

Fixes #7396.
---
 zerver/lib/actions.py | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/zerver/lib/actions.py b/zerver/lib/actions.py
index dad0202421..ee42df2aad 100644
--- a/zerver/lib/actions.py
+++ b/zerver/lib/actions.py
@@ -2948,14 +2948,16 @@ def do_create_default_stream_group(realm: Realm, group_name: Text,
     default_streams = get_default_streams_for_realm(realm.id)
     for stream in streams:
         if stream in default_streams:
-            raise JsonableError(_("'%s' is a default stream and cannot be added to '%s'") % (
-                stream.name, group_name))
+            raise JsonableError(_(
+                "'%(stream_name)s' is a default stream and cannot be added to '%(group_name)s'")
+                % {'stream_name': stream.name, 'group_name': group_name})
 
     check_default_stream_group_name(group_name)
     (group, created) = DefaultStreamGroup.objects.get_or_create(
         name=group_name, realm=realm, description=description)
     if not created:
-        raise JsonableError(_("Default stream group '%s' already exists") % (group_name,))
+        raise JsonableError(_("Default stream group '%(group_name)s' already exists")
+                            % {'group_name': group_name})
 
     group.streams = streams
     group.save()
@@ -2966,11 +2968,13 @@ def do_add_streams_to_default_stream_group(realm: Realm, group: DefaultStreamGro
     default_streams = get_default_streams_for_realm(realm.id)
     for stream in streams:
         if stream in default_streams:
-            raise JsonableError(_("'%s' is a default stream and cannot be added to '%s'") % (
-                stream.name, group.name))
+            raise JsonableError(_(
+                "'%(stream_name)s' is a default stream and cannot be added to '%(group.name)s'")
+                % {'stream_name': stream.name, 'group.name': group.name})
         if stream in group.streams.all():
-            raise JsonableError(_("Stream '%s' is already present in default stream group '%s'")
-                                % (stream.name, group.name))
+            raise JsonableError(_(
+                "Stream '%(stream_name)s' is already present in default stream group '%(group.name)s'")
+                % {'stream_name': stream.name, 'group.name': group.name})
         group.streams.add(stream)
 
     group.save()
@@ -2980,8 +2984,9 @@ def do_remove_streams_from_default_stream_group(realm: Realm, group: DefaultStre
                                                 streams: List[Stream]) -> None:
     for stream in streams:
         if stream not in group.streams.all():
-            raise JsonableError(_("Stream '%s' is not present in default stream group '%s'")
-                                % (stream.name, group.name))
+            raise JsonableError(_(
+                "Stream '%(stream_name)s' is not present in default stream group '%(group.name)s'")
+                % {'stream_name': stream.name, 'group.name': group.name})
         group.streams.remove(stream)
 
     group.save()