From 02992f6310de363829a06745288257a41402a36d Mon Sep 17 00:00:00 2001 From: CaiCandong <1290147055@qq.com> Date: Fri, 18 Aug 2023 10:15:22 +0800 Subject: [PATCH 1/5] Improve translation of milestone filters --- options/locale/locale_en-US.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 0bfe1eac75dd6..8ca4b9db608ec 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -1815,8 +1815,8 @@ milestones.edit_success = Milestone "%s" has been updated. milestones.deletion = Delete Milestone milestones.deletion_desc = Deleting a milestone removes it from all related issues. Continue? milestones.deletion_success = The milestone has been deleted. -milestones.filter_sort.closest_due_date = Closest due date -milestones.filter_sort.furthest_due_date = Furthest due date +milestones.filter_sort.closest_due_date = Latest +milestones.filter_sort.furthest_due_date = Earliest milestones.filter_sort.least_complete = Least complete milestones.filter_sort.most_complete = Most complete milestones.filter_sort.most_issues = Most issues From b5e78fddecfe3d1e5e967a962700cdfa2fa10693 Mon Sep 17 00:00:00 2001 From: CaiCandong <1290147055@qq.com> Date: Fri, 18 Aug 2023 10:28:35 +0800 Subject: [PATCH 2/5] fix --- options/locale/locale_en-US.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 8ca4b9db608ec..78c9b2a64e21e 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -1815,8 +1815,8 @@ milestones.edit_success = Milestone "%s" has been updated. milestones.deletion = Delete Milestone milestones.deletion_desc = Deleting a milestone removes it from all related issues. Continue? milestones.deletion_success = The milestone has been deleted. -milestones.filter_sort.closest_due_date = Latest -milestones.filter_sort.furthest_due_date = Earliest +milestones.filter_sort.closest_due_date = Latest due date +milestones.filter_sort.furthest_due_date = Earliest due date milestones.filter_sort.least_complete = Least complete milestones.filter_sort.most_complete = Most complete milestones.filter_sort.most_issues = Most issues From a6b3e0eb1fbee1fed51d8fc3df929e47ac821d9a Mon Sep 17 00:00:00 2001 From: CaiCandong <1290147055@qq.com> Date: Fri, 18 Aug 2023 10:46:10 +0800 Subject: [PATCH 3/5] fix --- options/locale/locale_en-US.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 78c9b2a64e21e..a9e648c1ce0b8 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -1815,8 +1815,8 @@ milestones.edit_success = Milestone "%s" has been updated. milestones.deletion = Delete Milestone milestones.deletion_desc = Deleting a milestone removes it from all related issues. Continue? milestones.deletion_success = The milestone has been deleted. -milestones.filter_sort.closest_due_date = Latest due date -milestones.filter_sort.furthest_due_date = Earliest due date +milestones.filter_sort.closest_due_date = Earliest due date +milestones.filter_sort.furthest_due_date = Latest due date milestones.filter_sort.least_complete = Least complete milestones.filter_sort.most_complete = Most complete milestones.filter_sort.most_issues = Most issues From 8f18ae20dba92590577fe639f9c1b2a035d390f2 Mon Sep 17 00:00:00 2001 From: CaiCandong <50507092+CaiCandong@users.noreply.github.com> Date: Fri, 18 Aug 2023 13:40:19 +0800 Subject: [PATCH 4/5] Update options/locale/locale_en-US.ini Co-authored-by: yp05327 <576951401@qq.com> --- options/locale/locale_en-US.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index a9e648c1ce0b8..be987c833c238 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -1816,7 +1816,7 @@ milestones.deletion = Delete Milestone milestones.deletion_desc = Deleting a milestone removes it from all related issues. Continue? milestones.deletion_success = The milestone has been deleted. milestones.filter_sort.closest_due_date = Earliest due date -milestones.filter_sort.furthest_due_date = Latest due date +milestones.filter_sort.furthest_due_date = Latest due date milestones.filter_sort.least_complete = Least complete milestones.filter_sort.most_complete = Most complete milestones.filter_sort.most_issues = Most issues From 26e5036da6d0e84f607a82699d8cb48eed9200d1 Mon Sep 17 00:00:00 2001 From: CaiCandong <1290147055@qq.com> Date: Mon, 21 Aug 2023 17:27:07 +0800 Subject: [PATCH 5/5] rename key --- options/locale/locale_en-US.ini | 4 ++-- templates/repo/issue/milestones.tmpl | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 7c0fba358665a..4ba7608aaa348 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -1820,8 +1820,8 @@ milestones.edit_success = Milestone "%s" has been updated. milestones.deletion = Delete Milestone milestones.deletion_desc = Deleting a milestone removes it from all related issues. Continue? milestones.deletion_success = The milestone has been deleted. -milestones.filter_sort.closest_due_date = Earliest due date -milestones.filter_sort.furthest_due_date = Latest due date +milestones.filter_sort.earliest_due_data = Earliest due date +milestones.filter_sort.latest_due_date = Latest due date milestones.filter_sort.least_complete = Least complete milestones.filter_sort.most_complete = Most complete milestones.filter_sort.most_issues = Most issues diff --git a/templates/repo/issue/milestones.tmpl b/templates/repo/issue/milestones.tmpl index b887a555aad9c..f714d774349eb 100644 --- a/templates/repo/issue/milestones.tmpl +++ b/templates/repo/issue/milestones.tmpl @@ -42,8 +42,8 @@ {{svg "octicon-triangle-down" 14 "dropdown icon"}}
- {{.locale.Tr "repo.milestones.filter_sort.closest_due_date"}} - {{.locale.Tr "repo.milestones.filter_sort.furthest_due_date"}} + {{.locale.Tr "repo.milestones.filter_sort.earliest_due_data"}} + {{.locale.Tr "repo.milestones.filter_sort.latest_due_date"}} {{.locale.Tr "repo.milestones.filter_sort.least_complete"}} {{.locale.Tr "repo.milestones.filter_sort.most_complete"}} {{.locale.Tr "repo.milestones.filter_sort.most_issues"}}