Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #3097435 by andypost, longwave: Remove all @deprecated code in the language module

merge-requests/2419/head
catch 2019-11-29 15:50:56 +00:00
parent 0bc713dd10
commit 754c45773a
3 changed files with 0 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
core/modules/language/language.module
View File

@ -267,19 +267,6 @@ function language_get_default_langcode($entity_type, $bundle) {
return $configuration->getDefaultLangcode(); return $configuration->getDefaultLangcode();
} }
/**
* Reads language prefixes and uses the langcode if no prefix is set.
*
* @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Use
* \Drupal::config('language.negotiation')->get('url.prefixes') instead.
*
* @see https://www.drupal.org/node/2912748
*/
function language_negotiation_url_prefixes() {
@trigger_error("language_negotiation_url_prefixes() is deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Use \Drupal::config('language.negotiation')->get('url.prefixes') instead. See https://www.drupal.org/node/2912748", E_USER_DEPRECATED);
return \Drupal::config('language.negotiation')->get('url.prefixes');
}
/** /**
* Update the list of prefixes from the installed languages. * Update the list of prefixes from the installed languages.
*/ */
@ -299,19 +286,6 @@ function language_negotiation_url_prefixes_update() {
$config->set('url.prefixes', $prefixes)->save(TRUE); $config->set('url.prefixes', $prefixes)->save(TRUE);
} }
/**
* Reads language domains.
*
* @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Use
* \Drupal::config('language.negotiation')->get('url.domains') instead.
*
* @see https://www.drupal.org/node/2912748
*/
function language_negotiation_url_domains() {
@trigger_error("language_negotiation_url_domains() is deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Use \Drupal::config('language.negotiation')->get('url.domains') instead. See https://www.drupal.org/node/2912748", E_USER_DEPRECATED);
return \Drupal::config('language.negotiation')->get('url.domains');
}
/** /**
* Implements hook_modules_installed(). * Implements hook_modules_installed().
*/ */

8
core/modules/language/src/Config/LanguageConfigFactoryOverride.php
View File

@ -143,14 +143,6 @@ class LanguageConfigFactoryOverride extends ConfigFactoryOverrideBase implements
return $this; return $this;
} }
/**
* {@inheritdoc}
*/
public function setLanguageFromDefault(LanguageDefault $language_default = NULL) {
$this->language = $language_default ? $language_default->get() : NULL;
return $this;
}
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */

15
core/modules/language/src/Config/LanguageConfigFactoryOverrideInterface.php
View File

@ -4,7 +4,6 @@ namespace Drupal\language\Config;
use Drupal\Core\Config\ConfigFactoryOverrideInterface; use Drupal\Core\Config\ConfigFactoryOverrideInterface;
use Drupal\Core\Language\LanguageInterface; use Drupal\Core\Language\LanguageInterface;
use Drupal\Core\Language\LanguageDefault;
/** /**
* Defines the interface for a configuration factory language override object. * Defines the interface for a configuration factory language override object.
@ -29,20 +28,6 @@ interface LanguageConfigFactoryOverrideInterface extends ConfigFactoryOverrideIn
*/ */
public function setLanguage(LanguageInterface $language = NULL); public function setLanguage(LanguageInterface $language = NULL);
/**
* Sets the language to be used in configuration overrides from the default.
*
* @param \Drupal\Core\Language\LanguageDefault $language_default
* The default language.
*
* @return $this
*
* @deprecated in drupal:8.3.0 and is removed from drupal:9.0.0. This
* method has been replaced by injecting the default language into the
* constructor.
*/
public function setLanguageFromDefault(LanguageDefault $language_default = NULL);
/** /**
* Get language override for given language and configuration name. * Get language override for given language and configuration name.
* *