# HG changeset patch # User Marcin Kuzminski # Date 2017-05-29 18:00:38 # Node ID 7e2da6cbda65264b7b978c4d5a30b1953ba501bf # Parent 98d57cd2672a305ea9ef6bcfd7e86174634b1907 pull-requests: fixed translation of error messages via merge-api. - fixes #5325 diff --git a/rhodecode/api/views/pull_request_api.py b/rhodecode/api/views/pull_request_api.py --- a/rhodecode/api/views/pull_request_api.py +++ b/rhodecode/api/views/pull_request_api.py @@ -273,7 +273,12 @@ def merge_pull_request(request, apiuser, merge_possible = not check.failed if not merge_possible: - reasons = ','.join([msg for _e, msg in check.errors]) + error_messages = [] + for err_type, error_msg in check.errors: + error_msg = request.translate(error_msg) + error_messages.append(error_msg) + + reasons = ','.join(error_messages) raise JSONRPCError( 'merge not possible for following reasons: {}'.format(reasons))