diff --git a/rhodecode/lib/vcs/conf/settings.py b/rhodecode/lib/vcs/conf/settings.py --- a/rhodecode/lib/vcs/conf/settings.py +++ b/rhodecode/lib/vcs/conf/settings.py @@ -56,7 +56,7 @@ HOOKS_HOST = '127.0.0.1' MERGE_MESSAGE_TMPL = ( - u'Merge pull request #{pr_id} from {source_repo} {source_ref_name}\n\n ' + u'Merge pull request !{pr_id} from {source_repo} {source_ref_name}\n\n ' u'{pr_title}') MERGE_DRY_RUN_MESSAGE = 'dry_run_merge_message_from_rhodecode' MERGE_DRY_RUN_USER = 'Dry-Run User' diff --git a/rhodecode/templates/admin/my_account/my_account_pullrequests.mako b/rhodecode/templates/admin/my_account/my_account_pullrequests.mako --- a/rhodecode/templates/admin/my_account/my_account_pullrequests.mako +++ b/rhodecode/templates/admin/my_account/my_account_pullrequests.mako @@ -52,11 +52,11 @@ { data: {"_": "target_repo", "sort": "target_repo"}, title: "${_('Target Repo')}", className: "td-targetrepo", orderable: false}, { data: {"_": "name", - "sort": "name_raw"}, title: "${_('Name')}", className: "td-componentname", "type": "num" }, + "sort": "name_raw"}, title: "${_('Id')}", className: "td-componentname", "type": "num" }, + { data: {"_": "title", + "sort": "title"}, title: "${_('Title')}", className: "td-description" }, { data: {"_": "author", "sort": "author_raw"}, title: "${_('Author')}", className: "td-user", orderable: false }, - { data: {"_": "title", - "sort": "title"}, title: "${_('Title')}", className: "td-description" }, { data: {"_": "comments", "sort": "comments_raw"}, title: "", className: "td-comments", orderable: false}, { data: {"_": "updated_on", diff --git a/rhodecode/templates/changeset/changeset_file_comment.mako b/rhodecode/templates/changeset/changeset_file_comment.mako --- a/rhodecode/templates/changeset/changeset_file_comment.mako +++ b/rhodecode/templates/changeset/changeset_file_comment.mako @@ -68,9 +68,9 @@ % if comment.pull_request: % if comment.status_change: - ${_('pull request #%s') % comment.pull_request.pull_request_id}: + ${_('pull request !{}').format(comment.pull_request.pull_request_id)}: % else: - ${_('pull request #%s') % comment.pull_request.pull_request_id} + ${_('pull request !{}').format(comment.pull_request.pull_request_id)} % endif % else: diff --git a/rhodecode/templates/data_table/_dt_elements.mako b/rhodecode/templates/data_table/_dt_elements.mako --- a/rhodecode/templates/data_table/_dt_elements.mako +++ b/rhodecode/templates/data_table/_dt_elements.mako @@ -371,9 +371,9 @@ <%def name="pullrequest_name(pull_request_id, target_repo_name, short=False)"> % if short: - #${pull_request_id} + !${pull_request_id} % else: - ${_('Pull request #%(pr_number)s') % {'pr_number': pull_request_id,}} + ${_('Pull request !{}').format(pull_request_id)} % endif diff --git a/rhodecode/templates/pullrequests/pullrequest_show.mako b/rhodecode/templates/pullrequests/pullrequest_show.mako --- a/rhodecode/templates/pullrequests/pullrequest_show.mako +++ b/rhodecode/templates/pullrequests/pullrequest_show.mako @@ -3,7 +3,7 @@ <%namespace name="dt" file="/data_table/_dt_elements.mako"/> <%def name="title()"> - ${_('%s Pull Request #%s') % (c.repo_name, c.pull_request.pull_request_id)} + ${_('{} Pull Request !{}').format(c.repo_name, c.pull_request.pull_request_id)} %if c.rhodecode_name: · ${h.branding(c.rhodecode_name)} %endif @@ -45,7 +45,7 @@
<% summary = lambda n:{False:'summary-short'}.get(n) %>
- ${_('Pull request #%s') % c.pull_request.pull_request_id} ${_('From')} ${h.format_date(c.pull_request.created_on)} + ${_('Pull request !{}').format(c.pull_request.pull_request_id)} ${_('From')} ${h.format_date(c.pull_request.created_on)} %if c.allowed_to_update:
% if c.allowed_to_delete: diff --git a/rhodecode/templates/pullrequests/pullrequests.mako b/rhodecode/templates/pullrequests/pullrequests.mako --- a/rhodecode/templates/pullrequests/pullrequests.mako +++ b/rhodecode/templates/pullrequests/pullrequests.mako @@ -78,11 +78,11 @@ { data: {"_": "status", "sort": "status"}, title: "", className: "td-status", orderable: false}, { data: {"_": "name", - "sort": "name_raw"}, title: "${_('Name')}", className: "td-componentname", "type": "num" }, + "sort": "name_raw"}, title: "${_('Id')}", className: "td-componentname", "type": "num" }, + { data: {"_": "title", + "sort": "title"}, title: "${_('Title')}", className: "td-description" }, { data: {"_": "author", "sort": "author_raw"}, title: "${_('Author')}", className: "td-user", orderable: false }, - { data: {"_": "title", - "sort": "title"}, title: "${_('Title')}", className: "td-description" }, { data: {"_": "comments", "sort": "comments_raw"}, title: "", className: "td-comments", orderable: false}, { data: {"_": "updated_on", diff --git a/rhodecode/tests/models/test_pullrequest.py b/rhodecode/tests/models/test_pullrequest.py --- a/rhodecode/tests/models/test_pullrequest.py +++ b/rhodecode/tests/models/test_pullrequest.py @@ -296,7 +296,7 @@ class TestPullRequestModel(object): Session().commit() message = ( - u'Merge pull request #{pr_id} from {source_repo} {source_ref_name}' + u'Merge pull request !{pr_id} from {source_repo} {source_ref_name}' u'\n\n {pr_title}'.format( pr_id=pull_request.pull_request_id, source_repo=safe_unicode( @@ -340,7 +340,7 @@ class TestPullRequestModel(object): assert pull_request.pull_request_state == PullRequest.STATE_CREATED message = ( - u'Merge pull request #{pr_id} from {source_repo} {source_ref_name}' + u'Merge pull request !{pr_id} from {source_repo} {source_ref_name}' u'\n\n {pr_title}'.format( pr_id=pull_request.pull_request_id, source_repo=safe_unicode( @@ -379,7 +379,7 @@ class TestPullRequestModel(object): Session().commit() message = ( - u'Merge pull request #{pr_id} from {source_repo} {source_ref_name}' + u'Merge pull request !{pr_id} from {source_repo} {source_ref_name}' u'\n\n {pr_title}'.format( pr_id=pull_request.pull_request_id, source_repo=safe_unicode(