Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Grammar fix in exception message #29868

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 21, 2019
Merged

Grammar fix in exception message #29868

merged 1 commit into from
Jan 21, 2019

Conversation

michaelKaefer
Copy link
Contributor

@michaelKaefer michaelKaefer commented Jan 13, 2019

According to https://en.wiktionary.org/wiki/whitespace and https://english.stackexchange.com/questions/25368/what-is-the-plural-form-of-whitespace valid sentences would be:

  • Whitespace is ...
  • Whitespaces are ...
  • Whitespace characters are ...

But this is not correct:

  • Whitespace are ...
Q A
Branch? master
Bug fix? no
New feature? no
BC breaks? no
Deprecations? no
Tests pass? yes
Fixed tickets -
License MIT
Doc PR -

@fabpot
Copy link
Member

fabpot commented Jan 13, 2019

Looks like it should be done on 3.4
@michaelKaefer Can you rebase on 3.4 and fix the tests? Thank you.

@michaelKaefer
Copy link
Contributor Author

@fabpot Yes, this week 👍

@xabbuh xabbuh added this to the 3.4 milestone Jan 13, 2019
@michaelKaefer michaelKaefer changed the base branch from master to 3.4 January 14, 2019 18:46
@michaelKaefer michaelKaefer changed the base branch from 3.4 to master January 20, 2019 09:25
@michaelKaefer
Copy link
Contributor Author

@xabbuh Sorry, I'm not able. Can you help me?

I wanted to rebase (never did that) with:

git clone https://github.com/michaelKaefer/symfony/
cd symfony
git fetch
git branch patch-2 origin/patch-2
git checkout patch-2
git branch 3.4 origin/3.4
git rebase 3.4

--> the rebase tells me that there are confilcts (the first one in src/Symfony/Component/Console/Helper/SymfonyQuestionHelper.php) and I have to merge. This seems wrong to me, what am I doing wrong?

@xabbuh xabbuh changed the base branch from master to 3.4 January 20, 2019 18:04
@xabbuh
Copy link
Member

xabbuh commented Jan 21, 2019

@michaelKaefer I did a rebase. :)

According to https://en.wiktionary.org/wiki/whitespace and https://english.stackexchange.com/questions/25368/what-is-the-plural-form-of-whitespace valid sentences would be:
- Whitespace is ...
- Whitespaces are ...
- Whitespace characters are ...

But this is not correct:
- Whitespace are ...
@fabpot
Copy link
Member

fabpot commented Jan 21, 2019

Good catch, thanks @michaelKaefer.

@fabpot fabpot merged commit 6e279a0 into symfony:3.4 Jan 21, 2019
fabpot added a commit that referenced this pull request Jan 21, 2019
This PR was merged into the 3.4 branch.

Discussion
----------

Grammar fix in exception message

According to https://en.wiktionary.org/wiki/whitespace and https://english.stackexchange.com/questions/25368/what-is-the-plural-form-of-whitespace valid sentences would be:
- Whitespace is ...
- Whitespaces are ...
- Whitespace characters are ...

But this is not correct:
- Whitespace are ...

| Q             | A
| ------------- | ---
| Branch?       | master
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | -
| License       | MIT
| Doc PR        | -

Commits
-------

6e279a0 Grammar fix in exception message
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants
Morty Proxy This is a proxified and sanitized view of the page, visit original site.