Problem/Motivation

Inspired by #2143615: No "Drupal" in UI text -- config_translation, content_translation, locale, language, and translation server parts of installer.

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. Here are some examples:

core/includes/install.core.inc:  drupal_set_title(t('Drupal already installed'));
core/includes/install.core.inc:      'description' => t('The installer requires that you create a translations directory as part of the installation process. Create the directory %translations_directory . More details about installing Drupal are available in <a href="@install_txt">INSTALL.txt</a>.', array('%translations_directory' => $translations_directory, '@install_txt' => base_path() . 'core/INSTALL.txt')),
core/includes/install.core.inc:        'description' => t('The @drupal installer requires that you create a settings file as part of the installation process. Copy the %default_file file to %file. More details about installing Drupal are available in <a href="@install_txt">INSTALL.txt</a>.', array('@drupal' => drupal_install_profile_distribution_name(), '%file' => $file, '%default_file' => $default_settings_file, '@install_txt' => base_path() . 'core/INSTALL.txt')),

That last one is interesting, because the first spot says @drupal and replaces it with the distribution name, but later in the same string it uses the word Drupal specifically.

You can find other usage by using a grep command looking for "Drupal" inside of quotes. Here's a grep command that yields some false positives, but should find most/all of what we're looking for:

egrep -i -e "'[^']*[^/\]drupal[^/\]" -e '"[^"]*[^/\]drupal[^/\]' `find . \( -type d -name tests \) -prune -o -type f -print` | grep -i --color drupal

Proposed resolution

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

Remaining tasks

Make an issue for each group of modules/themes in the following list, and complete the issues.

Novice task:

  1. Find a module group in the list that doesn't have an issue yet.
  2. Click "Add child issue" in the sidebar of this issue to create a child issue.
  3. Fill in the issue fields:
    • Title: No "Drupal" in UI text -- _________
      (Replace ___________________ with the group of modules/themes you are working on)
    • Category: Task
    • Version: 9.2.x-dev (or the current latest 9.x development version)
    • Component: one of the modules from the list in the group you are creating the issue for
    • Issue tags: Novice
    • Issue summary -- Replace the default summary with this:
      <h3 id="summary-problem-motivation">Problem/Motivation</h3>
      
      This is a child issue of [#2144861: [meta] Replace Drupal in UI text with the name of the distribution], for the following modules/components: ______________________________________________.
      
      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-text#interface-text-wording
      that says:
      <blockquote>
      Use "Site"—not "Drupal". Referring to Drupal by name complicates distributions, and users may not know the site is running on Drupal.
      </blockquote>
      You can also use terms like "the core software".
      
      But Drupal still appears in the UI.
      
      <h3 id="summary-proposed-resolution">Proposed resolution</h3>
      
      Replace Drupal in UI text with the distribution name, or phrases like "the site" and "the core software".
      
      <h3 id="summary-remaining-tasks">Remaining tasks</h3>
      <ol>
      <li><strong>Novice task</strong> -- Locate the word "Drupal" appearing in UI text in this group of modules/themes. Here's a grep command that yields some false positives, but should find most/all of what we're looking for:
      
      egrep -i -e "'[^']*[^/\]drupal[^/\]" -e '"[^"]*[^/\]drupal[^/\]' `find . \( -type d -name tests \) -prune -o -type f -print` | grep -i --color drupal
      </li>
      <li><strong>Novice task</strong> -- Replace each occurrence 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().</li>
      <li><strong>Novice task</strong> -- Make and upload a patch file, or use an issue fork / merge request workflow.</li>
      </ol>
      
      <h3 id="summary-ui-changes">User interface changes</h3>
      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".
      
      <h3 id="summary-api-changes">API changes</h3>
      None.
      
      <h3 id="summary-data-model-changes">Data model changes</h3>
      None.
      
      <h3 id="summary-release-notes">Release notes snippet</h3>
      Not necessary.
      
    • In the beginning of the issue summary, replace _____________________ with the group of modules/themes for this issue.
  4. Save the issue
  5. Edit the issue summary of this issue to include a link to your new child issue. To make a link to an issue, use a syntax like
    [#1234567]
    

    replacing the number with the issue number you just created.

  6. Add a comment to this issue saying you made a child issue and save.

Issues that need to be made or completed

Already done

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.

Comments

yesct’s picture

Issue summary: View changes

oops. left one from tests in. I had taken out the other ones from tests.

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.

avpaderno’s picture

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

Version: 8.9.x-dev » 9.1.x-dev

Drupal 8.9.0-beta1 was released on March 20, 2020. 8.9.x is the final, long-term support (LTS) minor release of Drupal 8, which means new developments and disruptive changes should now be targeted against the 9.1.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.

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

Drupal 9.1.0-alpha1 will be released the week of October 19, 2020, which means new developments and disruptive changes should now be targeted for the 9.2.x-dev branch. For more information see the Drupal 9 minor version schedule and the Allowed changes during the Drupal 9 release cycle.

jhodgdon’s picture

Issue summary: View changes

Adding some notes to this.

jhodgdon’s picture

Issue summary: View changes
Issue tags: +Novice, +Europe2020

Separating this into groups of modules and making explicit Novice tasks.

Novice issue reserved for the Mentored Contribution during the Contribution Day at Europe2020. After the 11th December 2020, this issue returns to being open to all. Thanks
jhodgdon’s picture

Issue summary: View changes

Fix list of child issues.

jhodgdon’s picture

Issue summary: View changes

Proposed child issue title is way too long. Streamlining suggestion.

dabley’s picture

Issue summary: View changes

Added child issue for: views, views_ui

dabley’s picture

dabley’s picture

Here is a grep command that will find occurrences of "drupal" that are likely to need replacing:

egrep -i -e "'[^']*[^/\]drupal[^/\]" -e '"[^"]*[^/\]drupal[^/\]' `find . \( -type d -name tests \) -prune -o -type f -print` | grep -i --color drupal

This aims to find the word "drupal" inside a string enclosed by single or double quotes. This isn't perfect by any means (occurrences of "drupal" following a quoted string will also be reported, for example), but hopefully everything that might need to be changed will be shown. (I'm assuming that we're not interested in anything that's part of testing.)

jhodgdon’s picture

Issue summary: View changes

Thanks, that looks very helpful! It does give some false positives, but better than than missing some things we do need to change. Let's add this to the issue summary.

Also, thanks for making some child issues!

Indeed we do not want to worry about things in tests, although if we change UI text and that text is being tested in a test, we'll have to do a corresponding update in the test. But we'll know that if a patch is uploaded, because it will fail the test.

jhodgdon’s picture

Issue summary: View changes

Uh ho, can't use a code tag within a code tag! Fixing summary.

quietone credited RobRoy.

quietone credited webchick.

quietone’s picture

Closed #98905: Remove the word 'Drupal' from interface as a duplicate, adding credit. That issue referenced #182991: Standardize on "internal path" instead of "Drupal path" or "system path" which I am adding as a reference here as well because it also removes Drupal from the user facing text, and has a patch.

catch’s picture

Copying over my comment from #2143615: No "Drupal" in UI text -- config_translation, content_translation, locale, language, and translation server parts of installer since this is probably the issue to have that discussion (or a policy, no patch spin-off).

This issue was opened in 2013 and it feels a bit like things have moved on since then. IMO we need to rethink the basis for the overall change.

- In 2013, if you installed a distribution, Drupal core would change very little while the distribution might change a lot - until you got to a new major Drupal version which could be years away. Drupal core now has minor releases every six months, and the string changes here obfuscate this a bit. We're really talking about Drupal version and that is meaningful information, not 'site version' which is not really a concept.

For example here:

+++ b/core/modules/locale/locale.install
@@ -172,7 +172,7 @@ function locale_schema() {
         'default' => 'none',
-        'description' => 'Version of Drupal where the location was found.',
+        'description' => 'Version of site where the location was found.',
       ],

- If we replaced Drupal with $distribution_name instead of 'site' that might help, but the version of a distribution is not going to match the Drupal core version at all, so it would still be misleading.

- Also I wonder how many distributions actually try to suppress the fact they're built on Drupal?

+++ b/core/modules/locale/locale.module
@@ -155,9 +155,9 @@ function locale_help($route_name, RouteMatchInterface $route_match) {
       $output .= '<dl>';
       $output .= '<dt>' . t('Importing translation files') . '</dt>';
-      $output .= '<dd>' . t('Translation files with translated interface text are imported automatically when languages are added on the <a href=":languages">Languages</a> page, or when modules or themes are enabled. On the <a href=":locale-settings">Interface translation settings</a> page, the <em>Translation source</em> can be restricted to local files only, or to include the <a href=":server">Drupal translation server</a>. Although modules and themes may not be fully translated in all languages, new translations become available frequently. You can specify whether and how often to check for translation file updates and whether to overwrite existing translations on the <a href=":locale-settings">Interface translation settings</a> page. You can also manually import a translation file on the <a href=":import">Interface translation import</a> page.', [':import' => Url::fromRoute('locale.translate_import')->toString(), ':locale-settings' => Url::fromRoute('locale.settings')->toString(), ':languages' => Url::fromRoute('entity.configurable_language.collection')->toString(), ':server' => 'https://localize.drupal.org']) . '</dd>';
+      $output .= '<dd>' . t('Translation files with translated interface text are imported automatically when languages are added on the <a href=":languages">Languages</a> page, or when modules or themes are enabled. On the <a href=":locale-settings">Interface translation settings</a> page, the <em>Translation source</em> can be restricted to local files only, or to include the <a href=":server">site translation server</a>. Although modules and themes may not be fully translated in all languages, new translations become available frequently. You can specify whether and how often to check for translation file updates and whether to overwrite existing translations on the <a href=":locale-settings">Interface translation settings</a> page. You can also manually import a translation file on the <a href=":import">Interface translation import</a> page.', [':import' => Url::fromRoute('locale.translate_import')->toString(), ':locale-settings' => Url::fromRoute('locale.settings')->toString(), ':languages' => Url::fromRoute('entity.configurable_language.collection')->toString(), ':server' => 'https://localize.drupal.org']) . '</dd>';
   

On top of that, this link goes to localize.drupal.org, so changing the string name doesn't actually help to obfuscate the fact we're running Drupal at all.

catch’s picture

[duplicate comment]

catch’s picture

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.

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.

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.

xjm’s picture

Splitting up cleanups like these by modules is explicitly prohibited by the core issue scope guidelines. Issues should be subdivided by the pattern or type of usage, not a module or set of modules.

Please merge these into a single patch; there aren't that many. If unmanageable when combined and split up, the scoping should be based around whether it's in YAML or a t() call or whatever.

xjm credited Anjali Rathod.

xjm credited guilhermevp.

xjm credited Manoj Raj.R.

xjm credited Prem Suthar.

xjm credited rkoller.

xjm credited RobinCS.

xjm credited smustgrave.

xjm’s picture

I closed the child issues as duplicates. Adding credits for those issues' participants according to core credit guidelines. Thanks!

xjm’s picture

Marking for an IS update to remove the incorrect scoping recommendations.

xjm credited markdorison.

xjm’s picture

 

dabley’s picture

I guess the core issue scope guidelines may have changed since this issue was created in November 2013. It seems I wasted my time creating those child issues a couple of years ago!

xjm’s picture

@dabley, yep, around 2014 or 2015 is when we learned hard lessons about the bad things that happen when we scope things by module. Sorry about the wasted time! But hopefully we can merge the three issues together here pretty easily.

dabley’s picture

@xjm, yes I'm sure it makes sense. It was all good practice for me as a beginner with Drupal.

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

Drupal core is moving towards using a “main” branch. As an interim step, a new 11.x branch has been opened, as Drupal.org infrastructure cannot currently fully support a branch named main. New developments and disruptive changes should now be targeted for the 11.x branch, which currently accepts only minor-version allowed changes. For more information, see the Drupal core minor version schedule and the Allowed changes during the Drupal core release cycle.

Version: 11.x-dev » main

Drupal core is now using the main branch as the primary development branch. New developments and disruptive changes should now be targeted to the main branch.

Read more in the announcement.