Submitter | Jordi Gutiérrez Hermoso |
---|---|
Date | Nov. 20, 2017, 7:39 p.m. |
Message ID | <9f2ad7bc901216d63409.1511206769@chloe> |
Download | mbox | patch |
Permalink | /patch/25674/ |
State | Accepted |
Headers | show |
Comments
Jordi Gutiérrez Hermoso a écrit : > # HG changeset patch > # User Jordi Gutiérrez Hermoso <jordigh@octave.org> > # Date 1511206254 18000 > # Mon Nov 20 14:30:54 2017 -0500 > # Node ID 9f2ad7bc901216d6340952f463ab06568fc82dfb > # Parent 75013952d8d9608f73cd45f68405fbd6ec112bf2 > templates: reword 'back to filelog' link anchor text > > This anchor text is problematic in two ways: first, the "back to" part > assumes that you got to the page showing it via the filelog. This is > not necessarily true, as there are other ways to get to that view > besides the filelog view, such as for example following the history of > lines from a file. Second, it uses "filelog" jargon, which refers to > how each file has its own revlog. This is internal jargon that has no > business being exposed to the end user. Looks good, thanks. > I just reworded this template to improve understanding. > > diff --git a/mercurial/templates/gitweb/filelog.tmpl b/mercurial/templates/gitweb/filelog.tmpl > --- a/mercurial/templates/gitweb/filelog.tmpl > +++ b/mercurial/templates/gitweb/filelog.tmpl > @@ -36,7 +36,7 @@ revisions | > > <div class="title" > > {file|urlescape}{if(linerange, > -' (following lines {linerange}{if(descend, ', descending')} <a href="{url|urlescape}log/{symrev}/{file|urlescape}{sessionvars%urlparameter}">back to filelog</a>)')} > +' (following lines {linerange}{if(descend, ', descending')} <a href="{url|urlescape}log/{symrev}/{file|urlescape}{sessionvars%urlparameter}">all revisions for this file</a>)')} > </div> > > <table> > diff --git a/mercurial/templates/paper/filelog.tmpl b/mercurial/templates/paper/filelog.tmpl > --- a/mercurial/templates/paper/filelog.tmpl > +++ b/mercurial/templates/paper/filelog.tmpl > @@ -48,7 +48,7 @@ > log {file|escape} @ {rev}:<a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a> > {branch%changelogbranchname}{tags%changelogtag}{bookmarks%changelogtag} > {if(linerange, > -' (following lines {linerange}{if(descend, ', descending')} <a href="{url|urlescape}log/{symrev}/{file|urlescape}{sessionvars%urlparameter}">back to filelog</a>)')} > +' (following lines {linerange}{if(descend, ', descending')} <a href="{url|urlescape}log/{symrev}/{file|urlescape}{sessionvars%urlparameter}">all revisions for this file</a>)')} > </h3> > > {searchform} > _______________________________________________ > Mercurial-devel mailing list > Mercurial-devel@mercurial-scm.org > https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel >
On Mon, Nov 20, 2017 at 02:39:29PM -0500, Jordi Gutiérrez Hermoso wrote: > # HG changeset patch > # User Jordi Gutiérrez Hermoso <jordigh@octave.org> > # Date 1511206254 18000 > # Mon Nov 20 14:30:54 2017 -0500 > # Node ID 9f2ad7bc901216d6340952f463ab06568fc82dfb > # Parent 75013952d8d9608f73cd45f68405fbd6ec112bf2 > templates: reword 'back to filelog' link anchor text queued, thanks
Patch
diff --git a/mercurial/templates/gitweb/filelog.tmpl b/mercurial/templates/gitweb/filelog.tmpl --- a/mercurial/templates/gitweb/filelog.tmpl +++ b/mercurial/templates/gitweb/filelog.tmpl @@ -36,7 +36,7 @@ revisions | <div class="title" > {file|urlescape}{if(linerange, -' (following lines {linerange}{if(descend, ', descending')} <a href="{url|urlescape}log/{symrev}/{file|urlescape}{sessionvars%urlparameter}">back to filelog</a>)')} +' (following lines {linerange}{if(descend, ', descending')} <a href="{url|urlescape}log/{symrev}/{file|urlescape}{sessionvars%urlparameter}">all revisions for this file</a>)')} </div> <table> diff --git a/mercurial/templates/paper/filelog.tmpl b/mercurial/templates/paper/filelog.tmpl --- a/mercurial/templates/paper/filelog.tmpl +++ b/mercurial/templates/paper/filelog.tmpl @@ -48,7 +48,7 @@ log {file|escape} @ {rev}:<a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a> {branch%changelogbranchname}{tags%changelogtag}{bookmarks%changelogtag} {if(linerange, -' (following lines {linerange}{if(descend, ', descending')} <a href="{url|urlescape}log/{symrev}/{file|urlescape}{sessionvars%urlparameter}">back to filelog</a>)')} +' (following lines {linerange}{if(descend, ', descending')} <a href="{url|urlescape}log/{symrev}/{file|urlescape}{sessionvars%urlparameter}">all revisions for this file</a>)')} </h3> {searchform}