Skip to content

[IMPROVE] Team system messages feedback #24209

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dougfabris merged 17 commits into from
Feb 18, 2022
Merged

[IMPROVE] Team system messages feedback #24209

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
c0a205d
improved some system message texts
ostjen Jan 18, 2022
65efffc
Merge branch 'develop' into sys_messages_new_texts
tassoevan Jan 21, 2022
50ca318
Merge branch 'develop' into sys_messages_new_texts
ostjen Jan 21, 2022
8c2d781
wip
dougfabris Jan 27, 2022
a965b43
Add missing team's system messages
matheusbsilva137 Feb 7, 2022
03c24b9
Add missing type
matheusbsilva137 Feb 7, 2022
a1a1d43
Merge branch 'develop' of https://github.com/RocketChat/Rocket.Chat i…
matheusbsilva137 Feb 10, 2022
b14a717
Revert 'convert channel to team' i18n string changes, fix teams.delete
matheusbsilva137 Feb 11, 2022
70d52e0
Fix 'converted channel to team' message being sent on team creation
matheusbsilva137 Feb 14, 2022
687a44c
Merge branch 'develop' into sys_messages_new_texts
dougfabris Feb 15, 2022
0f1ff46
chore: remove unecessary translation keys
dougfabris Feb 15, 2022
8af0400
Update teams' system messages ids
matheusbsilva137 Feb 16, 2022
a59659b
Merge branch 'sys_messages_new_texts' of https://github.com/RocketCha…
matheusbsilva137 Feb 16, 2022
b299289
Fix hidetype ujt i18n string
matheusbsilva137 Feb 16, 2022
4cd8122
Add missing message ids to cronProcessDownloads
matheusbsilva137 Feb 16, 2022
3fda0a4
Update channels.create return statement
matheusbsilva137 Feb 17, 2022
e63ab55
Merge branch 'develop' into sys_messages_new_texts
dougfabris Feb 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions packages/rocketchat-i18n/i18n/en.i18n.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1004,7 +1004,7 @@
"Conversations_per_day": "Conversations per Day",
"Convert": "Convert",
"Convert_Ascii_Emojis": "Convert ASCII to Emoji",
"Converting_channel_to_a_team": "You are converting this Channel to a Team. All members will be kept.",
"Converting_channel_to_a_team": "This can't be undone. Once you convert a Channel to a Team, you can not turn it back to a Channel.",
"Copied": "Copied",
"Copy": "Copy",
"Copy_text": "Copy Text",
Expand Down Expand Up @@ -2327,7 +2327,7 @@
"Invite_user_to_join_channel": "Invite one user to join this channel",
"Invite_user_to_join_channel_all_from": "Invite all users from [#channel] to join this channel",
"Invite_user_to_join_channel_all_to": "Invite all users from this channel to join [#channel]",
"Invite_Users": "Invite Users",
"Invite_Users": "Invite Members",
"IP": "IP",
"IRC_Channel_Join": "Output of the JOIN command.",
"IRC_Channel_Leave": "Output of the PART command.",
Expand Down Expand Up @@ -4479,11 +4479,7 @@
"User_joined_team_female": "Has joined the team.",
"User_joined_team_male": "Has joined the team.",
"User_left": "Has left the channel.",
"User_left_female": "Has left the channel.",
"User_left_male": "Has left the channel.",
"User_left_team": "Has left the team.",
"User_left_team_female": "Has left the team.",
"User_left_team_male": "Has left the team.",
"User_left_team": "left the team.",
"User_logged_out": "User is logged out",
"User_management": "User Management",
"User_mentions_only": "User mentions only",
Expand Down
4 changes: 2 additions & 2 deletions packages/rocketchat-i18n/i18n/pt-BR.i18n.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1001,7 +1001,7 @@
"Conversations_per_day": "Conversas por dia",
"Convert": "Converter",
"Convert_Ascii_Emojis": "Converter ASCII para Emoji",
"Converting_channel_to_a_team": "Você está convertendo esse Canal para uma Equipe. Todos os membros serão mantidos.",
"Converting_channel_to_a_team": " Esta ação não pode ser desfeita. Uma vez que convertido a um time, não é possível converter de volta a um canal.",
"Copied": "Copiado",
"Copy": "Copiar",
"Copy_text": "Copiar Texto",
Expand Down Expand Up @@ -2318,7 +2318,7 @@
"Invite_user_to_join_channel": "Convidar um usuário para este canal",
"Invite_user_to_join_channel_all_from": "Convide todos os usuários de [#channel] a participar deste canal",
"Invite_user_to_join_channel_all_to": "Convide todos os usuários deste canal a participar [#canal]",
"Invite_Users": "Convidar Usuários",
"Invite_Users": "Convidar Membros",
"IP": "IP",
"IRC_Channel_Join": "Saída do comando JOIN.",
"IRC_Channel_Leave": "Saída do comando PART.",
Expand Down