paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-03 13:33:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

i18n: Update translated string variables for stream to channel rename.

Browse Source 
Generally updates variables that appear in translated strings that use
"stream" to instead use "channel".

Two exceptions are ErrorCode.STREAM_DOES_NOT_EXIST JsonableErrors as
changing the variable would also change the fields returned by these
errors to clients.

Changes to context variables in emails and variables in onboarding
welcome bot messages are addressed in separate commits.

Part of stream to channel rename project.
This commit is contained in:
Lauryn Menard
2024-04-15 21:24:26 +02:00
committed by Tim Abbott
parent 4dcb0258a5
commit abc6f5b8a2
6 changed files with 41 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
zerver/lib/streams.py
View File

@@ -313,7 +313,7 @@ def access_stream_for_send_message(
# All other cases are an error.
raise JsonableError(
_("Not authorized to send to stream '{stream_name}'").format(stream_name=stream.name)
_("Not authorized to send to stream '{channel_name}'").format(channel_name=stream.name)
)
@@ -473,7 +473,7 @@ def check_stream_name_available(realm: Realm, name: str) -> None:
try:
get_stream(name, realm)
raise JsonableError(
_("Stream name '{stream_name}' is already taken.").format(stream_name=name)
_("Stream name '{channel_name}' is already taken.").format(channel_name=name)
)
except Stream.DoesNotExist:
pass
@@ -482,7 +482,7 @@ def check_stream_name_available(realm: Realm, name: str) -> None:
def access_stream_by_name(
user_profile: UserProfile, stream_name: str, allow_realm_admin: bool = False
) -> Tuple[Stream, Optional[Subscription]]:
error = _("Invalid stream name '{stream_name}'").format(stream_name=stream_name)
error = _("Invalid stream name '{channel_name}'").format(channel_name=stream_name)
try:
stream = get_realm_stream(stream_name, user_profile.realm_id)
except Stream.DoesNotExist:
@@ -602,7 +602,7 @@ def can_access_stream_history(user_profile: UserProfile, stream: Stream) -> bool
if stream.is_history_public_to_subscribers():
# In this case, we check if the user is subscribed.
error = _("Invalid stream name '{stream_name}'").format(stream_name=stream.name)
error = _("Invalid stream name '{channel_name}'").format(channel_name=stream.name)
try:
access_stream_common(user_profile, stream, error)
except JsonableError:
@@ -751,8 +751,8 @@ def list_to_streams(
if not autocreate:
raise JsonableError(
_("Stream(s) ({stream_names}) do not exist").format(
stream_names=", ".join(
_("Stream(s) ({channel_names}) do not exist").format(
channel_names=", ".join(
stream_dict["name"] for stream_dict in missing_stream_dicts
),
)