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.

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

Add a tooltip explaining what a locked account is #9403

Merged
merged 3 commits into from Dec 1, 2018

Conversation

Projects
None yet
4 participants
@pawelngei
Copy link
Contributor

pawelngei commented Dec 1, 2018

Fixes #9105 .

lock_tooltip

Localized to Polish and English.

@ykzts

ykzts approved these changes Dec 1, 2018

@Gargron Gargron merged commit b9ec34d into tootsuite:master Dec 1, 2018

11 checks passed

ci/circleci: build Your tests passed on CircleCI!
Details
ci/circleci: check-i18n Your tests passed on CircleCI!
Details
ci/circleci: install Your tests passed on CircleCI!
Details
ci/circleci: install-ruby2.3 Your tests passed on CircleCI!
Details
ci/circleci: install-ruby2.4 Your tests passed on CircleCI!
Details
ci/circleci: install-ruby2.5 Your tests passed on CircleCI!
Details
ci/circleci: test-ruby2.3 Your tests passed on CircleCI!
Details
ci/circleci: test-ruby2.4 Your tests passed on CircleCI!
Details
ci/circleci: test-ruby2.5 Your tests passed on CircleCI!
Details
ci/circleci: test-webui Your tests passed on CircleCI!
Details
codeclimate All good!
Details
@@ -16,6 +16,7 @@ const messages = defineMessages({
unblock: { id: 'account.unblock', defaultMessage: 'Unblock @{name}' },
edit_profile: { id: 'account.edit_profile', defaultMessage: 'Edit profile' },
linkVerifiedOn: { id: 'account.link_verified_on', defaultMessage: 'Ownership of this link was checked on {date}' },
account_locked: { id: 'account.locked_info', defaultMessage: 'This account privacy status is set to locked. The owner manually reviews who can follow them.' },

This comment has been minimized.

@HorlogeSkynet

HorlogeSkynet Dec 6, 2018

Hey over here, shouldn't be [...] who can follow him. instead of [...] who can follow them. ?

Bye 👋

EDIT : Maybe it was about using a gender neutral pronoun ?

This comment has been minimized.

@Gargron

Gargron Dec 6, 2018

Member

Yes, it's meant to be gender-neutral

This comment has been minimized.

@pawelngei

pawelngei Dec 6, 2018

Author Contributor

Sorry for the oversight. Should I make a new PR fixing it?

This comment has been minimized.

@pawelngei

pawelngei Dec 6, 2018

Author Contributor

Oh, I just realized I read this the other way, I used gender neutral them. Please disregard my comment.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment