diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 96c5942486..b41d818399 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 <a href="%[2]s">%[3]s</a> pulls.merged_by = by <a href="%[2]s">%[3]s</a> was merged %[1]s pulls.merged_by_fake = by %[2]s was merged %[1]s -pulls.made_using_agit = AGit issues.closed_by = by <a href="%[2]s">%[3]s</a> 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 3f93f3ba35..339def894c 100644 --- a/templates/repo/issue/view_title.tmpl +++ b/templates/repo/issue/view_title.tmpl @@ -73,10 +73,13 @@ </span> {{end}} {{if .MadeUsingAGit}} - {{/* TODO: Add tooltip and a link to the documentation */}} - <span id="agit-label" class="ui small label"> - {{ctx.Locale.Tr "repo.pulls.made_using_agit"}} - </span> + {{/* 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 */}} + <a target="_blank" rel="noopener" href="https://forgejo.org/docs/latest/user/agit-support/"> + <span id="agit-label" data-tooltip-content="{{ctx.Locale.Tr "repo.pulls.agit_explanation"}}" class="ui small label"> + {{ctx.Locale.Tr "repo.pulls.made_using_agit"}} + </span> + </a> {{end}} <span id="pull-desc-edit" class="gt-hidden flex-text-block"> <div class="ui floating filter dropdown">