-
-
Notifications
You must be signed in to change notification settings - Fork 5.6k
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
Change add_on
translation to added_on
and include placeholder for the date
#24562
Merged
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
GiteaBot
added
the
lgtm/need 2
This PR needs two approvals by maintainers to be considered for merging.
label
May 6, 2023
pull-request-size
bot
added
the
size/S
Denotes a PR that changes 10-29 lines, ignoring generated files.
label
May 6, 2023
lunny
approved these changes
May 6, 2023
GiteaBot
added
lgtm/need 1
This PR needs approval from one additional maintainer to be merged.
and removed
lgtm/need 2
This PR needs two approvals by maintainers to be considered for merging.
labels
May 6, 2023
delvh
approved these changes
May 6, 2023
GiteaBot
added
lgtm/done
This PR has enough approvals to get merged. There are no important open reservations anymore.
and removed
lgtm/need 1
This PR needs approval from one additional maintainer to be merged.
labels
May 6, 2023
Co-authored-by: delvh <dev.lh@web.de>
yardenshoham
added
the
reviewed/wait-merge
This pull request is part of the merge queue. It will be merged soon.
label
May 6, 2023
lunny
pushed a commit
that referenced
this pull request
May 6, 2023
…aceholder for the date (#24563) - Similar to #24550 - Similar to #24562 The correct thing to do is to translate the entire phrase into a single string. The previous translation assumed all languages have a space between the "valid until" and the date (and that "valid until" comes before the date). Signed-off-by: Yarden Shoham <git@yardenshoham.com>
@yardenshoham please fix the merge conflicts. 🍵 |
GiteaBot
removed
the
reviewed/wait-merge
This pull request is part of the merge queue. It will be merged soon.
label
May 6, 2023
I did, thanks bot |
yardenshoham
added
the
reviewed/wait-merge
This pull request is part of the merge queue. It will be merged soon.
label
May 6, 2023
GiteaBot
removed
the
reviewed/wait-merge
This pull request is part of the merge queue. It will be merged soon.
label
May 6, 2023
zjjhot
added a commit
to zjjhot/gitea
that referenced
this pull request
May 8, 2023
* upstream/main: Fix broken link in tests/e2e/README (go-gitea#24576) [skip ci] Updated licenses and gitignores Add goto issue id function (go-gitea#24479) Improve decryption failure message (go-gitea#24573) Simplify template helper functions (go-gitea#24570) Makefile: Use portable !, not GNUish -not, with find(1). (go-gitea#24565) Add org visibility label to non-organization's dashboard (go-gitea#24558) Sort users and orgs on explore by recency by default (go-gitea#24279) Change `add_on` translation to `added_on` and include placeholder for the date (go-gitea#24562) Change `valid_until` translation to `valid_until_date` and include placeholder for the date (go-gitea#24563) Fix docs failing the build on `main` (go-gitea#24561) Improve wiki user title test (go-gitea#24559) Fix incorrect user visibility (go-gitea#24557) Change `join_on` translation to `joined_on` and include placeholder for the date (go-gitea#24550) Require at least one unit to be enabled (go-gitea#24189) Fix broken `README` link (go-gitea#24546) Check latest version on CI (go-gitea#24556)
silverwind
pushed a commit
that referenced
this pull request
May 19, 2023
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Labels
lgtm/done
This PR has enough approvals to get merged. There are no important open reservations anymore.
modifies/translation
size/S
Denotes a PR that changes 10-29 lines, ignoring generated files.
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.
Suggestion cannot be applied right now. Please check back later.
join_on
translation tojoined_on
and include placeholder for the date #24550The correct thing to do is to translate the entire phrase into a single string. The previous translation assumed all languages have a space between the "added on" and the date (and that "added on" comes before the date).
Some languages, like Hebrew, have no space between the "added on" and the date. For example:
added_on=נוסף ב-%s
("added" becomes נוסף, "on" is ב and when paired with a date we use a dash to connect ב with the date)