realaravinth/forgejo-federation
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity

Re-separate the color translation strings (#17390)

Browse source 
Fix #17384

Signed-off-by: Andrew Thornton <art27@cantab.net>
This commit is contained in:
zeripath 2021-10-21 22:51:03 +01:00 committed by GitHub
parent a115309f4f
commit 09938ccd99
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 7 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

@ -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. 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 never = Never
color = Color
[error] [error]
occurred = An error has occurred occurred = An error has occurred
@ -984,6 +983,7 @@ commit_graph = Commit Graph
commit_graph.select = Select branches commit_graph.select = Select branches
commit_graph.hide_pr_refs = Hide Pull Requests commit_graph.hide_pr_refs = Hide Pull Requests
commit_graph.monochrome = Mono commit_graph.monochrome = Mono
commit_graph.color = Color
blame = Blame blame = Blame
normal_view = Normal View normal_view = Normal View
line = line 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.set_default_desc = "Set this board as default for uncategorized issues and pulls"
projects.board.delete = "Delete Board" projects.board.delete = "Delete Board"
projects.board.deletion_desc = "Deleting a project board moves all related issues to 'Uncategorized'. Continue?" projects.board.deletion_desc = "Deleting a project board moves all related issues to 'Uncategorized'. Continue?"
projects.board.color = "Color"
projects.open = Open projects.open = Open
projects.close = Close projects.close = Close
@ -1803,6 +1804,7 @@ settings.content_type = POST Content Type
settings.secret = Secret settings.secret = Secret
settings.slack_username = Username settings.slack_username = Username
settings.slack_icon_url = Icon URL settings.slack_icon_url = Icon URL
settings.slack_color = Color
settings.discord_username = Username settings.discord_username = Username
settings.discord_icon_url = Icon URL settings.discord_icon_url = Icon URL
settings.event_desc = Trigger On: settings.event_desc = Trigger On:

2
templates/repo/graph.tmpl
View file

@ -47,7 +47,7 @@
</div> </div>
</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-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> </div>
</h2> </h2>
<div class="ui dividing"></div> <div class="ui dividing"></div>

4
templates/repo/projects/view.tmpl
View file

@ -23,7 +23,7 @@
</div> </div>
<div class="field color-field"> <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"> <div class="color picker column">
<input class="color-picker" maxlength="7" placeholder="#c320f6" id="new_board_color_picker" name="color"> <input class="color-picker" maxlength="7" placeholder="#c320f6" id="new_board_color_picker" name="color">
<div class="column precolors"> <div class="column precolors">
@ -116,7 +116,7 @@
</div> </div>
<div class="field color-field"> <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"> <div class="color picker column">
<input class="color-picker" maxlength="7" placeholder="#c320f6" id="new_board_color" name="color" value="{{.Color}}"> <input class="color-picker" maxlength="7" placeholder="#c320f6" id="new_board_color" name="color" value="{{.Color}}">
<div class="column precolors"> <div class="column precolors">

2
templates/repo/settings/webhook/slack.tmpl
View file

@ -20,7 +20,7 @@
<input id="icon_url" name="icon_url" value="{{.SlackHook.IconURL}}" placeholder="e.g. https://example.com/img/favicon.png"> <input id="icon_url" name="icon_url" value="{{.SlackHook.IconURL}}" placeholder="e.g. https://example.com/img/favicon.png">
</div> </div>
<div class="field"> <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"> <input id="color" name="color" value="{{.SlackHook.Color}}" placeholder="e.g. #dd4b39, good, warning, danger">
</div> </div>
{{template "repo/settings/webhook/settings" .}} {{template "repo/settings/webhook/settings" .}}