Skip to content

[FIX] Duplicate label 'Hide Avatars' in accounts #15694

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
ggazzo merged 2 commits into from
Oct 29, 2019
Merged

[FIX] Duplicate label 'Hide Avatars' in accounts #15694

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
12913d1
Fixes #15585 - Duplicate label name 'Hide Avatars' in accounts
rajvaibhavdubey Oct 29, 2019
8519681
Renamed the id from hideAvatars to sidebarHideAvatar
rajvaibhavdubey Oct 29, 2019
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
2 changes: 1 addition & 1 deletion app/lib/server/startup/settings.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,7 @@ settings.addGroup('Accounts', function() {
this.add('Accounts_Default_User_Preferences_sidebarHideAvatar', false, {
type: 'boolean',
public: true,
i18nLabel: 'Hide_Avatars',
i18nLabel: 'Hide_Avatars_Sidebar',
});
this.add('Accounts_Default_User_Preferences_sidebarShowUnread', false, {
type: 'boolean',
Expand Down
8 changes: 8 additions & 0 deletions app/ui-account/client/accountPreferences.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,14 @@ <h1>{{_ "Messages"}}</h1>
<label><input type="radio" name="hideAvatars" value="false" checked="{{checked 'hideAvatars' false}}"/> {{_ "False"}}</label>
</div>
</div>

<div class="input-line double-col" id="hideAvatars">

@MartinSchoeler MartinSchoeler Oct 29, 2019

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This ID will conflict with the other hideAvatars preference ID

<label class="setting-label">{{_ "Hide_Avatars_Sidebar"}}</label>
<div class="setting-field">
<label><input type="radio" name="hideAvatars" value="true" checked="{{checked 'hideAvatars' true}}"/> {{_ "True"}}</label>
<label><input type="radio" name="hideAvatars" value="false" checked="{{checked 'hideAvatars' false}}"/> {{_ "False"}}</label>
</div>
</div>
<div class="input-line double-col" id="messageViewMode">
<label class="setting-label">{{_ "View_mode"}}</label>
<div class="setting-field">
Expand Down
1 change: 1 addition & 0 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 @@ -1560,6 +1560,7 @@
"Hidden": "Hidden",
"Hide": "Hide",
"Hide_Avatars": "Hide Avatars",
"Hide_Avatars_Sidebar": "Hide Avatars Sidebar",

@MartinSchoeler MartinSchoeler Oct 29, 2019

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
"Hide_Avatars_Sidebar": "Hide Avatars Sidebar",
"Hide_Avatars_Sidebar": "Hide Avatars in Sidebar",

"Hide_counter": "Hide counter",
"Hide_flextab": "Hide Right Sidebar with Click",
"Hide_Group_Warning": "Are you sure you want to hide the group \"%s\"?",
Expand Down