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
- Novice task -- Locate the word "Drupal" appearing in UI text in this group of modules/themes.
- 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().
- 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.
| Comment | File | Size | Author |
|---|---|---|---|
| #36 | interdiff_31-36.txt | 595 bytes | prem suthar |
| #36 | 3187892-36.patch | 8.55 KB | prem suthar |
| #31 | 3187892-31.patch | 8.57 KB | smustgrave |
| #31 | interdiff-27-31.txt | 7.17 KB | smustgrave |
Issue fork drupal-3187892
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:
- 3187892-no-drupal-in
changes, plain diff MR !142
Comments
Comment #3
dabley commentedI 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.
Comment #4
johnalbinI 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.)
Comment #6
markdorisonComment #9
prodigyjoe commentedHi I'm Joseph
I'm at DrupalCon's mentored contribution sprint and I'm testing this patch
Comment #10
prodigyjoe commentedI installed this on Simplytest.me, the patch worked just fine
Looks good to me
Comment #12
anjali rathodLine 164 of the form field description has the word Drupal in it.
/www/web/core/modules/views_ui/src/Form/BasicSettingsForm.php
Comment #13
volkswagenchickTagging for DrupalCon Prague
Comment #14
andrew robinson commentedHi I'm Andrew
I'm at DrupalCon Prague's mentored contribution sprint and I'm working on this issue
Comment #15
robincsI 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:
Comment #16
andrew robinson commentedThe instance reported in comment #12 was fixed in commit 3ff1303e.
I have searched the codebase and found no further instances of the word Drupal.
Comment #17
asad_ahmed commentedReplace 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
Comment #18
dabley commentedI 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".
Comment #19
pradhumanjain2311 commentedComment #20
pradhumanjain2311 commented@dabley, Made changes as per comment #18 needs review .
Comment #21
rkollerI'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...toThe 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.orgtoexample.combut misses the changes for the actual string proposed in #15. the termDrupal pathis still used. Both suggestions from #15 and #18 applied would lead toThis 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.Comment #22
Manoj Raj.R commented@rkoller, Made changes as per the comment #21 needs review.
Comment #23
rkollerthank 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.
Comment #24
Manoj Raj.R commented@rkoller
Thank you for notifying around.
Have added the changes from merge request patch of 142 and as per the comment #21 needs review.
Comment #25
Manoj Raj.R commentedComment #27
sahil.goyal commentedHi, Observed few more changes where we need to replace Drupal to in the patch and updating new patch against 10.1.x.
Comment #28
roshni_k commentedComment #29
smustgrave commentedLooks like the changes from the MR are included. From what I can tell everything has been covered.
Comment #30
quietone commentedThanks 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.
Comment #31
smustgrave commentedRemoved 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.
Comment #32
rkollerIn 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 APIin #31 but why not change it to something likeQuery will be generated and run using the core softwares database APIinstead. 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 :/Comment #33
smustgrave commentedSounds like there is more work to be done.
I think using just the word software can be used in plural also?
Comment #34
rkollerAccording 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
softwarebeing 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.
Comment #35
roshni_k commentedComment #36
prem suthar commentedRe-Roll The patch As per suggestion #32 to #34.
Comment #37
prem suthar commentedComment #38
sahilgidwani commentedI have reviewed and applied the patch and it works perfect for 10.1.x.
Comment #39
xjmDoing 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!