Skip to content
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

Updated descriptions and conflicts in all composer.jsons #808

Merged
merged 4 commits into from Oct 3, 2019

Conversation

@aschempp
Copy link
Contributor

commented Sep 30, 2019

No description provided.

@aschempp aschempp requested a review from leofeyer Sep 30, 2019
composer.json Show resolved Hide resolved
@leofeyer leofeyer added the defect label Sep 30, 2019
@leofeyer leofeyer added this to the 4.8 milestone Sep 30, 2019
core-bundle/composer.json Outdated Show resolved Hide resolved
calendar-bundle/composer.json Outdated Show resolved Hide resolved
comments-bundle/composer.json Outdated Show resolved Hide resolved
faq-bundle/composer.json Outdated Show resolved Hide resolved
installation-bundle/composer.json Outdated Show resolved Hide resolved
listing-bundle/composer.json Outdated Show resolved Hide resolved
@@ -1,12 +1,17 @@
{
"name": "contao/manager-bundle",
"type": "symfony-bundle",
"description": "Contao 4 manager bundle",
"description": "This bundle contains code necessary to run the Contao 4 Managed Edition.",

This comment has been minimized.

Copy link
@leofeyer

leofeyer Sep 30, 2019

Member
Suggested change
"description": "This bundle contains code necessary to run the Contao 4 Managed Edition.",
"description": "Integrates Contao into the Contao Managed Edition",

This comment has been minimized.

Copy link
@aschempp

aschempp Oct 2, 2019

Author Contributor

"Managed Edition" is a name to me, and should therefore be uppercase?

This comment has been minimized.

Copy link
@leofeyer

leofeyer Oct 2, 2019

Member

I don't think so. Then "Contao Core Bundle" would be a name, too, but we are writing it as "Contao core bundle".

This comment has been minimized.

Copy link
@aschempp

aschempp Oct 2, 2019

Author Contributor

I think both would be fine for the core bundle. But "Contao Managed Edition" is a name for sure.
https://duckduckgo.com/?q=contao+managed+edition
https://contao.org/de/news/release-der-contao-managed-edition.html

This comment has been minimized.

Copy link
@leofeyer

leofeyer Oct 2, 2019

Member

Almost all of the results are in German. Of course it is written "Contao Managed-Edition" there. 😄

This is an English result (and also the official repo) and it clearly says "Contao 4 managed edition".

This comment has been minimized.

Copy link
@aschempp

aschempp Oct 2, 2019

Author Contributor

so it should be different in english and german?

This comment has been minimized.

Copy link
@leofeyer

leofeyer Oct 3, 2019

Member

I have updated my suggestion based on contao/package-metadata#123 (comment)

news-bundle/composer.json Outdated Show resolved Hide resolved
newsletter-bundle/composer.json Outdated Show resolved Hide resolved
@leofeyer leofeyer referenced this pull request Sep 30, 2019
aschempp and others added 2 commits Oct 2, 2019
Co-Authored-By: Leo Feyer <github@contao.org>
@aschempp

This comment has been minimized.

Copy link
Contributor Author

commented Oct 2, 2019

I have also updated the authors of contao/manager-bundle, because that's what people will see in the Contao Manager as whom Contao is from.

Copy link
Member

left a comment

The changed "description" lines are all indented too much, otherwise 👍

calendar-bundle/composer.json Outdated Show resolved Hide resolved
@@ -1,12 +1,17 @@
{
"name": "contao/manager-bundle",
"type": "symfony-bundle",
"description": "Contao 4 manager bundle",
"description": "This bundle contains code necessary to run the Contao 4 Managed Edition.",

This comment has been minimized.

Copy link
@leofeyer

leofeyer Oct 3, 2019

Member

I have updated my suggestion based on contao/package-metadata#123 (comment)

@leofeyer leofeyer merged commit c955bae into 4.8 Oct 3, 2019
3 of 5 checks passed
3 of 5 checks passed
Travis CI - Branch Build Failed
Details
Travis CI - Pull Request Build Failed
Details
continuous-integration/appveyor/branch AppVeyor build succeeded
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
coverage/coveralls Coverage remained the same at 86.335%
Details
@leofeyer leofeyer deleted the bugfix/composer-json branch Oct 3, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.