# HG changeset patch # User Daniel Dourvaris # Date 2020-04-22 10:38:46 # Node ID d193c5b3a65b8cf8840ff543606a70d759a0c937 # Parent 635c5bc57e666bada9d7ee450d615bdc6ad0d6b4 diffs: improve text on unresolved comments attached to files that no longer exist in the review. - fixes #5615 diff --git a/rhodecode/templates/codeblocks/diffs.mako b/rhodecode/templates/codeblocks/diffs.mako --- a/rhodecode/templates/codeblocks/diffs.mako +++ b/rhodecode/templates/codeblocks/diffs.mako @@ -394,11 +394,17 @@ return '%s_%s_%i' % (h.md5_safe(commit+f ## file op, doesn't need translation - removed in this version + unresolved comments ΒΆ - -${comments_dict['stats']} + + % if comments_dict['stats'] >0: + -${comments_dict['stats']} + % else: + ${comments_dict['stats']} + % endif + @@ -410,7 +416,8 @@ return '%s_%s_%i' % (h.md5_safe(commit+f - ${_('File was deleted in this version. There are still outdated/unresolved comments attached to it.')} + ${_('This file was removed from diff during updates to this pull-request.')}
+ ${_('There are still outdated/unresolved comments attached to it.')} %if c.user_session_attrs["diffmode"] == 'unified':