From 09938ccd99d8484c6cf624d7edd7809375964a8b Mon Sep 17 00:00:00 2001 From: zeripath Date: Thu, 21 Oct 2021 22:51:03 +0100 Subject: [PATCH] Re-separate the color translation strings (#17390) Fix #17384 Signed-off-by: Andrew Thornton --- options/locale/locale_en-US.ini | 4 +++- templates/repo/graph.tmpl | 2 +- templates/repo/projects/view.tmpl | 4 ++-- 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 does not exist or you are not authorized 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 @@ - +
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 @@
- +
@@ -116,7 +116,7 @@
- +
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 @@
- +
{{template "repo/settings/webhook/settings" .}}