diff --git a/docs/usage/general.rst b/docs/usage/general.rst --- a/docs/usage/general.rst +++ b/docs/usage/general.rst @@ -38,7 +38,7 @@ Compare view from changelog Checkboxes in compare view allow users to view combined compare view. You can only show the range between the first and last checkbox (no cherry pick). Clicking more than one checkbox will activate a link in top saying -`Show selected changes -> ` clicking this will bring +`Show selected changesets -> ` clicking this will bring compare view. In this view also it's possible to switch to combined compare. Compare view is also available from the journal on pushes having more than diff --git a/rhodecode/templates/base/root.html b/rhodecode/templates/base/root.html --- a/rhodecode/templates/base/root.html +++ b/rhodecode/templates/base/root.html @@ -50,8 +50,8 @@ 'No matching files': "${_('No matching files')}", 'Open new pull request': "${_('Open new pull request')}", 'Open new pull request for selected changesets': "${_('Open new pull request for selected changesets')}", - 'Show selected changes __S -> __E': "${_('Show selected changes __S -> __E')}", - 'Show selected change __S': "${_('Show selected change __S')}", + 'Show selected changesets __S -> __E': "${_('Show selected changesets __S -> __E')}", + 'Show selected changeset __S': "${_('Show selected changeset __S')}", 'Selection link': "${_('Selection link')}", 'Collapse diff': "${_('Collapse diff')}", 'Expand diff': "${_('Expand diff')}" diff --git a/rhodecode/templates/changelog/changelog.html b/rhodecode/templates/changelog/changelog.html --- a/rhodecode/templates/changelog/changelog.html +++ b/rhodecode/templates/changelog/changelog.html @@ -152,8 +152,8 @@ rev_start+'...'+rev_end); var link = (rev_start == rev_end) - ? _TM['Show selected change __S'] - : _TM['Show selected changes __S -> __E']; + ? _TM['Show selected changeset __S'] + : _TM['Show selected changesets __S -> __E']; link = link.replace('__S',rev_start.substr(0,6)); link = link.replace('__E',rev_end.substr(0,6)); diff --git a/rhodecode/templates/changeset/changeset_range.html b/rhodecode/templates/changeset/changeset_range.html --- a/rhodecode/templates/changeset/changeset_range.html +++ b/rhodecode/templates/changeset/changeset_range.html @@ -26,9 +26,11 @@
-

${_('Compare View')} / ${h.link_to(_('Show combined compare'),h.url('compare_url',repo_name=c.repo_name,org_ref_type='rev',org_ref=getattr(c.cs_ranges[0].parents[0] if c.cs_ranges[0].parents else h.EmptyChangeset(),'raw_id'),other_ref_type='rev',other_ref=c.cs_ranges[-1].raw_id))}

+

${_('Show changesets')}

- ${_('Changesets')} - r${c.cs_ranges[0].revision}:${h.short_id(c.cs_ranges[0].raw_id)} -> r${c.cs_ranges[-1].revision}:${h.short_id(c.cs_ranges[-1].raw_id)} + ${h.link_to('r%s:%s -> r%s:%s' % (c.cs_ranges[0].revision, h.short_id(c.cs_ranges[0].raw_id), c.cs_ranges[-1].revision, h.short_id(c.cs_ranges[-1].raw_id)), + h.url('compare_url',repo_name=c.repo_name,org_ref_type='rev',org_ref=getattr(c.cs_ranges[0].parents[0] if c.cs_ranges[0].parents else h.EmptyChangeset(),'raw_id'),other_ref_type='rev',other_ref=c.cs_ranges[-1].raw_id) + )}
diff --git a/rhodecode/templates/compare/compare_diff.html b/rhodecode/templates/compare/compare_diff.html --- a/rhodecode/templates/compare/compare_diff.html +++ b/rhodecode/templates/compare/compare_diff.html @@ -26,7 +26,7 @@
-

${_('Compare View')}

+

${_('Compare revisions')}

${'%s@%s' % (c.org_repo.repo_name, c.org_ref)} -> ${'%s@%s' % (c.other_repo.repo_name, c.other_ref)} [swap]