Fix modified due date message

[lhsazevedo]

Fix #20288

Preview:

[delvh]

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)

[silverwind]

Agree, please swap "to" and "from" in options/locale/locale_en-US.ini and then swap the date arguments in the template.

[wxiaoguang]

Maybe %[1]s %[2]s %[3]s is more clear than %s %s %s, and it's friendly for other languages.

[6543]

I think this does not need a template change

[lhsazevedo]

I think this does not need a template change

The problem with the current template is that it passes only two arguments to Tr, and due_date_modified requires three:

Current:

{{$.locale.Tr "repo.issues.due_date_modified" (.Content | ParseDeadline) $createdStr | Safe}}
                                               ------------------------   ---------
                                                    1st arg (array)        2nd arg

Proposed fix:

{{$parsedDeadline := .Content | ParseDeadline}}
{{$.locale.Tr "repo.issues.due_date_modified" (index $parsedDeadline 0) (index $parsedDeadline 1) $createdStr | Safe}}
                                               -----------------------   -----------------------   ---------
                                                     1st argument                2nd arg            3rd arg

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 (%[2]s %[1]s %[3]s).

[6543]

Passin args as befor will help translators ... tanks

[codecov-commenter]

Codecov Report

Merging #20388 (aab1020) into main (d6779c7) will increase coverage by 46.90%.
The diff coverage is n/a.

@@            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     

Impacted Files	Coverage Δ
routers/web/org/home.go	61.29% <0.00%> (ø)
modules/lfs/endpoint.go	79.41% <0.00%> (ø)
modules/git/batch_reader.go	55.88% <0.00%> (ø)
services/repository/files/patch.go	0.00% <0.00%> (ø)
modules/git/commit_info_nogogit.go	59.34% <0.00%> (ø)
routers/api/packages/nuget/links.go	100.00% <0.00%> (ø)
modules/log/stack.go	78.26% <0.00%> (ø)
modules/doctor/checkOldArchives.go	22.85% <0.00%> (ø)
models/repo/wiki.go	75.00% <0.00%> (ø)
models/git/commit_status.go	52.86% <0.00%> (ø)
... and 966 more

[tyroneyeh]

This need backport v1.17?

[silverwind]

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.

[tyroneyeh]

Maybe just backport the template, it's easy without the locale

[zeripath]

to my eyes the locale change is compatible with the previous locale string so I think it's fine.

Backport the whole thing.

[lhsazevedo]

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?

[zeripath]

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