From 5bc7b8baf8dd1269be708e82911168884b3c0b0b Mon Sep 17 00:00:00 2001 From: "Panagiotis \"Ivory\" Vasilopoulos" Date: Tue, 27 Feb 2024 13:35:21 +0100 Subject: [PATCH] [UI] Agit: Add link to docs and tooltip to label Continuation of #2444, which introduced the commit bf7fb89178f41c712b8a8863667a442ec1e1c5d4 but only added the label and the tests. The tooltip explaining what AGit is and its advantages is not meant to advertise AGit - it is meant to inform the reader that is presumably not familiar with the workflow that they will not be able to find a fork or a branch associated with the Pull Request as a direct consequence of this workflow. Issue #2474 mentions that we should show instructions on how to fetch an AGit-created Pull Request, and this is the plan. However, this may take time, so I might as well make the label a bit more "complete" and less out-of-place for now if we do not manage to improve these instructions until the next release (Forgejo v1.22). Refs: https://codeberg.org/forgejo/forgejo/issues/2474 --- options/locale/locale_en-US.ini | 4 +++- templates/repo/issue/view_title.tmpl | 11 +++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 96c594248..b41d81839 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -1508,7 +1508,6 @@ issues.action_check_all = Check/Uncheck all items issues.opened_by = opened %[1]s by %[3]s pulls.merged_by = by %[3]s was merged %[1]s pulls.merged_by_fake = by %[2]s was merged %[1]s -pulls.made_using_agit = AGit issues.closed_by = by %[3]s was closed %[1]s issues.opened_by_fake = opened %[1]s by %[2]s issues.closed_by_fake = by %[2]s was closed %[1]s @@ -1865,6 +1864,9 @@ pulls.clear_merge_message_hint = Clearing the merge message will only remove the pulls.reopen_failed.head_branch = The pull request cannot be reopened, because the head branch doesn't exist anymore. pulls.reopen_failed.base_branch = The pull request cannot be reopened, because the base branch doesn't exist anymore. +pulls.made_using_agit = AGit +pulls.agit_explanation = Created using the AGit workflow. AGit lets contributors propose changes using "git push" without creating a fork or a new branch. + pulls.auto_merge_button_when_succeed = (When checks succeed) pulls.auto_merge_when_succeed = Auto merge when all checks succeed pulls.auto_merge_newly_scheduled = The pull request was scheduled to merge when all checks succeed. diff --git a/templates/repo/issue/view_title.tmpl b/templates/repo/issue/view_title.tmpl index 3f93f3ba3..339def894 100644 --- a/templates/repo/issue/view_title.tmpl +++ b/templates/repo/issue/view_title.tmpl @@ -73,10 +73,13 @@ {{end}} {{if .MadeUsingAGit}} - {{/* TODO: Add tooltip and a link to the documentation */}} - - {{ctx.Locale.Tr "repo.pulls.made_using_agit"}} - + {{/* TODO: Move documentation link to the instructions at the bottom of the PR, show instructions when clicking label */}} + {{/* Note: #agit-label is necessary for testing whether the label appears when it should in tests/integration/git_test.go */}} + + + {{ctx.Locale.Tr "repo.pulls.made_using_agit"}} + + {{end}}