Skip to content

WIP: Grammar correction (project-wide): "set up" and "setup" are different (in text, not code)

Marcel Amirault requested to merge (removed):set-up-not-setup into master

What does this MR do?

This MR corrects the grammar of "set up" and "setup" across the entire project: documentation, code comments, views, etc. It does not touch any actual code (I hope), except for strings that are visible to users. Setup and set up are used very inconsistently, sometimes right and sometimes wrong. I probably missed a few, but I think this corrects the vast majority of the issues.

My only problem is that I'm not sure why the tests fail on the gitlab.pot (internationalisation) file. I manually updated locale/gitlab.pot because bin/rake gettext:regenerate doesn't work (I don't have databases set up, just a fork of the repository), but that doesn't work either. What do I need to do to pass the failed test?

Grammar Explanation

Setup is a noun or adjective, while set up is a verb. An easy way to think about it is to replace them with configuration or configure, so setup = configuration(noun/adjective), and set up = configure(verb).

Examples from GitLab itself (with images below, red boxes = incorrect, green boxes = correct):

You can setup as many Runners as you need. -> You can configuration as many Runners as you need.
You can set up as many Runners as you need. -> You can configure as many Runners as you need.

Specify the following URL during the Runner setup: -> Specify the following URL during the Runner configuration:
Specify the following URL during the Runner set up: -> Specify the following URL during the Runner configure:

runners-setup-set-up

mirroring-setup-set-up

Does this MR meet the acceptance criteria?

Edited by Marcel Amirault

Merge request reports