Skip to content

Commit ab961b4

Browse files
zjjhotzjjhot
committed
Merge branch 'main' of https://github.com/go-gitea/gitea
* 'main' of https://github.com/go-gitea/gitea: Refactor webhooks i18n (go-gitea#18380)
2 parents 653a582 + 5506cb9 commit ab961b4

File tree

13 files changed

+37
-31
lines changed

13 files changed

+37
-31
lines changed

‎options/locale/locale_en-US.ini‎

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1936,18 +1936,23 @@ settings.update_hook_success = The webhook has been updated.
19361936
settings.delete_webhook = Remove Webhook
19371937
settings.recent_deliveries = Recent Deliveries
19381938
settings.hook_type = Hook Type
1939-
settings.add_slack_hook_desc = Integrate <a href="%s">Slack</a> into your repository.
19401939
settings.slack_token = Token
19411940
settings.slack_domain = Domain
19421941
settings.slack_channel = Channel
1943-
settings.add_discord_hook_desc = Integrate <a href="%s">Discord</a> into your repository.
1944-
settings.add_dingtalk_hook_desc = Integrate <a href="%s">Dingtalk</a> into your repository.
1945-
settings.add_telegram_hook_desc = Integrate <a href="%s">Telegram</a> into your repository.
1946-
settings.add_matrix_hook_desc = Integrate <a href="%s">Matrix</a> into your repository.
1947-
settings.add_msteams_hook_desc = Integrate <a href="%s">Microsoft Teams</a> into your repository.
1948-
settings.add_feishu_hook_desc = Integrate <a href="%s">Feishu</a> into your repository.
1949-
settings.add_Wechat_hook_desc = Integrate <a href="%s">Wechatwork</a> into your repository.
1950-
settings.add_packagist_hook_desc = Integrate <a href="%s">Packagist</a> into your repository.
1942+
settings.add_web_hook_desc = Integrate <a target="_blank" rel="noreferrer" href="%s">%s</a> into your repository.
1943+
settings.web_hook_name_gitea = Gitea
1944+
settings.web_hook_name_gogs = Gogs
1945+
settings.web_hook_name_slack = Slack
1946+
settings.web_hook_name_discord = Discord
1947+
settings.web_hook_name_dingtalk = DingTalk
1948+
settings.web_hook_name_telegram = Telegram
1949+
settings.web_hook_name_matrix = Matrix
1950+
settings.web_hook_name_msteams = Microsoft Teams
1951+
settings.web_hook_name_feishu_or_larksuite = Feishu / Lark Suite
1952+
settings.web_hook_name_feishu = Feishu
1953+
settings.web_hook_name_larksuite = Lark Suite
1954+
settings.web_hook_name_wechatwork = WeCom (Wechat Work)
1955+
settings.web_hook_name_packagist = Packagist
19511956
settings.packagist_username = Packagist username
19521957
settings.packagist_api_token = API token
19531958
settings.packagist_package_url = Packagist package URL

‎templates/repo/settings/webhook/base_list.tmpl‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,37 +5,37 @@
55
<div class="ui blue tiny button">{{.i18n.Tr "repo.settings.add_webhook"}}</div>
66
<div class="menu">
77
<a class="item" href="{{.BaseLinkNew}}/gitea/new">
8-
<img width="20" height="20" src="{{AssetUrlPrefix}}/img/gitea.svg">Gitea
8+
<img width="20" height="20" src="{{AssetUrlPrefix}}/img/gitea.svg">{{.i18n.Tr "repo.settings.web_hook_name_gitea"}}
99
</a>
1010
<a class="item" href="{{.BaseLinkNew}}/gogs/new">
11-
<img width="20" height="20" src="{{AssetUrlPrefix}}/img/gogs.ico">Gogs
11+
<img width="20" height="20" src="{{AssetUrlPrefix}}/img/gogs.ico">{{.i18n.Tr "repo.settings.web_hook_name_gogs"}}
1212
</a>
1313
<a class="item" href="{{.BaseLinkNew}}/slack/new">
14-
<img width="20" height="20" src="{{AssetUrlPrefix}}/img/slack.png">Slack
14+
<img width="20" height="20" src="{{AssetUrlPrefix}}/img/slack.png">{{.i18n.Tr "repo.settings.web_hook_name_slack"}}
1515
</a>
1616
<a class="item" href="{{.BaseLinkNew}}/discord/new">
17-
<img width="20" height="20" src="{{AssetUrlPrefix}}/img/discord.png">Discord
17+
<img width="20" height="20" src="{{AssetUrlPrefix}}/img/discord.png">{{.i18n.Tr "repo.settings.web_hook_name_discord"}}
1818
</a>
1919
<a class="item" href="{{.BaseLinkNew}}/dingtalk/new">
20-
<img width="20" height="20" src="{{AssetUrlPrefix}}/img/dingtalk.ico">Dingtalk
20+
<img width="20" height="20" src="{{AssetUrlPrefix}}/img/dingtalk.ico">{{.i18n.Tr "repo.settings.web_hook_name_dingtalk"}}
2121
</a>
2222
<a class="item" href="{{.BaseLinkNew}}/telegram/new">
23-
<img width="20" height="20" src="{{AssetUrlPrefix}}/img/telegram.png">Telegram
23+
<img width="20" height="20" src="{{AssetUrlPrefix}}/img/telegram.png">{{.i18n.Tr "repo.settings.web_hook_name_telegram"}}
2424
</a>
2525
<a class="item" href="{{.BaseLinkNew}}/msteams/new">
26-
<img width="20" height="20" src="{{AssetUrlPrefix}}/img/msteams.png">Microsoft Teams
26+
<img width="20" height="20" src="{{AssetUrlPrefix}}/img/msteams.png">{{.i18n.Tr "repo.settings.web_hook_name_msteams"}}
2727
</a>
2828
<a class="item" href="{{.BaseLinkNew}}/feishu/new">
29-
<img width="20" height="20" src="{{AssetUrlPrefix}}/img/feishu.png">Feishu
29+
<img width="20" height="20" src="{{AssetUrlPrefix}}/img/feishu.png">{{.i18n.Tr "repo.settings.web_hook_name_feishu_or_larksuite"}}
3030
</a>
3131
<a class="item" href="{{.BaseLinkNew}}/matrix/new">
32-
<img width="20" height="20" src="{{AssetUrlPrefix}}/img/matrix.svg">Matrix
32+
<img width="20" height="20" src="{{AssetUrlPrefix}}/img/matrix.svg">{{.i18n.Tr "repo.settings.web_hook_name_matrix"}}
3333
</a>
3434
<a class="item" href="{{.BaseLinkNew}}/wechatwork/new">
35-
<img width="20" height="20" src="{{AssetUrlPrefix}}/img/wechatwork.png">Wechatwork
35+
<img width="20" height="20" src="{{AssetUrlPrefix}}/img/wechatwork.png">{{.i18n.Tr "repo.settings.web_hook_name_wechatwork"}}
3636
</a>
3737
<a class="item" href="{{.BaseLinkNew}}/packagist/new">
38-
<img width="20" height="20" src="{{AssetUrlPrefix}}/img/packagist.png">Packagist
38+
<img width="20" height="20" src="{{AssetUrlPrefix}}/img/packagist.png">{{.i18n.Tr "repo.settings.web_hook_name_packagist"}}
3939
</a>
4040
</div>
4141
</div>

‎templates/repo/settings/webhook/dingtalk.tmpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{{if eq .HookType "dingtalk"}}
2-
<p>{{.i18n.Tr "repo.settings.add_dingtalk_hook_desc" "https://dingtalk.com" | Str2html}}</p>
2+
<p>{{.i18n.Tr "repo.settings.add_web_hook_desc" "https://dingtalk.com" (.i18n.Tr "repo.settings.web_hook_name_dingtalk") | Str2html}}</p>
33
<form class="ui form" action="{{.BaseLink}}/dingtalk/{{or .Webhook.ID "new"}}" method="post">
44
{{.CsrfTokenHtml}}
55
<div class="required field {{if .Err_PayloadURL}}error{{end}}">

‎templates/repo/settings/webhook/discord.tmpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{{if eq .HookType "discord"}}
2-
<p>{{.i18n.Tr "repo.settings.add_discord_hook_desc" "https://discord.com" | Str2html}}</p>
2+
<p>{{.i18n.Tr "repo.settings.add_web_hook_desc" "https://discord.com" (.i18n.Tr "repo.settings.web_hook_name_discord") | Str2html}}</p>
33
<form class="ui form" action="{{.BaseLink}}/discord/{{or .Webhook.ID "new"}}" method="post">
44
{{.CsrfTokenHtml}}
55
<div class="required field {{if .Err_PayloadURL}}error{{end}}">

‎templates/repo/settings/webhook/feishu.tmpl‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{{if eq .HookType "feishu"}}
2-
<p>{{.i18n.Tr "repo.settings.add_feishu_hook_desc" "https://feishu.cn" | Str2html}}</p>
2+
<p>{{.i18n.Tr "repo.settings.add_web_hook_desc" "https://feishu.cn" (.i18n.Tr "repo.settings.web_hook_name_feishu") | Str2html}}</p>
3+
<p>{{.i18n.Tr "repo.settings.add_web_hook_desc" "https://larksuite.com" (.i18n.Tr "repo.settings.web_hook_name_larksuite") | Str2html}}</p>
34
<form class="ui form" action="{{.BaseLink}}/feishu/{{or .Webhook.ID "new"}}" method="post">
45
{{.CsrfTokenHtml}}
56
<div class="required field {{if .Err_PayloadURL}}error{{end}}">

‎templates/repo/settings/webhook/gitea.tmpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{{if eq .HookType "gitea"}}
2-
<p>{{.i18n.Tr "repo.settings.add_webhook_desc" "https://docs.gitea.io/en-us/webhooks/" | Str2html}}</p>
2+
<p>{{.i18n.Tr "repo.settings.add_web_hook_desc" "https://docs.gitea.io/en-us/webhooks/" (.i18n.Tr "repo.settings.web_hook_name_gitea") | Str2html}}</p>
33
<form class="ui form" action="{{.BaseLink}}/gitea/{{or .Webhook.ID "new"}}" method="post">
44
{{template "base/disable_form_autofill"}}
55
{{.CsrfTokenHtml}}

‎templates/repo/settings/webhook/gogs.tmpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{{if eq .HookType "gogs"}}
2-
<p>{{.i18n.Tr "repo.settings.add_webhook_desc" "https://docs.gitea.io/en-us/webhooks/" | Str2html}}</p>
2+
<p>{{.i18n.Tr "repo.settings.add_web_hook_desc" "https://docs.gitea.io/en-us/webhooks/" (.i18n.Tr "repo.settings.web_hook_name_gogs") | Str2html}}</p>
33
<form class="ui form" action="{{.BaseLink}}/gogs/{{or .Webhook.ID "new"}}" method="post">
44
{{template "base/disable_form_autofill"}}
55
{{.CsrfTokenHtml}}

‎templates/repo/settings/webhook/matrix.tmpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{{if eq .HookType "matrix"}}
2-
<p>{{.i18n.Tr "repo.settings.add_matrix_hook_desc" "https://matrix.org/" | Str2html}}</p>
2+
<p>{{.i18n.Tr "repo.settings.add_web_hook_desc" "https://matrix.org/" (.i18n.Tr "repo.settings.web_hook_name_matrix") | Str2html}}</p>
33
<form class="ui form" action="{{.BaseLink}}/matrix/{{or .Webhook.ID "new"}}" method="post">
44
{{.CsrfTokenHtml}}
55
<div class="required field {{if .Err_HomeserverURL}}error{{end}}">

‎templates/repo/settings/webhook/msteams.tmpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{{if eq .HookType "msteams"}}
2-
<p>{{.i18n.Tr "repo.settings.add_msteams_hook_desc" "https://teams.microsoft.com" | Str2html}}</p>
2+
<p>{{.i18n.Tr "repo.settings.add_web_hook_desc" "https://teams.microsoft.com" (.i18n.Tr "repo.settings.web_hook_name_msteams") | Str2html}}</p>
33
<form class="ui form" action="{{.BaseLink}}/msteams/{{or .Webhook.ID "new"}}" method="post">
44
{{.CsrfTokenHtml}}
55
<div class="required field {{if .Err_PayloadURL}}error{{end}}">

‎templates/repo/settings/webhook/packagist.tmpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{{if eq .HookType "packagist"}}
2-
<p>{{.i18n.Tr "repo.settings.add_packagist_hook_desc" "https://packagist.org" | Str2html}}</p>
2+
<p>{{.i18n.Tr "repo.settings.add_web_hook_desc" "https://packagist.org" (.i18n.Tr "repo.settings.web_hook_name_packagist") | Str2html}}</p>
33
<form class="ui form" action="{{.BaseLink}}/packagist/{{or .Webhook.ID "new"}}" method="post">
44
{{.CsrfTokenHtml}}
55
<div class="required field {{if .Err_Username}}error{{end}}">

0 commit comments

Comments
 (0)