diff --git a/core/includes/update.inc b/core/includes/update.inc index b6d07f424671be00179bdfc91e6bb815244abd4d..22baff999a7a5e30687c50304053455fae161243 100644 --- a/core/includes/update.inc +++ b/core/includes/update.inc @@ -733,7 +733,7 @@ function update_language_list($flags = LanguageInterface::STATE_CONFIGURABLE) { // No language module, so use the default language only. $languages = array($default->id => $default); // Add the special languages, they will be filtered later if needed. - $languages += \Drupal::languageManager()->getDefaultLockedLanguages($default->weight); + $languages += \Drupal::languageManager()->getDefaultLockedLanguages($default->getWeight()); } } diff --git a/core/lib/Drupal/Core/Language/Language.php b/core/lib/Drupal/Core/Language/Language.php index b04f60f855a64b4464d53e542ae690e14695959c..0158eb84e9211dcae199c771b93a989fb215e53c 100644 --- a/core/lib/Drupal/Core/Language/Language.php +++ b/core/lib/Drupal/Core/Language/Language.php @@ -57,7 +57,7 @@ class Language implements LanguageInterface { * * @var int */ - public $weight = 0; + protected $weight = 0; /** * Locked indicates a language used by the system, not an actual language. diff --git a/core/lib/Drupal/Core/Language/LanguageManager.php b/core/lib/Drupal/Core/Language/LanguageManager.php index ea7f8300f4d83c9ed2fb8db48efa6fbdfcdfc9f0..6fe99d6f7531020df20b7a18b2c47a632d5b11c8 100644 --- a/core/lib/Drupal/Core/Language/LanguageManager.php +++ b/core/lib/Drupal/Core/Language/LanguageManager.php @@ -135,7 +135,7 @@ public function getLanguages($flags = LanguageInterface::STATE_CONFIGURABLE) { $default = $this->getDefaultLanguage(); $this->languages = array($default->id => $default); // Add the special languages, they will be filtered later if needed. - $this->languages += $this->getDefaultLockedLanguages($default->weight); + $this->languages += $this->getDefaultLockedLanguages($default->getWeight()); } // Filter the full list of languages based on the value of the $all flag. By diff --git a/core/modules/language/src/ConfigurableLanguageManager.php b/core/modules/language/src/ConfigurableLanguageManager.php index 6699ab0ef191614504d0f7f2527ccc320c715526..dbb68d21bbc53434ae6b1458db5ed843c8fbf81f 100644 --- a/core/modules/language/src/ConfigurableLanguageManager.php +++ b/core/modules/language/src/ConfigurableLanguageManager.php @@ -298,7 +298,7 @@ public function getLanguages($flags = LanguageInterface::STATE_CONFIGURABLE) { $data['default'] = ($langcode == $default->id); $data['name'] = $data['label']; $this->languages[$langcode] = new Language($data); - $weight = max(array($weight, $this->languages[$langcode]->weight)); + $weight = max(array($weight, $this->languages[$langcode]->getWeight())); } // Add locked languages, they will be filtered later if needed. @@ -337,8 +337,8 @@ public function updateLockedLanguageWeights() { // Get maximum weight to update the system languages to keep them on bottom. foreach ($this->getLanguages(LanguageInterface::STATE_CONFIGURABLE) as $language) { - if (!$language->isLocked() && $language->weight > $max_weight) { - $max_weight = $language->weight; + if (!$language->isLocked() && $language->getWeight() > $max_weight) { + $max_weight = $language->getWeight(); } } diff --git a/core/modules/language/src/Entity/ConfigurableLanguage.php b/core/modules/language/src/Entity/ConfigurableLanguage.php index 1235b8a2543642fecdd40f972ca6d8b6e8597f5a..6fcf874fa80db02f3f9c08a141aec4f4104231b2 100644 --- a/core/modules/language/src/Entity/ConfigurableLanguage.php +++ b/core/modules/language/src/Entity/ConfigurableLanguage.php @@ -71,7 +71,7 @@ class ConfigurableLanguage extends ConfigEntityBase implements ConfigurableLangu * * @var integer */ - public $weight = 0; + protected $weight = 0; /** * Locked languages cannot be edited. diff --git a/core/modules/language/src/Tests/LanguageConfigurationTest.php b/core/modules/language/src/Tests/LanguageConfigurationTest.php index d7cc61f20fd6b13fed7424e528622bd63c48fc82..ce8c7cf59e86bf86353cc4f0e38ed4c46209364e 100644 --- a/core/modules/language/src/Tests/LanguageConfigurationTest.php +++ b/core/modules/language/src/Tests/LanguageConfigurationTest.php @@ -157,7 +157,7 @@ protected function checkConfigurableLanguageWeight($state = 'by default') { $replacements = array('@event' => $state); foreach (\Drupal::languageManager()->getLanguages(LanguageInterface::STATE_LOCKED) as $locked_language) { $replacements['%language'] = $locked_language->name; - $this->assertTrue($locked_language->weight > $max_configurable_language_weight, format_string('System language %language has higher weight than configurable languages @event', $replacements)); + $this->assertTrue($locked_language->getWeight() > $max_configurable_language_weight, format_string('System language %language has higher weight than configurable languages @event', $replacements)); } } @@ -170,10 +170,11 @@ protected function checkConfigurableLanguageWeight($state = 'by default') { protected function getHighestConfigurableLanguageWeight(){ $max_weight = 0; + /* @var $languages \Drupal\Core\Language\LanguageInterface[] */ $languages = entity_load_multiple('configurable_language', NULL, TRUE); foreach ($languages as $language) { - if (!$language->isLocked() && $language->weight > $max_weight) { - $max_weight = $language->weight; + if (!$language->isLocked() && $language->getWeight() > $max_weight) { + $max_weight = $language->getWeight(); } }