diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2016-08-13 00:30:44 +0300 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-08-13 00:30:44 +0300 |
| commit | 8429a57874e184d3b2d7b43d4701aafd2e92bdf6 (patch) | |
| tree | 6bb36e29d93d5e8d9c3c429bed0f8a99e55a8ecb /app | |
| parent | f498347d9bce861b55fcb98721e8a21db2308721 (diff) | |
| download | gitlab-ce-8429a57874e184d3b2d7b43d4701aafd2e92bdf6.tar.gz | |
Fix hard coded plural text.
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/merge_conflict_data_provider.js.es6 | 4 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/conflicts/_commit_stats.html.haml | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/app/assets/javascripts/merge_conflict_data_provider.js.es6 b/app/assets/javascripts/merge_conflict_data_provider.js.es6 index 10d8a8a8ea7..cd92df8ddc5 100644 --- a/app/assets/javascripts/merge_conflict_data_provider.js.es6 +++ b/app/assets/javascripts/merge_conflict_data_provider.js.es6 @@ -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 { } }); - } diff --git a/app/views/projects/merge_requests/conflicts/_commit_stats.html.haml b/app/views/projects/merge_requests/conflicts/_commit_stats.html.haml index 16dc160be4a..457c467fba9 100644 --- a/app/views/projects/merge_requests/conflicts/_commit_stats.html.haml +++ b/app/views/projects/merge_requests/conflicts/_commit_stats.html.haml @@ -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 |