diff --git a/core/modules/language/config/install/tour.tour.language-add.yml b/core/modules/language/config/install/tour.tour.language-add.yml index ce7298f..8f39e49 100644 --- a/core/modules/language/config/install/tour.tour.language-add.yml +++ b/core/modules/language/config/install/tour.tour.language-add.yml @@ -15,7 +15,7 @@ tips: id: language-add-choose plugin: text label: 'Select language' - body: '

Choose a language from the list, or choose "Custom language..." at the end of the list.

Click the "Add language" button when you are done choosing your language.

When adding a custom language, you will get an additional form where you can provide the name, code and direction of the language.

' + body: '

Choose a language from the list, or choose "Custom language..." at the end of the list.

Click the "Add language" button when you are done choosing your language.

When adding a custom language, you will get an additional form where you can provide the name, code, and direction of the language.

' weight: 2 attributes: data-id: edit-predefined-langcode @@ -23,5 +23,5 @@ tips: id: language-add-continue plugin: text label: 'Continuing on' - body: '

Now that you have an overview of the "Add languages" feature, you can continue by:

' + body: '

Now that you have an overview of the "Add languages" feature, you can continue by:

' weight: 3 diff --git a/core/modules/language/config/install/tour.tour.language-edit.yml b/core/modules/language/config/install/tour.tour.language-edit.yml index f2456a9..5b16513 100644 --- a/core/modules/language/config/install/tour.tour.language-edit.yml +++ b/core/modules/language/config/install/tour.tour.language-edit.yml @@ -15,7 +15,7 @@ tips: id: language-edit-langcode plugin: text label: 'Language code' - body: '

You cannot change the code of the language on the site, since it is used by the system to keep track of the language.

' + body: '

You cannot change the code of a language on the site, since it is used by the system to keep track of the language.

' weight: 2 attributes: data-id: edit-langcode-view @@ -23,7 +23,7 @@ tips: id: language-edit-label plugin: text label: 'Language name' - body: '

The language name is used throughout the site for all users and is typically written in the same language it represents.

' + body: '

The language name is used throughout the site for all users and is typically written in English and then translated using Configuration Translation. If you want to provide the name in another language, you have to set the language of the configuration to that other language first.

' weight: 3 attributes: data-id: edit-label @@ -39,5 +39,5 @@ tips: id: language-edit-continue plugin: text label: 'Continuing on' - body: '

Now that you have an overview of the "Edit language" feature, you can continue by:

' + body: '

Now that you have an overview of the "Edit language" feature, you can continue by:

' weight: 5 diff --git a/core/modules/language/config/install/tour.tour.language.yml b/core/modules/language/config/install/tour.tour.language.yml index db22ebf..fb0c4d8 100644 --- a/core/modules/language/config/install/tour.tour.language.yml +++ b/core/modules/language/config/install/tour.tour.language.yml @@ -9,13 +9,13 @@ tips: id: language-overview plugin: text label: Languages - body: '

The "Languages" page provides features for adding, editing, deleting, and reordering languages for the site.

' + body: '

The "Languages" page allows you to add, edit, delete, and reorder languages for the site.

' weight: 1 language-add: id: language-add plugin: text label: 'Adding languages' - body: '

To add more languages to your site, click the "Add language" button.

After adding a new language, it will be displayed in the language list and can then be edited, reordered, and deleted.

' + body: '

To add more languages to your site, click the "Add language" button.

Added languages will be displayed in the language list and can then be edited or deleted.

' weight: 2 attributes: data-class: button-action @@ -23,16 +23,24 @@ tips: id: language-reorder plugin: text label: 'Reordering languages' - body: '

To reorder the languages on your site, use the drag icons next to each language.

This order will determine the order in which languages are displayed in lists on the site such as in the language switcher blocks provided by the "Interface translation" and "Content translation" modules.

When you are done with reordering the languages, click the "Save configuration" button for the changes to take effect.

' + body: '

To reorder the languages on your site, use the drag icons next to each language.

The order shown here is the display order for language lists on the site such as in the language switcher blocks provided by the Interface translation and Content translation modules.

When you are done with reordering the languages, click the "Save configuration" button for the changes to take effect.

' weight: 3 attributes: data-class: draggable + language-default: + id: language-default + plugin: text + label: 'Set a language as default' + body: '

You can change the default language of the site by choosing one of your configured languages as default. The site will use the default language in situations were no choice is made but a language should be set, for example the language in which the interface of the site is displayed.

' + weight: 4 + attributes: + data-class: form-item-site-default-language language-operations: id: language-operations plugin: text label: 'Modifying languages' - body: '

Operations are provided for editing and deleting your languages.

You can edit the name and the direction of the language.

Deleted languages can be added back at a later time. Note that you cannot delete the default language of the site.

' - weight: 4 + body: '

Operations are provided for editing and deleting your languages.

You can edit the name and the direction of the language.

Deleted languages can be added back at a later time. Deleting a language will remove all interface translations associated with it, and content in this language will be set to be language neutral. Note that you cannot delete the default language of the site.

' + weight: 5 attributes: data-class: dropbutton-wrapper language-continue: @@ -40,4 +48,4 @@ tips: plugin: text label: 'Continuing on' body: '

Now that you have an overview of the "Languages" page, you can continue by:

' - weight: 5 + weight: 6 diff --git a/core/modules/language/language.module b/core/modules/language/language.module index 7f57a28..9a55958 100644 --- a/core/modules/language/language.module +++ b/core/modules/language/language.module @@ -56,7 +56,7 @@ function language_help($route_name, RouteMatchInterface $route_match) { return $output; case 'entity.configurable_language.collection': - $output = '

' . t('Reorder the added languages to set their order in the language switcher block and, when editing content, in the list of selectable languages. This ordering does not impact detection and selection.', array('@detection' => \Drupal::url('language.negotiation'))) . '

'; + $output = '

' . t('Reorder the configured languages to set their order in the language switcher block and, when editing content, in the list of selectable languages. This ordering does not impact detection and selection.', array('@detection' => \Drupal::url('language.negotiation'))) . '

'; $output .= '

' . t('The site default language can also be set. It is not recommended to change the default language on a working site. Configure the Selected language setting on the detection and selection page to change the fallback language for language selection.', array('@language-detection' => \Drupal::url('language.negotiation'))) . '

'; return $output; @@ -81,13 +81,13 @@ function language_help($route_name, RouteMatchInterface $route_match) { case 'entity.block.edit_form': if (($block = $route_match->getParameter('block')) && $block->getPluginId() == 'language_block:language_interface') { - return '

' . t('With multiple languages added, registered users can select their preferred language and authors can assign a specific language to content.') . '

'; + return '

' . t('With multiple languages configured, registered users can select their preferred language and authors can assign a specific language to content.') . '

'; } break; case 'block.admin_add': if ($route_match->getParameter('plugin_id') == 'language_block:language_interface') { - return '

' . t('With multiple languages added, registered users can select their preferred language and authors can assign a specific language to content.') . '

'; + return '

' . t('With multiple languages configured, registered users can select their preferred language and authors can assign a specific language to content.') . '

'; } break; @@ -521,10 +521,10 @@ function language_tour_tips_alter(array &$tour_tips, EntityInterface $entity) { if ($tour_tip->get('id') == 'language-overview') { $additional_overview = ''; if (Drupal::service('module_handler')->moduleExists('locale')) { - $additional_overview = t("This page also provides an overview of how much of the site\'s interface has been translated for each added language."); + $additional_overview = t("This page also provides an overview of how much of the site's interface has been translated for each configured language."); } else { - $additional_overview = t('If the "Interface translation" module is enabled, this page will provide an overview of how much of the site\'s interface has been translated for each added language.'); + $additional_overview = t("If the Interface Translation module is enabled, this page will provide an overview of how much of the site\'s interface has been translated for each configured language."); } $tour_tip->set('body', $tour_tip->get('body') . '

' . $additional_overview . '

'); } @@ -532,10 +532,10 @@ function language_tour_tips_alter(array &$tour_tips, EntityInterface $entity) { $additional_continue = ''; $additional_modules = array(); if (!Drupal::service('module_handler')->moduleExists('locale')) { - $additional_modules[] = 'Interface translation'; + $additional_modules[] = t('Interface Translation'); } if (!Drupal::service('module_handler')->moduleExists('translation_entity')) { - $additional_modules[] = 'Content translation'; + $additional_modules[] = t('Content Translation'); } if (!empty($additional_modules)) { $additional_continue = t('Depending on your site features, additional modules that you might want to enable are:') . '