fix tests and languages

Author: lunny

integrations/editor_test.go

@@ -51,7 +51,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%2Bprotect%2Boptions%2Bchanged%2Bsuccessfully.", flashCookie.Value)
+	assert.EqualValues(t, "success%3DBranch%2Bmaster%2Bprotect%2Boptions%2Bchanged%2Bsuccessfully.", flashCookie.Value)
 
 	// Request editor page
 	req = NewRequest(t, "GET", "/user2/repo1/_new/master/")
@@ -73,6 +73,20 @@ func TestCreateFileOnProtectedBranch(t *testing.T) {
 	resp = session.MakeRequest(t, req, http.StatusOK)
 	// Check body for error message
 	assert.Contains(t, string(resp.Body), "Can not commit to protected branch 'master'.")
+
+	// remove the protected branch
+	csrf = GetCSRF(t, session, "/user2/repo1/settings/branches")
+	// Change master branch to protected
+	req = NewRequestWithValues(t, "POST", "/user2/repo1/settings/branches/master", map[string]string{
+		"_csrf":     csrf,
+		"protected": "off",
+	})
+	resp = session.MakeRequest(t, req, http.StatusFound)
+	// 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)
+
 }
 
 func testEditFile(t *testing.T, session *TestSession, user, repo, branch, filePath string) *TestResponse {

integrations/integration_test.go

@@ -269,7 +269,7 @@ func MakeRequest(t testing.TB, req *http.Request, expectedStatus int) *TestRespo
 	mac.ServeHTTP(respWriter, req)
 	if expectedStatus != NoExpectedStatus {
 		assert.EqualValues(t, expectedStatus, respWriter.HeaderCode,
-			"Request URL: %s", req.URL.String())
+			"Request URL: %s %s", req.URL.String(), buffer.String())
 	}
 	return &TestResponse{
 		HeaderCode: respWriter.HeaderCode,

options/locale/locale_en-US.ini

@@ -948,7 +948,6 @@ settings.protected_branch_can_push_no=You can not push
 settings.branch_protection = Branch Protection for <b>%s</b>
 settings.protect_this_branch = Protect this branch
 settings.protect_this_branch_desc = Disable force pushes and prevent deletion.
-settings.update_protect_branch_success = Branch protect options changed successfully.
 settings.protect_whitelist_committers = Whitelist who can push to this branch
 settings.protect_whitelist_committers_desc = Add users or teams to this branch's whitelist. Whitelisted users bypass the typical push restrictions.
 settings.protect_whitelist_users = Users who can push to this branch
@@ -957,9 +956,8 @@ settings.protect_whitelist_teams = Teams whose members can push to this branch.
 settings.protect_whitelist_search_teams = Search teams
 settings.add_protected_branch=Enable protection
 settings.delete_protected_branch=Disable protection
-settings.add_protected_branch_success=%s Locked successfully
-settings.add_protected_branch_failed= %s Locked failed
-settings.remove_protected_branch_success=%s Unlocked successfully
+settings.update_protect_branch_success = Branch %s protect options changed successfully.
+settings.remove_protected_branch_success= Branch %s protect options removed successfully
 settings.protected_branch_deletion=To delete a protected branch
 settings.protected_branch_deletion_desc=Anyone with write permissions will be able to push directly to this branch. Are you sure?
 settings.default_branch_desc = The default branch is considered the "base" branch in your repository against which all pull requests and code commits are automatically made, unless you specify a different branch.

routers/repo/setting_protected_branch.go

@@ -171,7 +171,7 @@ func SettingsProtectedBranchPost(ctx *context.Context, f auth.ProtectBranchForm)
 			ctx.Handle(500, "UpdateProtectBranch", err)
 			return
 		}
-		ctx.Flash.Success(ctx.Tr("repo.settings.update_protect_branch_success"))
+		ctx.Flash.Success(ctx.Tr("repo.settings.update_protect_branch_success", branch))
 		ctx.Redirect(fmt.Sprintf("%s/settings/branches/%s", ctx.Repo.RepoLink, branch))
 	} else {
 		if protectBranch != nil {
@@ -180,7 +180,7 @@ func SettingsProtectedBranchPost(ctx *context.Context, f auth.ProtectBranchForm)
 				return
 			}
 		}
-		ctx.Flash.Success(ctx.Tr("repo.settings.remove_protected_branch_success"))
+		ctx.Flash.Success(ctx.Tr("repo.settings.remove_protected_branch_success", branch))
 		ctx.Redirect(fmt.Sprintf("%s/settings/branches", ctx.Repo.RepoLink))
 	}
 }