diff --git a/routers/web/repo/pull.go b/routers/web/repo/pull.go index be4e9711e..e3854779f 100644 --- a/routers/web/repo/pull.go +++ b/routers/web/repo/pull.go @@ -718,7 +718,6 @@ func GetPullCommits(ctx *context.Context) { // Get the needed locale resp.Locale = map[string]string{ "lang": ctx.Locale.Language(), - "filter_changes_by_commit": ctx.Tr("repo.pulls.filter_changes_by_commit"), "show_all_commits": ctx.Tr("repo.pulls.show_all_commits"), "stats_num_commits": ctx.TrN(len(commits), "repo.activity.git_stats_commit_1", "repo.activity.git_stats_commit_n", len(commits)), "show_changes_since_your_last_review": ctx.Tr("repo.pulls.show_changes_since_your_last_review"), diff --git a/templates/repo/diff/box.tmpl b/templates/repo/diff/box.tmpl index 324166b03..7b936cb81 100644 --- a/templates/repo/diff/box.tmpl +++ b/templates/repo/diff/box.tmpl @@ -32,7 +32,7 @@ {{template "repo/diff/whitespace_dropdown" .}} {{template "repo/diff/options_dropdown" .}} {{if .PageIsPullFiles}} -
+
{{/* the following will be replaced by vue component but this avoids any loading artifacts till the vue component is initialized diff --git a/web_src/js/components/DiffCommitSelector.vue b/web_src/js/components/DiffCommitSelector.vue index a0fc4b2a9..e24619dc0 100644 --- a/web_src/js/components/DiffCommitSelector.vue +++ b/web_src/js/components/DiffCommitSelector.vue @@ -77,10 +77,13 @@ import {SvgIcon} from '../svg.js'; export default { components: {SvgIcon}, data: () => { + const el = document.getElementById('diff-commit-select'); return { menuVisible: false, isLoading: false, - locale: {}, + locale: { + filter_changes_by_commit: el.getAttribute('data-filter_changes_by_commit'), + }, commits: [], hoverActivated: false, lastReviewCommitSha: null