peter/go-gitea
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed displaying of error messages in language

Browse Source 
Signed-off-by: Konrad <konrad@kola-entertainments.de>
This commit is contained in:
Konrad Langenberg 2017-09-27 12:16:28 +02:00 committed by Konrad
parent 7f30180875
commit ace8f616b3
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
options/locale/locale_en-US.ini
View File

@ -745,6 +745,7 @@ issues.dependency.setting = Issues can have dependencies
issues.dependency.add_error_same_issue = You cannot make an issue depend on itself!
issues.dependency.add_error_dep_not_exist = Dependend issue does not exist!
issues.dependency.add_error_dep_exists = Dependency already exists!
issues.dependency.add_error_dep_not_same_repo = Both issues must be in the same repo!
issues.tracker = Time tracker
issues.start_tracking_short = Start
issues.start_tracking = Start time tracking

8
routers/repo/issue_dependency_add.go
View File

@ -40,7 +40,7 @@ func AddDependency(c *context.Context) {
// Dependency
dep, err := models.GetIssueByID(depID)
if err != nil {
c.Flash.Error(c.Tr("add_error_dep_not_exist"))
c.Flash.Error(c.Tr("repo.issues.dependency.add_error_dep_not_exist"))
url := fmt.Sprintf("%s/issues/%d", c.Repo.RepoLink, issueIndex)
c.Redirect(url, http.StatusSeeOther)
return
@ -48,7 +48,7 @@ func AddDependency(c *context.Context) {
// Check if both issues are in the same repo
if issue.RepoID != dep.RepoID {
c.Flash.Error(c.Tr("add_error_dep_not_same_repo"))
c.Flash.Error(c.Tr("repo.issues.dependency.add_error_dep_not_same_repo"))
url := fmt.Sprintf("%s/issues/%d", c.Repo.RepoLink, issueIndex)
c.Redirect(url, http.StatusSeeOther)
return
@ -56,7 +56,7 @@ func AddDependency(c *context.Context) {
// Check if issue and dependency is the same
if dep.Index == issueIndex {
c.Flash.Error(c.Tr("issues.dependency.add_error_same_issue"))
c.Flash.Error(c.Tr("repo.issues.dependency.add_error_same_issue"))
} else {
exists, err := models.CreateIssueDependency(c.User, issue, dep)
@ -66,7 +66,7 @@ func AddDependency(c *context.Context) {
}
if exists {
c.Flash.Error(c.Tr("add_error_dep_exists"))
c.Flash.Error(c.Tr("repo.issues.dependency.add_error_dep_exists"))
}
}