kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Fix hard coded plural text.

Browse source
This commit is contained in:
Fatih Acet 2016-08-13 00:30:44 +03:00
parent f498347d9b
commit 8429a57874
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/assets/javascripts/merge_conflict_data_provider.js.es6
View file

@ -39,6 +39,9 @@ class MergeConflictDataProvider {
vueInstance.conflictsData = data;
vueInstance.isSubmitting = false;
const conflictsText = this.getConflictsCount() > 1 ? 'conflicts' : 'conflict';
vueInstance.conflictsData.conflictsText = conflictsText;
}
@ -101,7 +104,6 @@ class MergeConflictDataProvider {
}
});
}

2
app/views/projects/merge_requests/conflicts/_commit_stats.html.haml
View file

@ -13,7 +13,7 @@
.js-toggle-container
.commit-stat-summary
Showing
%strong.cred {{conflictsCount}} conflicts
%strong.cred {{conflictsCount}} {{conflictsData.conflictsText}}
between
%strong {{conflictsData.source_branch}}
and