Skip to content

[FIX] Missing Translation Key on Reactions #10270

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
rodrigok merged 4 commits into from
Apr 3, 2018
Merged

[FIX] Missing Translation Key on Reactions #10270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a5a5095
[FIX] Missing Translation Key on Reactions
bernardoetrevisan Mar 29, 2018
69a4c2d
Merge branch 'develop' into fix-reactions-translation
bernardoetrevisan Mar 29, 2018
cf88610
Clearify the translations of the no reacting
graywolf336 Mar 30, 2018
bacc100
Really really clearify the disallow reacting language
graywolf336 Mar 30, 2018
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
4 changes: 2 additions & 2 deletions packages/rocketchat-channel-settings/client/views/channelSettings.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,9 +137,9 @@
</label>
</div>
<div class="rc-switch-double__label {{equal false value 'disabled'}}">
{{_ "No_reactions"}}
{{_ "Disallow_reacting"}}
<div class="rc-switch-double__description">
{{_ "No_reactions"}}
{{_ "Disallow_reacting_Description"}}
</div>
</div>
</div>
Expand Down
4 changes: 3 additions & 1 deletion packages/rocketchat-i18n/i18n/en.i18n.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -552,6 +552,8 @@
"Disable_Notifications": "Disable Notifications",
"Disable_two-factor_authentication": "Disable two-factor authentication",
"Disabled": "Disabled",
"Disallow_reacting": "Disallow Reacting",
"Disallow_reacting_Description": "Disallows reacting",
"Display_unread_counter": "Display number of unread messages",
"Display_offline_form": "Display Offline Form",
"Displays_action_text": "Displays action text",
Expand Down Expand Up @@ -2242,4 +2244,4 @@
"your_message_optional": "your message (optional)",
"Your_password_is_wrong": "Your password is wrong!",
"Your_push_was_sent_to_s_devices": "Your push was sent to %s devices"
}
}