-
-
Notifications
You must be signed in to change notification settings - Fork 5.5k
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
Fix modified due date message #20388
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Seems fine.
Although we could even think about switching the key around
(modified the due date from %s to %s %s
sounds more natural to me)
Agree, please swap "to" and "from" in |
Swap to/from in due_date_modified issue comment as it sounds more natural. Co-authored-by: delvh <[email protected]>
Maybe |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think this does not need a template change
The problem with the current template is that it passes only two arguments to Current:
Proposed fix:
Note that now we're passing the array items in the original order as the from/to swap is being handled by indexed verbs in the translation format string ( |
Passin args as befor will help translators ... tanks |
Codecov Report
@@ Coverage Diff @@
## main #20388 +/- ##
=========================================
+ Coverage 0 46.90% +46.90%
=========================================
Files 0 976 +976
Lines 0 135196 +135196
=========================================
+ Hits 0 63409 +63409
- Misses 0 64014 +64014
- Partials 0 7773 +7773
|
* giteaofficial/main: [skip ci] Updated translations via Crowdin Dismiss prior pull reviews if done via web in review dismiss (go-gitea#20197) Fix modified due date message (go-gitea#20388) Fix public org members displayed too many informations (go-gitea#20403) Add two factor status to admin cmd display (go-gitea#20401) Use tippy.js for context popup (go-gitea#20393)
This need backport v1.17? |
It includes a translation so it'll be more work to backport including translations, but if someone wants to do it, it should be fine to backport. |
Maybe just backport the template, it's easy without the locale |
to my eyes the locale change is compatible with the previous locale string so I think it's fine. Backport the whole thing. |
I think it's fine as well, as the order was swapped in the locale line itself. Can I open a PR to the 1.17 branch? |
yup, you may find the following script helpful #!/bin/sh
PR="$1"
SHA="$2"
VERSION="$3"
if [ -z "$SHA" ]; then
SHA=$(gh api /repos/go-gitea/gitea/pulls/$PR -q '.merge_commit_sha')
fi
if [ -z "$VERSION" ]; then
VERSION="v1.17"
fi
echo git checkout origin/release/"$VERSION" -b backport-$PR-$VERSION
git checkout origin/release/"$VERSION" -b backport-$PR-$VERSION
git cherry-pick $SHA && git commit --amend && git push ihsazevedo backport-$PR-$VERSION && xdg-open https://github.com/go-gitea/gitea/compare/release/"$VERSION"...ihsazevedo:backport-$PR-$VERSION
|
Fix #20288
Preview: