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

Allow change username server-side error messages to be html #2805

Merged
merged 10 commits into from Mar 26, 2018

Conversation

notbakaneko
Copy link
Collaborator

fixes #2793 and #2798

Also move the messages to translations.

} elseif ($remaining->h > 0) {
return ["This username will be available for use in <strong>{$remaining->h}</strong> hours."];
return [trans_choice('model_validation.user.username_available_in_hours', $remaining->hours)];

This comment was marked as off-topic.

@@ -88,11 +88,28 @@
'invalid_email' => "Doesn't seem to be a valid email address.",
'too_short' => 'New password is too short.',
'unknown_duplicate' => 'Username or email address already used.',
'username_available_in_days' => 'This username will be available for use in <strong>:count</strong> day.|This username will be available for use in <strong>:count</strong> days.',
'username_available_in_hours' => 'This username will be available for use in <strong>:count</strong> hour.|This username will be available for use in <strong>:count</strong> hours.',

This comment was marked as off-topic.

@@ -88,11 +88,28 @@
'invalid_email' => "Doesn't seem to be a valid email address.",
'too_short' => 'New password is too short.',
'unknown_duplicate' => 'Username or email address already used.',
'username_available_in_days' => '{1} This username will be available for use in :count day.|[2,*] This username will be available for use in :count days.',
'username_available_in_hours' => '{1} This username will be available for use in :count hour.|[2,*] This username will be available for use in :count hours.',

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

@nanaya nanaya merged commit 809efa3 into ppy:master Mar 26, 2018
@notbakaneko notbakaneko deleted the fix/store-username-formatted-string branch March 26, 2018 09:48
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.

HTML <strong> formatting isn't applied to name change message
3 participants