Issue #2341341 by YesCT, martin107, vijaycs85, fran seva: Change public 'name'...

Issue #2341341 by YesCT, martin107, vijaycs85, fran seva: Change public 'name' property access on languages to getName() and add back setName().

core/includes/update.inc

@@ -744,9 +744,9 @@ function update_language_list($flags = LanguageInterface::STATE_CONFIGURABLE) {
 
   // Add the site's default language if flagged as allowed value.
   if ($flags & LanguageInterface::STATE_SITE_DEFAULT) {
-    $default = isset($default) ? $default : \Drupal::languageManager()->getDefaultLanguage();
+    $default = \Drupal::languageManager()->getDefaultLanguage();
     // Rename the default language.
-    $default->name = t("Site's default language (@lang_name)", array('@lang_name' => $default->name));
+    $default->setName(t("Site's default language (@lang_name)", array('@lang_name' => $default->getName())));
     $filtered_languages[LanguageInterface::LANGCODE_SITE_DEFAULT] = $default;
   }
 

core/lib/Drupal/Core/Language/Language.php

@@ -34,7 +34,7 @@ class Language implements LanguageInterface {
    *
    * @var string
    */
-  public $name = '';
+  protected $name = '';
 
   /**
    * The ID, langcode.
@@ -103,6 +103,15 @@ public function getName() {
     return $this->name;
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function setName($name) {
+    $this->name = $name;
+
+    return $this;
+  }
+
   /**
    * {@inheritdoc}
    */

core/lib/Drupal/Core/Language/LanguageInterface.php

@@ -109,6 +109,16 @@ interface LanguageInterface {
    */
   public function getName();
 
+  /**
+   * Sets the name of the language.
+   *
+   * @param string $name
+   *   The human-readable English name of the language.
+   *
+   * @return $this
+   */
+  public function setName($name);
+
   /**
    * Gets the ID (language code).
    *

core/lib/Drupal/Core/Language/LanguageManager.php

@@ -146,11 +146,9 @@ public function getLanguages($flags = LanguageInterface::STATE_CONFIGURABLE) {
 
     // Add the site's default language if flagged as allowed value.
     if ($flags & LanguageInterface::STATE_SITE_DEFAULT) {
-      $default = isset($default) ? $default : $this->getDefaultLanguage();
-      // Rename the default language. But we do not want to do this globally,
-      // if we're acting on a global object, so clone the object first.
-      $default = clone $default;
-      $default->name = $this->t("Site's default language (@lang_name)", array('@lang_name' => $default->name));
+      // Setup a language to have the defaults, but with overridden name.
+      $default = $this->getDefaultLanguage();
+      $default->setName($this->t("Site's default language (@lang_name)", array('@lang_name' => $default->getName())));
       $filtered_languages[LanguageInterface::LANGCODE_SITE_DEFAULT] = $default;
     }
 
@@ -187,7 +185,7 @@ public function getLanguageName($langcode) {
       return $this->t('None');
     }
     if ($language = $this->getLanguage($langcode)) {
-      return $language->name;
+      return $language->getName();
     }
     if (empty($langcode)) {
       return $this->t('Unknown');

core/lib/Drupal/Core/TypedData/Plugin/DataType/Language.php

@@ -77,7 +77,7 @@ public function setValue($value, $notify = TRUE) {
    */
   public function getString() {
     $language = $this->getValue();
-    return $language ? $language->name : '';
+    return $language ? $language->getName() : '';
   }
 
   /**

core/modules/config_translation/src/Controller/ConfigTranslationController.php

@@ -164,7 +164,7 @@ public function itemPage(Request $request, RouteMatchInterface $route_match, $pl
       // Prepare the language name and the operations depending on whether this
       // is the original language or not.
       if ($langcode == $original_langcode) {
-        $language_name = '<strong>' . $this->t('@language (original)', array('@language' => $language->name)) . '</strong>';
+        $language_name = '<strong>' . $this->t('@language (original)', array('@language' => $language->getName())) . '</strong>';
 
         // Check access for the path/route for editing, so we can decide to
         // include a link to edit or not.
@@ -180,7 +180,7 @@ public function itemPage(Request $request, RouteMatchInterface $route_match, $pl
         }
       }
       else {
-        $language_name = $language->name;
+        $language_name = $language->getName();
 
         $operations = array();
         // If no translation exists for this language, link to add one.

core/modules/config_translation/src/Form/ConfigTranslationAddForm.php

@@ -29,7 +29,7 @@ public function buildForm(array $form, FormStateInterface $form_state, Request $
     $form = parent::buildForm($form, $form_state, $request, $plugin_id, $langcode);
     $form['#title'] = $this->t('Add @language translation for %label', array(
       '%label' => $this->mapper->getTitle(),
-      '@language' => $this->language->name,
+      '@language' => $this->language->getName(),
     ));
     return $form;
   }
@@ -39,7 +39,7 @@ public function buildForm(array $form, FormStateInterface $form_state, Request $
    */
   public function submitForm(array &$form, FormStateInterface $form_state) {
     parent::submitForm($form, $form_state);
-    drupal_set_message($this->t('Successfully saved @language translation.', array('@language' => $this->language->name)));
+    drupal_set_message($this->t('Successfully saved @language translation.', array('@language' => $this->language->getName())));
   }
 
 }

core/modules/config_translation/src/Form/ConfigTranslationDeleteForm.php

@@ -89,7 +89,7 @@ public static function create(ContainerInterface $container) {
    * {@inheritdoc}
    */
   public function getQuestion() {
-    return $this->t('Are you sure you want to delete the @language translation of %label?', array('%label' => $this->mapper->getTitle(), '@language' => $this->language->name));
+    return $this->t('Are you sure you want to delete the @language translation of %label?', array('%label' => $this->mapper->getTitle(), '@language' => $this->language->getName()));
   }
 
   /**
@@ -145,7 +145,7 @@ public function submitForm(array &$form, FormStateInterface $form_state) {
       $cache_backend->deleteAll();
     }
 
-    drupal_set_message($this->t('@language translation of %label was deleted', array('%label' => $this->mapper->getTitle(), '@language' => $this->language->name)));
+    drupal_set_message($this->t('@language translation of %label was deleted', array('%label' => $this->mapper->getTitle(), '@language' => $this->language->getName())));
 
     $form_state->setRedirectUrl($this->getCancelUrl());
   }

core/modules/config_translation/src/Form/ConfigTranslationEditForm.php

@@ -29,7 +29,7 @@ public function buildForm(array $form, FormStateInterface $form_state, Request $
     $form = parent::buildForm($form, $form_state, $request, $plugin_id, $langcode);
     $form['#title'] = $this->t('Edit @language translation for %label', array(
       '%label' => $this->mapper->getTitle(),
-      '@language' => $this->language->name,
+      '@language' => $this->language->getName(),
     ));
     return $form;
   }
@@ -39,7 +39,7 @@ public function buildForm(array $form, FormStateInterface $form_state, Request $
    */
   public function submitForm(array &$form, FormStateInterface $form_state) {
     parent::submitForm($form, $form_state);
-    drupal_set_message($this->t('Successfully updated @language translation.', array('@language' => $this->language->name)));
+    drupal_set_message($this->t('Successfully updated @language translation.', array('@language' => $this->language->getName())));
   }
 
 }

core/modules/config_translation/src/Form/ConfigTranslationFormBase.php

@@ -316,7 +316,7 @@ protected function buildConfigForm(Element $schema, $config_data, $base_config_d
             '!label <span class="visually-hidden">(!source_language)</span>',
             array(
               '!label' => $this->t($definition['label']),
-              '!source_language' => $this->sourceLanguage->name,
+              '!source_language' => $this->sourceLanguage->getName(),
             )
           ),
           '#type' => 'item',

core/modules/config_translation/src/FormElement/DateFormat.php

@@ -29,7 +29,7 @@ public function getFormElement(DataDefinitionInterface $definition, LanguageInte
     $format = $this->t('Displayed as %date_format', array('%date_format' => \Drupal::service('date.formatter')->format(REQUEST_TIME, 'custom', $value)));
     return array(
       '#type' => 'textfield',
-      '#title' => $this->t($definition->getLabel()) . '<span class="visually-hidden"> (' . $language->name . ')</span>',
+      '#title' => $this->t($definition->getLabel()) . '<span class="visually-hidden"> (' . $language->getName() . ')</span>',
       '#description' => $description,
       '#default_value' => $value,
       '#attributes' => array('lang' => $language->getId()),

core/modules/config_translation/src/FormElement/Textarea.php

@@ -29,7 +29,7 @@ public function getFormElement(DataDefinitionInterface $definition, LanguageInte
     return array(
       '#type' => 'textarea',
       '#default_value' => $value,
-      '#title' => $this->t($definition->getLabel()) . '<span class="visually-hidden"> (' . $language->name . ')</span>',
+      '#title' => $this->t($definition->getLabel()) . '<span class="visually-hidden"> (' . $language->getName() . ')</span>',
       '#rows' => $rows,
       '#attributes' => array('lang' => $language->getId()),
     );

core/modules/config_translation/src/FormElement/Textfield.php

@@ -24,7 +24,7 @@ public function getFormElement(DataDefinitionInterface $definition, LanguageInte
     return array(
       '#type' => 'textfield',
       '#default_value' => $value,
-      '#title' => $this->t($definition->getLabel()) . '<span class="visually-hidden"> (' . $language->name . ')</span>',
+      '#title' => $this->t($definition->getLabel()) . '<span class="visually-hidden"> (' . $language->getName() . ')</span>',
       '#attributes' => array('lang' => $language->getId()),
     );
   }

core/modules/config_translation/src/Tests/ConfigTranslationUiTest.php

@@ -325,7 +325,7 @@ public function testContactConfigEntityTranslation() {
 
     // Test that delete links work and operations perform properly.
     foreach ($this->langcodes as $langcode) {
-      $replacements = array('%label' => t('!label !entity_type', array('!label' => $label, '!entity_type' => Unicode::strtolower(t('Contact form')))), '@language' => language_load($langcode)->name);
+      $replacements = array('%label' => t('!label !entity_type', array('!label' => $label, '!entity_type' => Unicode::strtolower(t('Contact form')))), '@language' => language_load($langcode)->getName());
 
       $this->drupalGet("$translation_base_url/$langcode/delete");
       $this->assertRaw(t('Are you sure you want to delete the @language translation of %label?', $replacements));

core/modules/content_translation/content_translation.admin.inc

@@ -269,7 +269,7 @@ function content_translation_form_language_content_settings_validate(array $form
         $values = $bundle_settings['settings']['language'];
         if (empty($values['language_show']) && \Drupal::languageManager()->isLanguageLocked($values['langcode'])) {
           foreach (\Drupal::languageManager()->getLanguages(LanguageInterface::STATE_LOCKED) as $language) {
-            $locked_languages[] = $language->name;
+            $locked_languages[] = $language->getName();
           }
           $form_state->setErrorByName($name, t('Translation is not supported if language is always one of: @locked_languages', array('@locked_languages' => implode(', ', $locked_languages))));
         }

core/modules/content_translation/content_translation.module

@@ -677,7 +677,7 @@ function content_translation_language_configuration_element_validate($element, F
   $values = $form_state->getValue($key);
   if (!$values['language_show'] && $values['content_translation'] && \Drupal::languageManager()->isLanguageLocked($values['langcode'])) {
     foreach (\Drupal::languageManager()->getLanguages(LanguageInterface::STATE_LOCKED) as $language) {
-      $locked_languages[] = $language->name;
+      $locked_languages[] = $language->getName();
     }
     // @todo Set the correct form element name as soon as the element parents
     //   are correctly set. We should be using NestedArray::getValue() but for

core/modules/content_translation/src/ContentTranslationHandler.php

@@ -109,7 +109,7 @@ public function entityFormAlter(array &$form, FormStateInterface $form_state, En
       $title = $this->entityFormTitle($entity);
       // When editing the original values display just the entity label.
       if ($form_langcode != $entity_langcode) {
-        $t_args = array('%language' => $languages[$form_langcode]->name, '%title' => $entity->label());
+        $t_args = array('%language' => $languages[$form_langcode]->getName(), '%title' => $entity->label());
         $title = empty($source_langcode) ? $title . ' [' . t('%language translation', $t_args) . ']' : t('Create %language translation of %title', $t_args);
       }
       $form['#title'] = $title;
@@ -120,7 +120,7 @@ public function entityFormAlter(array &$form, FormStateInterface $form_state, En
     if ($has_translations && $new_translation) {
       $form['source_langcode'] = array(
         '#type' => 'details',
-        '#title' => t('Source language: @language', array('@language' => $languages[$source_langcode]->name)),
+        '#title' => t('Source language: @language', array('@language' => $languages[$source_langcode]->getName())),
         '#tree' => TRUE,
         '#weight' => -100,
         '#multilingual' => TRUE,
@@ -139,7 +139,7 @@ public function entityFormAlter(array &$form, FormStateInterface $form_state, En
       );
       foreach (language_list(LanguageInterface::STATE_CONFIGURABLE) as $language) {
         if (isset($translations[$language->getId()])) {
-          $form['source_langcode']['source']['#options'][$language->getId()] = $language->name;
+          $form['source_langcode']['source']['#options'][$language->getId()] = $language->getName();
         }
       }
     }
@@ -152,7 +152,7 @@ public function entityFormAlter(array &$form, FormStateInterface $form_state, En
       $form['langcode']['#options'] = array();
       foreach (language_list(LanguageInterface::STATE_CONFIGURABLE) as $language) {
         if (empty($translations[$language->getId()]) || $language->getId() == $entity_langcode) {
-          $form['langcode']['#options'][$language->getId()] = $language->name;
+          $form['langcode']['#options'][$language->getId()] = $language->getName();
         }
       }
     }
@@ -450,7 +450,7 @@ public function entityFormSourceChange($form, FormStateInterface $form_state) {
       'target' => $form_object->getFormLangcode($form_state),
     ));
     $languages = language_list();
-    drupal_set_message(t('Source language set to: %language', array('%language' => $languages[$source]->name)));
+    drupal_set_message(t('Source language set to: %language', array('%language' => $languages[$source]->getName())));
   }
 
   /**

core/modules/content_translation/src/Controller/ContentTranslationController.php

@@ -75,7 +75,7 @@ public function overview(Request $request, $entity_type_id = NULL) {
       $show_source_column = !empty($additional_source_langcodes);
 
       foreach ($languages as $language) {
-        $language_name = $language->name;
+        $language_name = $language->getName();
         $langcode = $language->getId();
 
         $add_url = new Url(
@@ -161,7 +161,7 @@ public function overview(Request $request, $entity_type_id = NULL) {
             $source_name = $this->t('n/a');
           }
           else {
-            $source_name = isset($languages[$source]) ? $languages[$source]->name : $this->t('n/a');
+            $source_name = isset($languages[$source]) ? $languages[$source]->getName() : $this->t('n/a');
             if ($handler->getTranslationAccess($entity, 'delete')->isAllowed()) {
               $links['delete'] = array(
                 'title' => $this->t('Delete'),

core/modules/content_translation/src/Form/ContentTranslationDeleteForm.php

@@ -57,7 +57,7 @@ public function getConfirmText() {
    * {@inheritdoc}
    */
   public function getQuestion() {
-    return $this->t('Are you sure you want to delete the @language translation of %label?', array('@language' => $this->language->name, '%label' => $this->entity->label()));
+    return $this->t('Are you sure you want to delete the @language translation of %label?', array('@language' => $this->language->getName(), '%label' => $this->entity->label()));
   }
 
   /**

core/modules/language/language.module

@@ -149,7 +149,7 @@ function language_process_language_select($element) {
   if (!isset($element['#options'])) {
     $element['#options'] = array();
     foreach (\Drupal::languageManager()->getLanguages($element['#languages']) as $langcode => $language) {
-      $element['#options'][$langcode] = $language->isLocked() ? t('- @name -', array('@name' => $language->name)) : $language->name;
+      $element['#options'][$langcode] = $language->isLocked() ? t('- @name -', array('@name' => $language->getName())) : $language->getName();
     }
   }
   // Add "Built-in English" language to the select when the default value is
@@ -490,7 +490,7 @@ function language_form_system_regional_settings_alter(&$form, FormStateInterface
   $languages = \Drupal::languageManager()->getLanguages();
   $default = \Drupal::languageManager()->getDefaultLanguage();
   foreach ($languages as $key => $language) {
-    $language_options[$key] = $language->name;
+    $language_options[$key] = $language->getName();
   }
   $form['locale']['site_default_language'] = array(
     '#type' => 'select',

core/modules/language/src/Element/LanguageConfiguration.php

@@ -92,14 +92,14 @@ public static function processLanguageConfiguration(&$element, FormStateInterfac
    */
   protected static function getDefaultOptions() {
     $language_options = array(
-      LanguageInterface::LANGCODE_SITE_DEFAULT => t("Site's default language (!language)", array('!language' => static::languageManager()->getDefaultLanguage()->name)),
+      LanguageInterface::LANGCODE_SITE_DEFAULT => t("Site's default language (!language)", array('!language' => static::languageManager()->getDefaultLanguage()->getName())),
       'current_interface' => t('Current interface language'),
       'authors_default' => t("Author's preferred language"),
     );
 
     $languages = static::languageManager()->getLanguages(LanguageInterface::STATE_ALL);
     foreach ($languages as $langcode => $language) {
-      $language_options[$langcode] = $language->isLocked() ? t('- @name -', array('@name' => $language->name)) : $language->name;
+      $language_options[$langcode] = $language->isLocked() ? t('- @name -', array('@name' => $language->getName())) : $language->getName();
     }
 
     return $language_options;

core/modules/language/src/Entity/ConfigurableLanguage.php

@@ -200,6 +200,15 @@ public function getName() {
     return $this->label();
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function setName($name) {
+    $this->label = $name;
+
+    return $this;
+  }
+
   /**
    * {@inheritdoc}
    */

core/modules/language/src/Form/LanguageAddForm.php

@@ -118,7 +118,7 @@ public function validateCustom(array $form, FormStateInterface $form_state) {
       $this->validateCommon($form['custom_language'], $form_state);
 
       if ($language = language_load($langcode)) {
-        $form_state->setErrorByName('langcode', $this->t('The language %language (%langcode) already exists.', array('%language' => $language->name, '%langcode' => $langcode)));
+        $form_state->setErrorByName('langcode', $this->t('The language %language (%langcode) already exists.', array('%language' => $language->getName(), '%langcode' => $langcode)));
       }
     }
     else {
@@ -136,7 +136,7 @@ public function validatePredefined($form, FormStateInterface $form_state) {
     }
     else {
       if ($language = language_load($langcode)) {
-        $form_state->setErrorByName('predefined_langcode', $this->t('The language %language (%langcode) already exists.', array('%language' => $language->name, '%langcode' => $langcode)));
+        $form_state->setErrorByName('predefined_langcode', $this->t('The language %language (%langcode) already exists.', array('%language' => $language->getName(), '%langcode' => $langcode)));
       }
     }
   }