Commit 55941213 authored by Jason Lenny's avatar Jason Lenny Committed by Filipa Lacerda

Improve clarity of text for merge train position

parent b00ce8e5
---
title: Improve clarity of text for merge train position
merge_request: 19031
author:
type: changed
......@@ -11,7 +11,7 @@ export default {
},
computed: {
message() {
return sprintf(s__('mrWidget|Added to the merge train at position %{mergeTrainPosition}'), {
return sprintf(s__('mrWidget|In the merge train at position %{mergeTrainPosition}'), {
mergeTrainPosition: this.mergeTrainIndex + 1,
});
},
......
......@@ -26,7 +26,7 @@ describe('MergeTrainPositionIndicator', () => {
it('should return the message with the correct position (i.e., index + 1)', () => {
factory({ mergeTrainIndex: 3 });
expect(vm.message).toBe('Added to the merge train at position 4');
expect(vm.message).toBe('In the merge train at position 4');
});
});
......@@ -34,7 +34,7 @@ describe('MergeTrainPositionIndicator', () => {
it('should render the correct message', () => {
factory({ mergeTrainIndex: 3 });
expect(trimText(wrapper.text())).toBe('Added to the merge train at position 4');
expect(trimText(wrapper.text())).toBe('In the merge train at position 4');
});
});
});
......
......@@ -20040,9 +20040,6 @@ msgstr ""
msgid "mrWidget|%{metricsLinkStart} Memory %{metricsLinkEnd} usage is %{emphasisStart} unchanged %{emphasisEnd} at %{memoryFrom}MB"
msgstr ""
msgid "mrWidget|Added to the merge train at position %{mergeTrainPosition}"
msgstr ""
msgid "mrWidget|Added to the merge train by"
msgstr ""
......@@ -20124,6 +20121,9 @@ msgstr ""
msgid "mrWidget|If the %{missingBranchName} branch exists in your local repository, you can merge this merge request manually using the command line"
msgstr ""
msgid "mrWidget|In the merge train at position %{mergeTrainPosition}"
msgstr ""
msgid "mrWidget|Loading deployment statistics"
msgstr ""
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment