Skip to content
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

pawelngei
Copy link
Contributor

@pawelngei pawelngei commented Dec 1, 2018

Fixes #9105 .

lock_tooltip

Localized to Polish and English.

@Gargron Gargron merged commit b9ec34d into mastodon:master Dec 1, 2018
@@ -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.' },
Copy link

@HorlogeSkynet HorlogeSkynet Dec 6, 2018

Choose a reason for hiding this comment

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

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 ?

Copy link
Member

Choose a reason for hiding this comment

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

Yes, it's meant to be gender-neutral

Copy link
Contributor Author

Choose a reason for hiding this comment

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

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

Copy link
Contributor Author

Choose a reason for hiding this comment

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

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

hiyuki2578 pushed a commit to ProjectMyosotis/mastodon that referenced this pull request Oct 2, 2019
* create a title tooltip explaining what a locked account is

* improve phrasing

* minor phrasing fix to unify default and english
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants