* Start improving English grammar and consistency. * Apply review comments, push translation further. * Additional review changes; expand translation. * Undo team/organization change, further translation. * Add site administration; review comments; merge. * Update hardcoded branch protection string tests. * Update hardcoded branch deletion string test. * Update another hardcoded translation string test. * Add my nickname to the list of translators. * Implement @lafriks review comments. * Remove (now) unused branch deletion warnings. * Remove (now) unused branch deletion warnings.tags/v1.5.0-dev
// Check if master branch has been locked successfully | // Check if master branch has been locked successfully | ||||
flashCookie := session.GetCookie("macaron_flash") | flashCookie := session.GetCookie("macaron_flash") | ||||
assert.NotNil(t, flashCookie) | assert.NotNil(t, flashCookie) | ||||
assert.EqualValues(t, "success%3DBranch%2Bmaster%2Bprotect%2Boptions%2Bchanged%2Bsuccessfully.", flashCookie.Value) | |||||
assert.EqualValues(t, "success%3DBranch%2Bprotection%2Bfor%2Bbranch%2B%2527master%2527%2Bhas%2Bbeen%2Bupdated.", flashCookie.Value) | |||||
// Request editor page | // Request editor page | ||||
req = NewRequest(t, "GET", "/user2/repo1/_new/master/") | req = NewRequest(t, "GET", "/user2/repo1/_new/master/") | ||||
resp = session.MakeRequest(t, req, http.StatusOK) | resp = session.MakeRequest(t, req, http.StatusOK) | ||||
// Check body for error message | // Check body for error message | ||||
assert.Contains(t, resp.Body.String(), "Can not commit to protected branch 'master'.") | |||||
assert.Contains(t, resp.Body.String(), "Cannot commit to protected branch 'master'.") | |||||
// remove the protected branch | // remove the protected branch | ||||
csrf = GetCSRF(t, session, "/user2/repo1/settings/branches") | csrf = GetCSRF(t, session, "/user2/repo1/settings/branches") | ||||
// Check if master branch has been locked successfully | // Check if master branch has been locked successfully | ||||
flashCookie = session.GetCookie("macaron_flash") | flashCookie = session.GetCookie("macaron_flash") | ||||
assert.NotNil(t, flashCookie) | assert.NotNil(t, flashCookie) | ||||
assert.EqualValues(t, "success%3DBranch%2Bmaster%2Bprotect%2Boptions%2Bremoved%2Bsuccessfully", flashCookie.Value) | |||||
assert.EqualValues(t, "success%3DBranch%2Bprotection%2Bfor%2Bbranch%2B%2527master%2527%2Bhas%2Bbeen%2Bdisabled.", flashCookie.Value) | |||||
} | } | ||||
htmlDoc := NewHTMLParser(t, resp.Body) | htmlDoc := NewHTMLParser(t, resp.Body) | ||||
resultMsg := htmlDoc.doc.Find(".ui.message>p").Text() | resultMsg := htmlDoc.doc.Find(".ui.message>p").Text() | ||||
assert.EqualValues(t, "user1/feature/test has been deleted.", resultMsg) | |||||
assert.EqualValues(t, "Branch 'user1/feature/test' has been deleted.", resultMsg) | |||||
} | } |
Arthur Aslanyan <arthur DOT e DOT aslanyan AT gmail DOT com> | Arthur Aslanyan <arthur DOT e DOT aslanyan AT gmail DOT com> | ||||
Aurelien Darragon <aurelien DOT darragon AT gmail DOT com> | Aurelien Darragon <aurelien DOT darragon AT gmail DOT com> | ||||
Barış Arda Yılmaz <ardayilmazgamer AT gmail DOT com> | Barış Arda Yılmaz <ardayilmazgamer AT gmail DOT com> | ||||
bugreport0 | |||||
Camille Baronnet <gogs AT camillebaronnet DOT fr> | Camille Baronnet <gogs AT camillebaronnet DOT fr> | ||||
Christoph Kisfeld <christoph DOT kisfeld AT gmail DOT com> | Christoph Kisfeld <christoph DOT kisfeld AT gmail DOT com> | ||||
Cysioland | Cysioland |
</div> | </div> | ||||
<div class="content"> | <div class="content"> | ||||
<p>{{.i18n.Tr "repo.branch.delete_desc"}}</p> | <p>{{.i18n.Tr "repo.branch.delete_desc"}}</p> | ||||
{{.i18n.Tr "repo.branch.delete_notices_1" | Safe}}<br> | |||||
{{.i18n.Tr "repo.branch.delete_notices_html"}} <span class="branch-name"></span><br> | |||||
</div> | </div> | ||||
{{template "base/delete_modal_actions" .}} | {{template "base/delete_modal_actions" .}} | ||||
</div> | </div> |
</div> | </div> | ||||
<div class="content"> | <div class="content"> | ||||
<p>{{.i18n.Tr "repo.branch.delete_desc"}}</p> | <p>{{.i18n.Tr "repo.branch.delete_desc"}}</p> | ||||
{{.i18n.Tr "repo.branch.delete_notices_1" | Safe}}<br> | |||||
{{.i18n.Tr "repo.branch.delete_notices_2" .HeadTarget}}<br> | |||||
</div> | </div> | ||||
{{template "base/delete_modal_actions" .}} | {{template "base/delete_modal_actions" .}} | ||||
</div> | </div> |