From 86be8281482844c756cb73e396d6a682a0662f4d Mon Sep 17 00:00:00 2001 From: kolaente Date: Sat, 6 Jan 2018 23:04:43 +0100 Subject: [PATCH] Added more specific locale --- options/locale/locale_en-US.ini | 5 +++-- templates/repo/issue/view_content/sidebar.tmpl | 6 +++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index f3c8ed8e6..0aab94f5e 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -748,8 +748,9 @@ issues.dependency.pr_close_blocked = You need to close all issues blocking this issues.dependency.blocks_short = Blocks issues.dependency.blocked_by_short = Blocked by issues.dependency.remove_header = Remove Dependency -issues.dependency.remove_text = This will remove the dependency to this issue. Are you sure? You cannot undo this! -issues.dependency.setting = Issues can have dependencies +issues.dependency.issue_remove_text = This will remove the dependency to this issue. Are you sure? You cannot undo this! +issues.dependency.pr_remove_text = This will remove the dependency to this pull request. Are you sure? You cannot undo this! +issues.dependency.setting = Issues & PRs can have dependencies issues.dependency.add_error_same_issue = You cannot make an issue depend on itself! issues.dependency.add_error_dep_not_exist = Dependent issue does not exist! issues.dependency.add_error_dep_exists = Dependency already exists! diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl index ce0316e07..0837e39fe 100644 --- a/templates/repo/issue/view_content/sidebar.tmpl +++ b/templates/repo/issue/view_content/sidebar.tmpl @@ -312,7 +312,11 @@ -

{{.i18n.Tr "repo.issues.dependency.remove_text"}}

+

{{if .Issue.IsPull}} + {{.i18n.Tr "repo.issues.dependency.pr_remove_text"}} + {{else}} + {{.i18n.Tr "repo.issues.dependency.issue_remove_text"}} + {{end}}