summaryrefslogtreecommitdiffstats
path: root/options
diff options
context:
space:
mode:
authornemoinho <felix@nehrke.info>2018-08-14 19:49:33 +0200
committertechknowlogick <techknowlogick@users.noreply.github.com>2018-08-14 13:49:33 -0400
commitca112f0a04ea7f4fdb8e6dc1e83e293a598abc50 (patch)
tree419042b6b41dccc68030df68f8112d08f3a6b1c0 /options
parent03e558c29b55c522c52608065d2b688f8a9a4bc3 (diff)
downloadgitea-ca112f0a04ea7f4fdb8e6dc1e83e293a598abc50.tar.gz
gitea-ca112f0a04ea7f4fdb8e6dc1e83e293a598abc50.zip
Add whitespace handling to PR-comparsion (#4683)
* Add whitespace handling to PR-comparsion In a PR we have to keep an eye on a lot of different things. But sometimes the bare code is the key-thing we want to care about and just don't want to care about fixed indention on some places. Especially if we follow the pathfinder rule we face a lot of these situations because these changes don't break the code in many languages but improve the readability a lot. So this change introduce a fine graned button to adjust the way how the reviewer want to see whitespace-changes within the code. The possibilities reflect the possibilities from git itself except of the `--ignore-blank-lines` flag because that one is also handled by `-b` and is really rare. Signed-off-by: Felix Nehrke <felix@nehrke.info>
Diffstat (limited to 'options')
-rw-r--r--options/locale/locale_en-US.ini5
1 files changed, 5 insertions, 0 deletions
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index 2b04787481..635ddd66b6 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -1152,6 +1152,11 @@ diff.data_not_available = Diff Content Not Available
diff.show_diff_stats = Show Diff Stats
diff.show_split_view = Split View
diff.show_unified_view = Unified View
+diff.whitespace_button = Whitespace
+diff.whitespace_show_everything = Show all changes
+diff.whitespace_ignore_all_whitespace = Ignore whitespace when comparing lines
+diff.whitespace_ignore_amount_changes = Ignore changes in amount of whitespace
+diff.whitespace_ignore_at_eol = Ignore changes in whitespace at EOL
diff.stats_desc = <strong> %d changed files</strong> with <strong>%d additions</strong> and <strong>%d deletions</strong>
diff.bin = BIN
diff.view_file = View File