Show More
@@ -273,7 +273,12 b' def merge_pull_request(request, apiuser,' | |||||
273 | merge_possible = not check.failed |
|
273 | merge_possible = not check.failed | |
274 |
|
274 | |||
275 | if not merge_possible: |
|
275 | if not merge_possible: | |
276 | reasons = ','.join([msg for _e, msg in check.errors]) |
|
276 | error_messages = [] | |
|
277 | for err_type, error_msg in check.errors: | |||
|
278 | error_msg = request.translate(error_msg) | |||
|
279 | error_messages.append(error_msg) | |||
|
280 | ||||
|
281 | reasons = ','.join(error_messages) | |||
277 | raise JSONRPCError( |
|
282 | raise JSONRPCError( | |
278 | 'merge not possible for following reasons: {}'.format(reasons)) |
|
283 | 'merge not possible for following reasons: {}'.format(reasons)) | |
279 |
|
284 |
General Comments 0
You need to be logged in to leave comments.
Login now