# HG changeset patch # User Mads Kiilerich # Date 2013-02-28 23:04:28 # Node ID 246ab6d8a0f3a7240d280b54fe5301405a6c32e8 # Parent c12603d5ee13b1191a43037d827e18a9f13aef84 changelog: improve texts and functionality regarding selecting changesets 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,6 +50,7 @@ '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')}", '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 @@ -37,10 +37,10 @@ %if c.rhodecode_db_repo.fork: - ${_('Compare fork with parent')} + ${_('Compare fork with parent')} %endif %if h.is_hg(c.rhodecode_repo): - ${_('open new pull request')} + ${_('Open new pull request')} %endif
@@ -71,7 +71,7 @@
${h.urlify_commit(cs.message, c.repo_name,h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}
-
↓ ${_('show more')} ↓
+
↓ ${_('Show more')} ↓
@@ -162,7 +162,6 @@ if(checked_checkboxes.length>0){ // modify open pull request to show we have selected cs YUD.get('open_new_pr').innerHTML = _TM['Open new pull request for selected changesets']; - }else{ YUD.get('open_new_pr').innerHTML = _TM['Open new pull request']; } @@ -174,7 +173,10 @@ var url = url_tmpl.replace('__REVRANGE__', rev_start+'...'+rev_end); - var link = _TM['Show selected changes __S -> __E']; + var link = (rev_start == rev_end) + ? _TM['Show selected change __S'] + : _TM['Show selected changes __S -> __E']"; + link = link.replace('__S',rev_start.substr(0,6)); link = link.replace('__E',rev_end.substr(0,6)); YUD.get('rev_range_container').href = url;