Join GitHub today
GitHub is home to over 28 million developers working together to host and review code, manage projects, and build software together.
Sign upAllow change username server-side error messages to be html #2805
Conversation
notbakaneko
added some commits
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 has been minimized.
This comment has been minimized.
nanaya
Mar 26, 2018
Collaborator
The property name used between here and the check doesn't match ಠ_ಠ
Or more like ->hours doesn't exist.
| @@ -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 has been minimized.
This comment has been minimized.
nanaya
Mar 26, 2018
Collaborator
The <strong> part can probably be extended to include its unit as well (or just removed because current design has <strong> wrapping the whole thing). And then the hours and days version can be merged or something.
notbakaneko
added some commits
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 has been minimized.
This comment has been minimized.
nanaya
Mar 26, 2018
Collaborator
does it actually do anything? Looks the same as without explicit numbers.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
nanaya
Mar 26, 2018
Collaborator
I'd rather "fix" the trans_choice function so we don't need to do this for everything.
notbakaneko
added some commits
Mar 26, 2018
nanaya
merged commit 809efa3
into
ppy:master
Mar 26, 2018
notbakaneko
deleted the
notbakaneko:fix/store-username-formatted-string
branch
Mar 26, 2018
notbakaneko
referenced this pull request
Mar 26, 2018
Closed
An <a> tag with a wrong output in username changing page. #2798
peppy
added
the
resolves issue
label
Mar 29, 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.
notbakaneko commentedMar 26, 2018
fixes #2793 and #2798
Also move the messages to translations.