Problem/Motivation

This is a child issue of #2144861: [meta] Replace Drupal in UI text with the name of the distribution, for the following modules/components: views, views_ui.

Drupal has a deal with distributions, that they can replace Drupal with their own Distribution name. Also we have a UI text standard
https://www.drupal.org/docs/develop/user-interface-standards/interface-t...
that says:

Use "Site"—not "Drupal". Referring to Drupal by name complicates distributions, and users may not know the site is running on Drupal.

You can also use terms like "the core software".

But Drupal still appears in the UI.

Proposed resolution

Replace Drupal in UI text with the distribution name, or phrases like "the site" and "the core software".

Remaining tasks

  1. Novice task -- Locate the word "Drupal" appearing in UI text in this group of modules/themes.
  2. Novice task -- Replace each occurence either with "the core software", "the site", or the distribution name. There is a function that will return the distribution name: drupal_install_profile_distribution_name().
  3. Novice task -- Make and upload a patch file, or use an issue fork / merge request workflow.

User interface changes

We will not use the word Drupal in the UI, but instead either show the distribution name or the phrases "the site" or "the core software".

API changes

None.

Data model changes

None.

Release notes snippet

Not necessary.

Issue fork drupal-3187892

Command icon Show commands

Start within a Git clone of the project using the version control instructions.

Or, if you do not have SSH keys set up on git.drupalcode.org:

Comments

dabley created an issue. See original summary.

dabley’s picture

Issue summary: View changes
Status: Active » Needs review

I identified strings to be revised in 5 files, and replaced the word "Drupal" with an alternative in each case. I've uploaded changes into an issue fork, and submitted them via a merge request.

johnalbin’s picture

Status: Needs review » Needs work

I added "+1"s to the MR comments I agreed with, so there's a couple small changes I think we have mini-consensus on. (As much as you can have a consensus among 4 people.)

markdorison made their first commit to this issue’s fork.

markdorison’s picture

Status: Needs work » Needs review

Version: 9.2.x-dev » 9.3.x-dev

Drupal 9.2.0-alpha1 will be released the week of May 3, 2021, which means new developments and disruptive changes should now be targeted for the 9.3.x-dev branch. For more information see the Drupal core minor version schedule and the Allowed changes during the Drupal core release cycle.

Version: 9.3.x-dev » 9.4.x-dev

Drupal 9.3.0-rc1 was released on November 26, 2021, which means new developments and disruptive changes should now be targeted for the 9.4.x-dev branch. For more information see the Drupal core minor version schedule and the Allowed changes during the Drupal core release cycle.

prodigyjoe’s picture

Hi I'm Joseph
I'm at DrupalCon's mentored contribution sprint and I'm testing this patch

prodigyjoe’s picture

I installed this on Simplytest.me, the patch worked just fine
Looks good to me

Version: 9.4.x-dev » 9.5.x-dev

Drupal 9.4.0-alpha1 was released on May 6, 2022, which means new developments and disruptive changes should now be targeted for the 9.5.x-dev branch. For more information see the Drupal core minor version schedule and the Allowed changes during the Drupal core release cycle.

anjali rathod’s picture

Status: Needs review » Needs work

Line 164 of the form field description has the word Drupal in it.
/www/web/core/modules/views_ui/src/Form/BasicSettingsForm.php

volkswagenchick’s picture

Issue tags: +Prague2022

Tagging for DrupalCon Prague

andrew robinson’s picture

Hi I'm Andrew
I'm at DrupalCon Prague's mentored contribution sprint and I'm working on this issue

robincs’s picture

I searched with RegEx for "Drupal" Occurences in t-Functions ([ >]t\(["'].*Drupal.*["']\)).
The only occurence I can find (excluding classes and variables) is at core/modules/views/src/Plugin/views/field/FieldPluginBase.php line 1007:

$this->t('This can be an internal path such as node/add or an external URL such as "https://www.drupal.org". You may use the "Replacement patterns" above.')
andrew robinson’s picture

The instance reported in comment #12 was fixed in commit 3ff1303e.
I have searched the codebase and found no further instances of the word Drupal.

asad_ahmed’s picture

StatusFileSize
new1.03 KB

Replace Drupal with the Site as per #12 and not sure to replace drupal.org external path as per #15, would like to hear from the community members. Thanks

dabley’s picture

I would say that the reference to drupal.org in #15 does not need to be replaced, as it is simply there as an example of an external URL. Still, perhaps for clarity it could be changed to "https://www.example.com".

pradhumanjain2311’s picture

Assigned: Unassigned » pradhumanjain2311
pradhumanjain2311’s picture

Assigned: pradhumanjain2311 » Unassigned
Status: Needs work » Needs review
StatusFileSize
new2.08 KB
new1.05 KB

@dabley, Made changes as per comment #18 needs review .

rkoller’s picture

Status: Needs review » Needs work

I've taken a quick look at the patches in #17 and and #20. The patch in #17 provides the changes to a single string and the patch #20 just adds a second string. But both patches miss all changes already made in MR142?

about the actual changes in#17. The sentence sounds incomplete. I wonder would it make sense to add an article and change the beginning of the string from Site has the potential to run... to The site has the potential to run...?

and i agree with #18. the external link to drupal.org hasn't to be replaced necessarily nevertheless i consider the suggested replacement with example.com the cleaner clearer approach.

about the actual changes in #20. The patch provides the suggested changes in #18 by changing the url from drupal.org to example.com but misses the changes for the actual string proposed in #15. the term Drupal path is still used. Both suggestions from #15 and #18 applied would lead to This can be an internal path such as node/add or an external URL such as "https://www.example.com". You may use the "Replacement patterns" above.

Manoj Raj.R’s picture

StatusFileSize
new2.08 KB

@rkoller, Made changes as per the comment #21 needs review.

rkoller’s picture

thank you. the two strings in question i've summarized in #21 look good to me. but all the changes from merge request 142 (https://git.drupalcode.org/project/drupal/-/merge_requests/142.diff) are still missing in the patch. committing the changes to the merge request, where the main work was done so far, might be still the best choice. or the other way around add the changes from merge request to the patch.

Manoj Raj.R’s picture

StatusFileSize
new9.14 KB

@rkoller
Thank you for notifying around.
Have added the changes from merge request patch of 142 and as per the comment #21 needs review.

Manoj Raj.R’s picture

Status: Needs work » Needs review

Version: 9.5.x-dev » 10.1.x-dev

Drupal 9.5.0-beta2 and Drupal 10.0.0-beta2 were released on September 29, 2022, which means new developments and disruptive changes should now be targeted for the 10.1.x-dev branch. For more information see the Drupal core minor version schedule and the Allowed changes during the Drupal core release cycle.

sahil.goyal’s picture

StatusFileSize
new17.54 KB
new14.27 KB

Hi, Observed few more changes where we need to replace Drupal to in the patch and updating new patch against 10.1.x.

roshni_k’s picture

Assigned: Unassigned » roshni_k
smustgrave’s picture

Status: Needs review » Reviewed & tested by the community

Looks like the changes from the MR are included. From what I can tell everything has been covered.

quietone’s picture

Status: Reviewed & tested by the community » Needs work
Issue tags: +Needs manual testing

Thanks for moving this forward!

The Issue Summary states that the task here is to remove 'Drupal' from UI text, as does the title. However, the patch is changing code comments. The out of scope changes need to be removed.

Also, this is changing text in Views which displays lots of text and options. I don't think it makes sense to have screenshots of every change, but perhaps for some. This does need manual testing to make sure that all the text is displayed correct and is correct English.

smustgrave’s picture

Status: Needs work » Needs review
StatusFileSize
new7.17 KB
new8.57 KB

Removed the comment changes.

Wasn't sure about @ViewsQuery() but left them as is.

Reviewing the text changes makes sense to me. Though will admit I thought "Drupal" made more sense in some places.

Leaving the manual testing as there are several places to check.

rkoller’s picture

In regards of your question about viewsquery, I agree that the current state sounds a bit off without Drupal (the proposed change misses the context which database API is actually used) . Maybe it would make sense to mind the suggested pattern from the proposed resolutions section in the issue summary?

Currently the string is changed to Query will be generated and run using the database API in #31 but why not change it to something like
Query will be generated and run using the core softwares database API instead. I am only puzzled what the correct possessive form for softwares would be? softwares', software's, or just softwares? not a native speaker and i am uncertain about that detail all the time :/

smustgrave’s picture

Status: Needs review » Needs work

Sounds like there is more work to be done.

I think using just the word software can be used in plural also?

rkoller’s picture

According to this english stackexchange comment not necessarily: https://english.stackexchange.com/a/210926/20461. But from my understanding, in the context of the sentence in question, it sounds like a singular noun? And with the noun software being singular i would suggest going with an apostrophe: Query will be generated and run using the core software's database API? (https://www.sussex.ac.uk/informatics/punctuation/apostrophe/possessives).

and will take a closer look at the rest of the strings tomorrow again.

roshni_k’s picture

Assigned: roshni_k » Unassigned
prem suthar’s picture

StatusFileSize
new8.55 KB
new595 bytes

Re-Roll The patch As per suggestion #32 to #34.

prem suthar’s picture

Status: Needs work » Needs review
sahilgidwani’s picture

Status: Needs review » Reviewed & tested by the community

I have reviewed and applied the patch and it works perfect for 10.1.x.

xjm’s picture

Status: Reviewed & tested by the community » Closed (duplicate)

Doing cleanups like this on a per-module basis is explicitly prohibited by the core issue scope guidelines. See #2144861-31: [meta] Replace Drupal in UI text with the name of the distribution for more information. Thanks!