Allow change username server-side error messages to be html #2805
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
nanaya
requested changes
Mar 26, 2018
app/Models/User.php
Outdated
| } 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.
This comment was marked as off-topic.
Sorry, something went wrong.
| @@ -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.
This comment was marked as off-topic.
Sorry, something went wrong.
nanaya
requested changes
Mar 26, 2018
| @@ -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.
Sorry, something went wrong.
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
nanaya
approved these changes
Mar 26, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
fixes #2793 and #2798
Also move the messages to translations.