Commit 848dbc55 authored by catch's avatar catch

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().
parent 6cbb5d9e
......@@ -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;
}
......
......@@ -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}
*/
......
......@@ -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).
*
......
......@@ -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');
......
......@@ -77,7 +77,7 @@ public function setValue($value, $notify = TRUE) {
*/
public function getString() {
$language = $this->getValue();
return $language ? $language->name : '';
return $language ? $language->getName() : '';
}
/**
......
......@@ -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.
......
......@@ -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())));
}
}
......@@ -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());
}
......
......@@ -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())));
}
}
......@@ -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',
......
......@@ -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()),
......
......@@ -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()),
);
......
......@@ -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()),
);
}
......
......@@ -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));
......
......@@ -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))));
}
......
......@@ -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
......
......@@ -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())));
}
/**
......
......@@ -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'),
......
......@@ -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()));
}
/**
......
......@@ -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',
......
......@@ -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;
......
......@@ -200,6 +200,15 @@ public function getName() {
return $this->label();
}
/**
* {@inheritdoc}
*/
public function setName($name) {
$this->label = $name;
return $this;
}
/**
* {@inheritdoc}
*/
......
......@@ -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)));
}
}
}
......
......@@ -64,7 +64,7 @@ public function buildForm(array $form, FormStateInterface $form_state) {
$existing_languages = array();
foreach ($languages as $langcode => $language) {
$existing_languages[$langcode] = $language->name;
$existing_languages[$langcode] = $language->getName();
}
// If we have no languages available, present the list of predefined languages
......
......@@ -73,7 +73,7 @@ public function buildForm(array $form, FormStateInterface $form_state) {
$prefixes = language_negotiation_url_prefixes();
$domains = language_negotiation_url_domains();
foreach ($languages as $langcode => $language) {
$t_args = array('%language' => $language->name, '%langcode' => $language->getId());
$t_args = array('%language' => $language->getName(), '%langcode' => $language->getId());
$form['prefix'][$langcode] = array(
'#type' => 'textfield',
'#title' => $language->isDefault() ? $this->t('%language (%langcode) path prefix (Default language)', $t_args) : $this->t('%language (%langcode) path prefix', $t_args),
......@@ -83,7 +83,7 @@ public function buildForm(array $form, FormStateInterface $form_state) {
);
$form['domain'][$langcode] = array(
'#type' => 'textfield',
'#title' => $this->t('%language (%langcode) domain', array('%language' => $language->name, '%langcode' => $language->getId())),
'#title' => $this->t('%language (%langcode) domain', array('%language' => $language->getName(), '%langcode' => $language->getId())),
'#maxlength' => 128,
'#default_value' => isset($domains[$langcode]) ? $domains[$langcode] : '',
);
......@@ -120,7 +120,7 @@ public function validateForm(array &$form, FormStateInterface $form_state) {
elseif (isset($count[$value]) && $count[$value] > 1) {
// Throw a form error if there are two languages with the same
// domain/prefix.
$form_state->setErrorByName("prefix][$langcode", $this->t('The prefix for %language, %value, is not unique.', array('%language' => $language->name, '%value' => $value)));
$form_state->setErrorByName("prefix][$langcode", $this->t('The prefix for %language, %value, is not unique.', array('%language' => $language->getName(), '%value' => $value)));
}
}
......@@ -133,13 +133,13 @@ public function validateForm(array &$form, FormStateInterface $form_state) {
if ($form_state->getValue('language_negotiation_url_part') == LanguageNegotiationUrl::CONFIG_DOMAIN) {
// Throw a form error if the domain is blank for a non-default language,
// although it is required for selected negotiation type.
$form_state->setErrorByName("domain][$langcode", $this->t('The domain may not be left blank for %language.', array('%language' => $language->name)));
$form_state->setErrorByName("domain][$langcode", $this->t('The domain may not be left blank for %language.', array('%language' => $language->getName())));
}
}
elseif (isset($count[$value]) && $count[$value] > 1) {
// Throw a form error if there are two languages with the same
// domain/domain.
$form_state->setErrorByName("domain][$langcode", $this->t('The domain for %language, %value, is not unique.', array('%language' => $language->name, '%value' => $value)));
$form_state->setErrorByName("domain][$langcode", $this->t('The domain for %language, %value, is not unique.', array('%language' => $language->getName(), '%value' => $value)));
}
}
......
......@@ -72,7 +72,7 @@ public function summary() {
// If the current item of the $language_list array is one of the selected
// languages, add it to the $results array.
if (!empty($selected[$item->getId()])) {
$result[$item->getId()] = $item->name;
$result[$item->getId()] = $item->getName();
}
return $result;
}, array());
......
......@@ -156,7 +156,7 @@ protected function checkConfigurableLanguageWeight($state = 'by default') {
$max_configurable_language_weight = $this->getHighestConfigurableLanguageWeight();
$replacements = array('@event' => $state);
foreach (\Drupal::languageManager()->getLanguages(LanguageInterface::STATE_LOCKED) as $locked_language) {
$replacements['%language'] = $locked_language->name;
$replacements['%language'] = $locked_language->getName();
$this->assertTrue($locked_language->getWeight() > $max_configurable_language_weight, format_string('System language %language has higher weight than configurable languages @event', $replacements));
}
}
......
......@@ -380,7 +380,7 @@ function testUrlLanguageFallback() {
// language.
$args = array(':id' => 'block-test-language-block', ':url' => base_path() . $GLOBALS['script_path'] . $langcode_browser_fallback);
$fields = $this->xpath('//div[@id=:id]//a[@class="language-link active" and starts-with(@href, :url)]', $args);
$this->assertTrue($fields[0] == $languages[$langcode_browser_fallback]->name, 'The browser language is the URL active language');
$this->assertTrue($fields[0] == $languages[$langcode_browser_fallback]->getName(), 'The browser language is the URL active language');
// Check that URLs are rewritten using the given browser language.
$fields = $this->xpath('//strong[@class="site-name"]/a[@rel="home" and @href=:url]', $args);
......
......@@ -249,10 +249,10 @@ function locale_requirements($phase) {
foreach ($status as $project) {
foreach ($project as $langcode => $project_info) {
if (empty($project_info->type)) {
$untranslated[$langcode] = $languages[$langcode]->name;
$untranslated[$langcode] = $languages[$langcode]->getName();
}
elseif ($project_info->type == LOCALE_TRANSLATION_LOCAL || $project_info->type == LOCALE_TRANSLATION_REMOTE) {
$available_updates[$langcode] = $languages[$langcode]->name;
$available_updates[$langcode] = $languages[$langcode]->getName();
}
}
}
......
......@@ -1262,7 +1262,7 @@ function _locale_rebuild_js($langcode = NULL) {
$logger = \Drupal::logger('locale');
switch ($status) {
case 'updated':
$logger->notice('Updated JavaScript translation file for the language %language.', array('%language' => $language->name));
$logger->notice('Updated JavaScript translation file for the language %language.', array('%language' => $language->getName()));
return TRUE;
case 'rebuilt':
......@@ -1271,15 +1271,15 @@ function _locale_rebuild_js($langcode = NULL) {
// been created again.
case 'created':
$logger->notice('Created JavaScript translation file for the language %language.', array('%language' => $language->name));
$logger->notice('Created JavaScript translation file for the language %language.', array('%language' => $language->getName()));
return TRUE;
case 'deleted':
$logger->notice('Removed JavaScript translation file for the language %language because no translations currently exist for that language.', array('%language' => $language->name));
$logger->notice('Removed JavaScript translation file for the language %language because no translations currently exist for that language.', array('%language' => $language->getName()));
return TRUE;
case 'error':
$logger->error('An error occurred during creation of the JavaScript translation file for the language %language.', array('%language' => $language->name));
$logger->error('An error occurred during creation of the JavaScript translation file for the language %language.', array('%language' => $language->getName()));
return FALSE;
default:
......
......@@ -62,7 +62,7 @@ public function buildForm(array $form, FormStateInterface $form_state) {
$language_options = array();
foreach ($languages as $langcode => $language) {
if ($langcode != 'en' || locale_translate_english()) {
$language_options[$langcode] = $language->name;
$language_options[$langcode] = $language->getName();
}
}
$language_default = $this->languageManager->getDefaultLanguage();
......@@ -143,7 +143,7 @@ public function submitForm(array &$form, FormStateInterface $form_state) {
$reader->setLangcode($language->getId());
$reader->setOptions($content_options);
$languages = $this->languageManager->getLanguages();
$language_name = isset($languages[$language->getId()]) ? $languages[$language->getId()]->name : '';
$language_name = isset($languages[$language->getId()]) ? $languages[$language->getId()]->getName() : '';
$filename = $language->getId() .'.po';
}
else {
......
......@@ -80,7 +80,7 @@ public function buildForm(array $form, FormStateInterface $form_state) {
$existing_languages = array();
foreach ($languages as $langcode => $language) {
if ($langcode != 'en' || locale_translate_english()) {
$existing_languages[$langcode] = $language->name;
$existing_languages[$langcode] = $language->getName();
}
}
......
......@@ -34,7 +34,7 @@ public function buildForm(array $form, FormStateInterface $form_state) {
$this->languageManager->reset();
$languages = language_list();
$langname = isset($langcode) ? $languages[$langcode]->name : "- None -";
$langname = isset($langcode) ? $languages[$langcode]->getName() : "- None -";
$form['#attached']['library'][] = 'locale/drupal.locale.admin';
......
......@@ -165,7 +165,7 @@ protected function translateFilters() {
$language_options = array();
foreach ($languages as $langcode => $language) {
if ($langcode != 'en' || locale_translate_english()) {
$language_options[$langcode] = $language->name;
$language_options[$langcode] = $language->getName();
}
}
......
......@@ -82,7 +82,7 @@ public function buildForm(array $form, FormStateInterface $form_state) {
// Build data options for the select table.
foreach ($updates as $langcode => $update) {
$title = String::checkPlain($languages[$langcode]->name);
$title = String::checkPlain($languages[$langcode]->getName());
$locale_translation_update_info = array('#theme' => 'locale_translation_update_info');
foreach (array('updates', 'not_found') as $update_status) {
if (isset($update[$update_status])) {
......
......@@ -58,7 +58,7 @@ public function buildComponents(array &$build, array $entities, array $displays,
$build[$id]['langcode'] = array(
'#type' => 'item',
'#title' => t('Language'),
'#markup' => $entity->language()->name,
'#markup' => $entity->language()->getName(),
'#prefix' => '<div id="field-language-display">',
'#suffix' => '</div>'
);
......
......@@ -446,7 +446,7 @@ public function searchFormAlter(array &$form, FormStateInterface $form_state) {
$language_list = \Drupal::languageManager()->getLanguages(LanguageInterface::STATE_ALL);
foreach ($language_list as $langcode => $language) {
// Make locked languages appear special in the list.
$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();
}
if (count($language_options) > 1) {
$form['advanced']['lang-fieldset'] = array(
......
......@@ -45,7 +45,7 @@ public function render(ResultRow $values) {
// ready, see http://drupal.org/node/1616594.
$value = $this->getValue($values);
$language = language_load($value);
$value = $language ? $language->name : '';
$value = $language ? $language->getName() : '';
return $this->renderLink($value, $values);
}
......
......@@ -114,7 +114,7 @@ public function buildForm(array $form, FormStateInterface $form_state, $pid = NU
$languages = \Drupal::languageManager()->getLanguages();
$language_options = array();
foreach ($languages as $langcode => $language) {
$language_options[$langcode] = $language->name;
$language_options[$langcode] = $language->getName();
}
$form['langcode'] = array(
......
......@@ -55,8 +55,10 @@ function testLanguageSelectElementOptions() {
foreach ($ids as $id => $flags) {
$this->assertField($id, format_string('The @id field was found on the page.', array('@id' => $id)));
$options = array();
foreach ($this->container->get('language_manager')->getLanguages($flags) as $langcode => $language) {
$options[$langcode] = $language->isLocked() ? t('- @name -', array('@name' => $language->name)) : $language->name;
/* @var $language_manager \Drupal\Core\Language\LanguageManagerInterface */
$language_manager = $this->container->get('language_manager');
foreach ($language_manager->getLanguages($flags) as $langcode => $language) {
$options[$langcode] = $language->isLocked() ? t('- @name -', array('@name' => $language->getName())) : $language->getName();
}
$this->_testLanguageSelectElementOptions($id, $options);
}
......
......@@ -22,7 +22,7 @@ class Language extends Taxonomy {
public function render(ResultRow $values) {
$value = $this->getValue($values);
$language = \Drupal::languageManager()->getLanguage($value);
$value = $language ? $language->name : '';
$value = $language ? $language->getName() : '';
return $this->renderLink($this->sanitizeValue($value), $values);
}
......
......@@ -422,7 +422,7 @@ protected function listLanguages($flags = LanguageInterface::STATE_ALL) {
if ($id == LanguageInterface::LANGCODE_SITE_DEFAULT) {
$id = PluginBase::VIEWS_QUERY_LANGUAGE_SITE_DEFAULT;
}
$list[$id] = $this->t($language->name);
$list[$id] = $this->t($language->getName());
}
// Add in negotiated languages, if requested.
......
......@@ -44,7 +44,7 @@ public function render(ResultRow $values) {
// ready, see http://drupal.org/node/1616594.
$value = $this->getValue($values);
$language = language_load($value);
return $language ? $language->name : '';
return $language ? $language->getName() : '';
}
}
......@@ -19,12 +19,15 @@ class LanguageUnitTest extends UnitTestCase {
/**
* @covers ::getName()
* @covers ::setName()
*/
public function testGetName() {
$name = $this->randomMachineName();
$language_code = $this->randomMachineName(2);
$language = new Language(array('id' => $language_code, 'name' => $name));
$this->assertSame($name, $language->getName());
$new_name = $this->randomMachineName();
$this->assertSame($new_name, $language->setName($new_name)->getName());
}
/**
......