Commit 662d45f5 authored by Amy Qualls's avatar Amy Qualls Committed by peterhegman

Improve UI message: creating branch from fork

The previous version of the message was too passive and wordy; let's
shorten it up. While we're here, let's change the title from Title
Case to sentence case.

Changelog: changed
parent 63d7b0b1
......@@ -11,7 +11,7 @@ export const I18N_MODAL = {
'ChangeTypeAction|Your changes will be committed to %{branchName} because a merge request is open.',
),
branchInFork: s__(
'ChangeTypeAction|A new branch will be created in your fork and a new merge request will be started.',
'ChangeTypeAction|GitLab will create a branch in your fork and start a merge request.',
),
newMergeRequest: __('new merge request'),
actionCancelText: __('Cancel'),
......
......@@ -24,10 +24,10 @@ import {
} from '../constants';
const PRIMARY_OPTIONS_TEXT = __('Upload file');
const MODAL_TITLE = __('Upload New File');
const MODAL_TITLE = __('Upload new file');
const REMOVE_FILE_TEXT = __('Remove file');
const NEW_BRANCH_IN_FORK = __(
'A new branch will be created in your fork and a new merge request will be started.',
'GitLab will create a branch in your fork and start a merge request.',
);
const ERROR_MESSAGE = __('Error uploading file. Please try again.');
......
......@@ -11,7 +11,7 @@ export const COMMIT_LABEL = __('Commit message');
export const TARGET_BRANCH_LABEL = __('Target branch');
export const TOGGLE_CREATE_MR_LABEL = __('Start a new merge request with these changes');
export const NEW_BRANCH_IN_FORK = __(
'A new branch will be created in your fork and a new merge request will be started.',
'GitLab will create a branch in your fork and start a merge request.',
);
export const COMMIT_MESSAGE_SUBJECT_MAX_LENGTH = 52;
......
......@@ -81,7 +81,7 @@ module TreeHelper
end
def commit_in_fork_help
_("A new branch will be created in your fork and a new merge request will be started.")
_("GitLab will create a branch in your fork and start a merge request.")
end
def commit_in_single_accessible_branch
......
......@@ -1500,9 +1500,6 @@ msgstr ""
msgid "A new Release %{tag} for %{name} was published. Visit the Releases page to read more about it:"
msgstr ""
msgid "A new branch will be created in your fork and a new merge request will be started."
msgstr ""
msgid "A new impersonation token has been created."
msgstr ""
......@@ -6519,10 +6516,10 @@ msgstr ""
msgid "ChangeReviewer|Unassigned"
msgstr ""
msgid "ChangeTypeAction|A new branch will be created in your fork and a new merge request will be started."
msgid "ChangeTypeAction|Cherry-pick"
msgstr ""
msgid "ChangeTypeAction|Cherry-pick"
msgid "ChangeTypeAction|GitLab will create a branch in your fork and start a merge request."
msgstr ""
msgid "ChangeTypeAction|Pick into branch"
......@@ -15853,6 +15850,9 @@ msgstr ""
msgid "GitLab version"
msgstr ""
msgid "GitLab will create a branch in your fork and start a merge request."
msgstr ""
msgid "GitLab.com"
msgstr ""
......@@ -37245,6 +37245,9 @@ msgstr ""
msgid "Upload license"
msgstr ""
msgid "Upload new file"
msgstr ""
msgid "Upload object map"
msgstr ""
......
......@@ -170,7 +170,7 @@ RSpec.describe 'Projects > Files > User creates files', :js do
end
it 'shows a message saying the file will be committed in a fork' do
message = "A new branch will be created in your fork and a new merge request will be started."
message = "GitLab will create a branch in your fork and start a merge request."
expect(page).to have_content(message)
end
......
......@@ -212,8 +212,8 @@ describe('UploadBlobModal', () => {
createComponent();
});
it('displays the default "Upload New File" modal title ', () => {
expect(findModal().props('title')).toBe('Upload New File');
it('displays the default "Upload new file" modal title ', () => {
expect(findModal().props('title')).toBe('Upload new file');
});
it('display the defaul primary button text', () => {
......
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