diff options
| author | zeripath <art27@cantab.net> | 2021-10-21 22:51:03 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-21 23:51:03 +0200 |
| commit | 09938ccd99d8484c6cf624d7edd7809375964a8b (patch) | |
| tree | 31ed2bded6c6cbfa31a1ee27feb3a57db02d7220 | |
| parent | a115309f4f2e3389d8d86aff8e827b59ebc090fa (diff) | |
| download | gitea-09938ccd99d8484c6cf624d7edd7809375964a8b.tar.gz gitea-09938ccd99d8484c6cf624d7edd7809375964a8b.zip | |
Re-separate the color translation strings (#17390)
Fix #17384
Signed-off-by: Andrew Thornton <art27@cantab.net>
| -rw-r--r-- | options/locale/locale_en-US.ini | 4 | ||||
| -rw-r--r-- | templates/repo/graph.tmpl | 2 | ||||
| -rw-r--r-- | templates/repo/projects/view.tmpl | 4 | ||||
| -rw-r--r-- | templates/repo/settings/webhook/slack.tmpl | 2 |
4 files changed, 7 insertions, 5 deletions
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 22fe9ae2f8..31d5bf08c6 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -96,7 +96,6 @@ error = Error error404 = The page you are trying to reach either <strong>does not exist</strong> or <strong>you are not authorized</strong> to view it. never = Never -color = Color [error] occurred = An error has occurred @@ -984,6 +983,7 @@ commit_graph = Commit Graph commit_graph.select = Select branches commit_graph.hide_pr_refs = Hide Pull Requests commit_graph.monochrome = Mono +commit_graph.color = Color blame = Blame normal_view = Normal View line = line @@ -1100,6 +1100,7 @@ projects.board.set_default = "Set Default" projects.board.set_default_desc = "Set this board as default for uncategorized issues and pulls" projects.board.delete = "Delete Board" projects.board.deletion_desc = "Deleting a project board moves all related issues to 'Uncategorized'. Continue?" +projects.board.color = "Color" projects.open = Open projects.close = Close @@ -1803,6 +1804,7 @@ settings.content_type = POST Content Type settings.secret = Secret settings.slack_username = Username settings.slack_icon_url = Icon URL +settings.slack_color = Color settings.discord_username = Username settings.discord_icon_url = Icon URL settings.event_desc = Trigger On: diff --git a/templates/repo/graph.tmpl b/templates/repo/graph.tmpl index 963bf0449a..e3b5cd3878 100644 --- a/templates/repo/graph.tmpl +++ b/templates/repo/graph.tmpl @@ -47,7 +47,7 @@ </div> </div> <button id="flow-color-monochrome" class="ui labelled icon button{{if eq .Mode "monochrome"}} active{{end}}" title="{{.i18n.Tr "repo.commit_graph.monochrome"}}">{{svg "material-invert-colors" 16 "mr-2"}}{{.i18n.Tr "repo.commit_graph.monochrome"}}</button> - <button id="flow-color-colored" class="ui labelled icon button{{if ne .Mode "monochrome"}} active{{end}}" title="{{.i18n.Tr "color"}}">{{svg "material-palette" 16 "mr-2"}}{{.i18n.Tr "color"}}</button> + <button id="flow-color-colored" class="ui labelled icon button{{if ne .Mode "monochrome"}} active{{end}}" title="{{.i18n.Tr "repo.commit_graph.color"}}">{{svg "material-palette" 16 "mr-2"}}{{.i18n.Tr "repo.commit_graph.color"}}</button> </div> </h2> <div class="ui dividing"></div> diff --git a/templates/repo/projects/view.tmpl b/templates/repo/projects/view.tmpl index d4a2eaa4c3..d97a0f5942 100644 --- a/templates/repo/projects/view.tmpl +++ b/templates/repo/projects/view.tmpl @@ -23,7 +23,7 @@ </div> <div class="field color-field"> - <label for="new_board_color">{{$.i18n.Tr "color"}}</label> + <label for="new_board_color">{{$.i18n.Tr "repo.projects.board.color"}}</label> <div class="color picker column"> <input class="color-picker" maxlength="7" placeholder="#c320f6" id="new_board_color_picker" name="color"> <div class="column precolors"> @@ -116,7 +116,7 @@ </div> <div class="field color-field"> - <label for="new_board_color">{{$.i18n.Tr "color"}}</label> + <label for="new_board_color">{{$.i18n.Tr "repo.projects.board.color"}}</label> <div class="color picker column"> <input class="color-picker" maxlength="7" placeholder="#c320f6" id="new_board_color" name="color" value="{{.Color}}"> <div class="column precolors"> diff --git a/templates/repo/settings/webhook/slack.tmpl b/templates/repo/settings/webhook/slack.tmpl index 12e112acca..d7b6eebf3b 100644 --- a/templates/repo/settings/webhook/slack.tmpl +++ b/templates/repo/settings/webhook/slack.tmpl @@ -20,7 +20,7 @@ <input id="icon_url" name="icon_url" value="{{.SlackHook.IconURL}}" placeholder="e.g. https://example.com/img/favicon.png"> </div> <div class="field"> - <label for="color">{{.i18n.Tr "color"}}</label> + <label for="color">{{.i18n.Tr "repo.settings.slack_color"}}</label> <input id="color" name="color" value="{{.SlackHook.Color}}" placeholder="e.g. #dd4b39, good, warning, danger"> </div> {{template "repo/settings/webhook/settings" .}} |