Similar to #950534: [policy] Consistently use "email" instead of "e-mail" in Drupal. Let's standardize on "website" instead of "web site"

We use both, but would be good to just keep to the one that AP has been using since 2010 it seems.

http://mashable.com/2010/04/16/ap-stylebook-website/

CommentFileSizeAuthor
#22 interdiff_17-22.txt4.32 KBpradeepjha
#22 2256367-22.patch17.25 KBpradeepjha
#20 interdiff_17-20.txt4.49 KBpradeepjha
#20 2256367-20.patch16.97 KBpradeepjha
#18 Screenshot 2020-06-02 at 3.31.33 PM.png230.96 KBRkumar
#17 2256367-interdiff-14-17.txt291.31 KBcburschka
#17 2256367-17.patch12.46 KBcburschka
#14 website-2256367-14.patch303.77 KBpradeepjha
#1 website-2256367-1.patch4 KBmgifford

Comments

mgifford’s picture

mgifford
he/him
Primary language English
commented
StatusFileSize
new website-2256367-1.patch4 KB
mgifford’s picture

mgifford
he/him
Primary language English
commented
Component: other » documentation
tvn’s picture

tvn commented
Issue tags: -drupal.org Content Working Group
jhodgdon’s picture

jhodgdon
she/her
Primary language English
commented
Title: [policy] Consistently use "website" instead of "web site" in Drupal » [meta] Consistently use "website" instead of "web site" in Drupal Core docs and UI text

The policy is clear:
https://www.drupal.org/drupalorg/style-guide/content#relatedwords

At least for drupal.org, our policy is to use "website".

So converting this into a meta issue. I suggest making two patches, on two separate issues:

a) Fix up any UI text (including help text) that violates the policy. This one can only go into the 8.1 and 8.2 branches (and only for 8.1 if it happens before the first release candidate, because after that UI text is frozen except for huge bugs, and this isn't a huge bug).

b) Fix up any API docs and comments that violate the policy. This one can be committed to all 8.x branches.

I haven't checked to see if both types of problem exist (UI text and API docs)... if there aren't both, then this can be just one patch on this issue.

jhodgdon’s picture

jhodgdon
she/her
Primary language English
commented

Oh, sorry, just noticed this patch. It seems to be all UI text.

However, I did a grep and there are also API docs and comments with this problem. So yes, please do make two child issues as noted in comment #4. Thanks!

Version: 8.0.x-dev » 8.1.x-dev

Drupal 8.0.6 was released on April 6 and is the final bugfix release for the Drupal 8.0.x series. Drupal 8.0.x will not receive any further development aside from security fixes. Drupal 8.1.0-rc1 is now available and sites should prepare to update to 8.1.0.

Bug reports should be targeted against the 8.1.x-dev branch from now on, and new development or disruptive changes should be targeted against the 8.2.x-dev branch. For more information see the Drupal 8 minor version schedule and the Allowed changes during the Drupal 8 release cycle.

Version: 8.1.x-dev » 8.2.x-dev

Drupal 8.1.9 was released on September 7 and is the final bugfix release for the Drupal 8.1.x series. Drupal 8.1.x will not receive any further development aside from security fixes. Drupal 8.2.0-rc1 is now available and sites should prepare to upgrade to 8.2.0.

Bug reports should be targeted against the 8.2.x-dev branch from now on, and new development or disruptive changes should be targeted against the 8.3.x-dev branch. For more information see the Drupal 8 minor version schedule and the Allowed changes during the Drupal 8 release cycle.

Version: 8.2.x-dev » 8.3.x-dev

Drupal 8.2.6 was released on February 1, 2017 and is the final full bugfix release for the Drupal 8.2.x series. Drupal 8.2.x will not receive any further development aside from critical and security fixes. Sites should prepare to update to 8.3.0 on April 5, 2017. (Drupal 8.3.0-alpha1 is available for testing.)

Bug reports should be targeted against the 8.3.x-dev branch from now on, and new development or disruptive changes should be targeted against the 8.4.x-dev branch. For more information see the Drupal 8 minor version schedule and the Allowed changes during the Drupal 8 release cycle.

Version: 8.3.x-dev » 8.4.x-dev

Drupal 8.3.6 was released on August 2, 2017 and is the final full bugfix release for the Drupal 8.3.x series. Drupal 8.3.x will not receive any further development aside from critical and security fixes. Sites should prepare to update to 8.4.0 on October 4, 2017. (Drupal 8.4.0-alpha1 is available for testing.)

Bug reports should be targeted against the 8.4.x-dev branch from now on, and new development or disruptive changes should be targeted against the 8.5.x-dev branch. For more information see the Drupal 8 minor version schedule and the Allowed changes during the Drupal 8 release cycle.

Version: 8.4.x-dev » 8.5.x-dev

Drupal 8.4.4 was released on January 3, 2018 and is the final full bugfix release for the Drupal 8.4.x series. Drupal 8.4.x will not receive any further development aside from critical and security fixes. Sites should prepare to update to 8.5.0 on March 7, 2018. (Drupal 8.5.0-alpha1 is available for testing.)

Bug reports should be targeted against the 8.5.x-dev branch from now on, and new development or disruptive changes should be targeted against the 8.6.x-dev branch. For more information see the Drupal 8 minor version schedule and the Allowed changes during the Drupal 8 release cycle.

Version: 8.5.x-dev » 8.6.x-dev

Drupal 8.5.6 was released on August 1, 2018 and is the final bugfix release for the Drupal 8.5.x series. Drupal 8.5.x will not receive any further development aside from security fixes. Sites should prepare to update to 8.6.0 on September 5, 2018. (Drupal 8.6.0-rc1 is available for testing.)

Bug reports should be targeted against the 8.6.x-dev branch from now on, and new development or disruptive changes should be targeted against the 8.7.x-dev branch. For more information see the Drupal 8 minor version schedule and the Allowed changes during the Drupal 8 release cycle.

Version: 8.6.x-dev » 8.8.x-dev

Drupal 8.6.x will not receive any further development aside from security fixes. Bug reports should be targeted against the 8.8.x-dev branch from now on, and new development or disruptive changes should be targeted against the 8.9.x-dev branch. For more information see the Drupal 8 and 9 minor version schedule and the Allowed changes during the Drupal 8 and 9 release cycles.

pradeepjha’s picture

pradeepjha commented
Assigned: Unassigned » pradeepjha

I'll be working on this.

pradeepjha’s picture

pradeepjha commented
Status: Active » Needs review
StatusFileSize
new website-2256367-14.patch303.77 KB

Hi @jhodgdon
I have searched the 'web site' text in core folder, found in multiple places. I've added those changes in patch. Please have a look.

pradeepjha’s picture

pradeepjha commented
Assigned: pradeepjha » Unassigned
longwave’s picture

longwave
he/him
Primary language English
Location UK
commented
Status: Needs review » Needs work

We shouldn't change anything in core/assets/vendor, this is third party code that belongs to CKEditor.

cburschka’s picture

cburschka
they
commented
Status: Needs work » Needs review
StatusFileSize
new 2256367-17.patch12.46 KB
new 2256367-interdiff-14-17.txt291.31 KB

Edit: This patch seems to cleanly apply to 9.1.x as well.

Rkumar’s picture

Rkumar commented
StatusFileSize
new Screenshot 2020-06-02 at 3.31.33 PM.png230.96 KB

After applying the patch still can see some occurrences.
To maintain the uniformity, it would be great if we can replace the below occurrence as well.
web site

Rkumar’s picture

Rkumar commented

A correction, I checked it for D9.
Having said that we need this update for D9 as well to fix for all the occurrences.

pradeepjha’s picture

pradeepjha commented
Version: 8.8.x-dev » 9.1.x-dev
StatusFileSize
new 2256367-20.patch16.97 KB
new interdiff_17-20.txt4.49 KB

Thanks @Rkumar. I've make changes for D9 as well. Please check my latest patch.

pradeepjha’s picture

pradeepjha commented
Assigned: Unassigned » pradeepjha
Status: Needs review » Needs work

There minor correction I need to do with my last patch.

pradeepjha’s picture

pradeepjha commented
Assigned: pradeepjha » Unassigned
Status: Needs work » Needs review
StatusFileSize
new 2256367-22.patch17.25 KB
new interdiff_17-22.txt4.32 KB
Rkumar’s picture

Rkumar commented

Now it seems fine. No any occurrence of web sites.

Rkumar’s picture

Rkumar commented
Status: Needs review » Reviewed & tested by the community
xjm’s picture

xjm
she/her
Primary language English
commented
Title: [meta] Consistently use "website" instead of "web site" in Drupal Core docs and UI text » Consistently use "website" instead of "web site" in Drupal Core docs and UI text

Nice work on this issue. It doesn't appear to be a meta.

I considered whether we could use core's new spellchecking to disallow "web site", but I tested it and it doesn't seem to be possible to restrict phrases, only words.

  • xjm committed 54844ec on 9.1.x 
    Issue #2256367 by pradeepjha, cburschka, mgifford, Rkumar, jhodgdon, xjm...
xjm’s picture

xjm
she/her
Primary language English
commented
Status: Reviewed & tested by the community » Fixed

Committed to 9.1.x. Thanks! Since this includes string changes, it should not be backported to a previous version.

xjm’s picture

xjm
she/her
Primary language English
commented

I forgot to mention, @Rkumar, posting screenshots of your codebase or CLI does not advance the issue, since the automated testing infrastructure tells us whether the patch applies correctly. It's better to described what you reviewed and how -- not with screenshots, but by pasting the commands you used, the results, etc. and describing why you think the review you did is sufficient to mark the issue RTBC.

Status: Fixed » Closed (fixed)

Automatically closed - issue fixed for 2 weeks with no activity.