mirrors
/
forgejo
mirror of
1
Fork 0
Code Issues Releases Activity

Merge pull request '[UI] Agit: Add link to docs and tooltip to label' (#2499) from n0toose/agit-add-ui-hints into forgejo 

Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2499
Reviewed-by: Otto <otto@codeberg.org>
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
This commit is contained in:
Earl Warren 2024-02-27 17:46:58 +00:00
parent 6cbc64e0a5 5bc7b8baf8
commit c39321c6ca
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
options/locale/locale_en-US.ini
View File

@ -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> 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 = by <a href="%[2]s">%[3]s</a> was merged %[1]s
pulls.merged_by_fake = by %[2]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 <a href="%[2]s">%[3]s</a> was closed %[1]s 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.opened_by_fake = opened %[1]s by %[2]s
issues.closed_by_fake = by %[2]s was closed %[1]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.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.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_button_when_succeed = (When checks succeed)
pulls.auto_merge_when_succeed = Auto merge when all 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. pulls.auto_merge_newly_scheduled = The pull request was scheduled to merge when all checks succeed.

11
templates/repo/issue/view_title.tmpl
View File

@ -73,10 +73,13 @@
</span> </span>
{{end}} {{end}}
{{if .MadeUsingAGit}} {{if .MadeUsingAGit}}
{{/* TODO: Add tooltip and a link to the documentation */}} {{/* TODO: Move documentation link to the instructions at the bottom of the PR, show instructions when clicking label */}}
<span id="agit-label" class="ui small 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"}} <a target="_blank" rel="noopener" href="https://forgejo.org/docs/latest/user/agit-support/">
</span> <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}} {{end}}
<span id="pull-desc-edit" class="gt-hidden flex-text-block"> <span id="pull-desc-edit" class="gt-hidden flex-text-block">
<div class="ui floating filter dropdown"> <div class="ui floating filter dropdown">