summaryrefslogtreecommitdiffstats
path: root/integrations/editor_test.go
diff options
context:
space:
mode:
authorbugreport0 <32939607+bugreport0@users.noreply.github.com>2018-04-19 14:24:31 +0000
committerLauris BH <lauris@nix.lv>2018-04-19 17:24:31 +0300
commitbac6d05e78603ce9bb028f9ba2b77b9ea2975347 (patch)
tree1df861163e9953ff918be71dafcaa2903d112c80 /integrations/editor_test.go
parent1d82e775ccc8654954fae0d909831d0a77c53307 (diff)
downloadgitea-bac6d05e78603ce9bb028f9ba2b77b9ea2975347.tar.gz
gitea-bac6d05e78603ce9bb028f9ba2b77b9ea2975347.zip
Improve English grammar and consistency. (#3614)
* 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.
Diffstat (limited to 'integrations/editor_test.go')
-rw-r--r--integrations/editor_test.go6
1 files changed, 3 insertions, 3 deletions
diff --git a/integrations/editor_test.go b/integrations/editor_test.go
index 0722a917f0..e2dd2e1dc4 100644
--- a/integrations/editor_test.go
+++ b/integrations/editor_test.go
@@ -52,7 +52,7 @@ func TestCreateFileOnProtectedBranch(t *testing.T) {
// Check if master branch has been locked successfully
flashCookie := session.GetCookie("macaron_flash")
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
req = NewRequest(t, "GET", "/user2/repo1/_new/master/")
@@ -73,7 +73,7 @@ func TestCreateFileOnProtectedBranch(t *testing.T) {
resp = session.MakeRequest(t, req, http.StatusOK)
// Check body for error message
- assert.Contains(t, resp.Body.String(), "Can not commit to protected branch &#39;master&#39;.")
+ assert.Contains(t, resp.Body.String(), "Cannot commit to protected branch &#39;master&#39;.")
// remove the protected branch
csrf = GetCSRF(t, session, "/user2/repo1/settings/branches")
@@ -86,7 +86,7 @@ func TestCreateFileOnProtectedBranch(t *testing.T) {
// Check if master branch has been locked successfully
flashCookie = session.GetCookie("macaron_flash")
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)
}