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:
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.

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. 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
  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.

CommentFileSizeAuthor
#23 replaced-drupal-site-2143615-23.patch7.45 KBAnjali Rathod
#6 distro_name_translation_website-2143615-6-do-not-test.patch5.53 KBYesCT
Support from Acquia helps fund testing for Drupal Acquia logo

Comments

Gábor Hojtsy’s picture

Gábor Hojtsy
he/him
Primary language Hungarian
Location Hungary
CreditAttribution: Gábor Hojtsy commented

I don't think that is a problem. The translation website of the distro in that case is hte same as the Drupal translation website.

YesCT’s picture

YesCT CreditAttribution: YesCT commented
Title: Drupal translation website vs distribution_name translation website » Use distribution name in locale instead of Drupal, example: Drupal translation website vs distribution_name translation website
Assigned: Unassigned » YesCT
Issue summary: View changes

#1861930-53: Use "Drupal translations website" instead of Drupal translation server or Community translation server proposes to take out the Drupal to @Drupal change.

Here we can replace (or remove) all the "Drupal"s in locale. there are more than just in the phrase Drupal translation website.

Also, lets leave the very first screen in the language installer for #1386394: Add back the ability for install profiles (or at least distros) to pre-select a language or modify the language-selection screen,
or
just call it translation website and leave off the Drupal/Distribution name.
===
patch coming to move the code over from the other server -> website issue.

YesCT’s picture

YesCT CreditAttribution: YesCT commented
Related issues: +#1386394: Add back the ability for install profiles (or at least distros) to pre-select a language or modify the language-selection screen
YesCT’s picture

YesCT CreditAttribution: YesCT commented
Parent issue: » #2144861: [meta] Replace Drupal in UI text with the name of the distribution
YesCT’s picture

YesCT CreditAttribution: YesCT commented

in server/website issue I was wondering why there was a new function, maybe so we dont have to:

+++ b/core/modules/system/lib/Drupal/system/Form/ModulesListForm.php
@@ -77,7 +77,7 @@ public function getFormId() {
     require_once DRUPAL_ROOT . '/core/includes/install.inc';
YesCT’s picture

YesCT CreditAttribution: YesCT commented
Assigned: YesCT » Unassigned
Issue summary: View changes
FileSize
distro_name_translation_website-2143615-6-do-not-test.patch5.53 KB

patch is do-not-test because it wont apply until #1861930: Use "Drupal translations website" instead of Drupal translation server or Community translation server is committed.

patch has just those Drupal @Drupal replacements I took out of #1861930-41: Use "Drupal translations website" instead of Drupal translation server or Community translation server which was by @mr.york
but attempts to just reuse the install function: drupal_install_profile_distribution_name()
does not put a new function in common.inc yet (I'm still not clear on why we need that.)

Do we want to replace the others in locale? (or reword them to take out "Drupal")

I think the remaining ones are (mostly in the module help):

core/modules/locale/locale.module:      $output .= '<p>' . t('The Locale module allows your Drupal site to be presented in languages other than the default English, and to be multilingual. The Locale module works by maintaining a database of translations, and examining text as it is about to be displayed. When a translation of the text is available in the language to be displayed, the translation is displayed rather than the original text. When a translation is unavailable, the original text is displayed, and then stored for review by a translator. For more information, see the online handbook entry for <a href="@locale">Locale module</a>.', array('@locale' => 'http://drupal.org/documentation/modules/locale/')) . '</p>';
core/modules/locale/locale.module:      $output .= '<dd>' . t('Translations of text in the Drupal interface may be provided by:');
core/modules/locale/locale.module:      $output .= '<li>' . t('<a href="@update">Automatic import</a> of translations when you add a language or enable a module or theme. These translations are obtained from the <a href="@url">Drupal translation website</a>. Although Drupal modules and themes may not be fully translated in all languages, new translations become available frequently. Interface translation updates can be downloaded and installed automatically at <a href="@config">regular intervals</a>.', array('@url' => 'http://localize.drupal.org', '@update' => url('admin/reports/translations'), '@config' => url('admin/config/regional/translate/settings'))) . '</li>';
core/modules/locale/locale.pages.inc:            'name' => $project_info->name == 'drupal' ? t('Drupal core') : $project_data[$project_info->name]->info['name'],

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.

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

Drupal 8.8.7 was released on June 3, 2020 and is the final full bugfix release for the Drupal 8.8.x series. Drupal 8.8.x will not receive any further development aside from security fixes. Sites should prepare to update to Drupal 8.9.0 or Drupal 9.0.0 for ongoing support.

Bug reports should be targeted against the 8.9.x-dev branch from now on, and new development or disruptive changes should 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.

jhodgdon’s picture

jhodgdon
she/her
Primary language English
CreditAttribution: jhodgdon commented
Title: Use distribution name in locale instead of Drupal, example: Drupal translation website vs distribution_name translation website » Replace "Drupal" in UI text with the distribution name, the site, or the core software in config_translation, content_translation, locale, language, and translation server parts of installer
Version: 8.9.x-dev » 9.2.x-dev
Issue summary: View changes
Issue tags: +Novice

Updating issue summary/title as per standards of parent issue.

jhodgdon’s picture

jhodgdon
she/her
Primary language English
CreditAttribution: jhodgdon commented
Issue summary: View changes
jhodgdon’s picture

jhodgdon
she/her
Primary language English
CreditAttribution: jhodgdon commented
Title: Replace "Drupal" in UI text with the distribution name, the site, or the core software in config_translation, content_translation, locale, language, and translation server parts of installer » No "Drupal" in UI text -- config_translation, content_translation, locale, language, and translation server parts of installer

Streamline title

dabley’s picture

dabley CreditAttribution: dabley commented
Issue summary: View changes

Fixed missing open < in issue summary.

dabley’s picture

dabley CreditAttribution: dabley commented
Issue summary: View changes

Minor edit to description punctuation.

dabley’s picture

dabley CreditAttribution: dabley commented
Issue summary: View changes

Better fix for description punctuation.

jhodgdon’s picture

jhodgdon
she/her
Primary language English
CreditAttribution: jhodgdon commented
Issue summary: View changes

Adding regular expression for finding 'drupal'.

Anjali Rathod’s picture

Anjali Rathod
Primary language English
CreditAttribution: Anjali Rathod as a volunteer and at QED42 for Drupal Association commented
Assigned: Unassigned » Anjali Rathod
Anjali Rathod’s picture

Anjali Rathod
Primary language English
CreditAttribution: Anjali Rathod as a volunteer and at QED42 for Drupal Association commented
Assigned: Anjali Rathod » Unassigned
Status: Active » Needs review
FileSize
replaced-drupal-site-2143615-23.patch7.45 KB
guilhermevp’s picture

guilhermevp CreditAttribution: guilhermevp at CI&T commented
Status: Needs review » Reviewed & tested by the community

Looks like everything is ok based in my experience with similar issue.

catch’s picture

catch
he/him
Primary language English
CreditAttribution: catch at Third and Grove commented
Status: Reviewed & tested by the community » Needs work
Issue tags: -Novice +Needs product manager review 
+++ 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.',
       ],

The parent 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.

- 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 .= '<dt>' . t('Translating individual strings') . '</dt>';

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.

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

xjm
she/her
Primary language English
CreditAttribution: xjm commented
Status: Needs work » 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!