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

Issue #2312671 by olli: Fixed Typo langauge.

8.0.x
Nathaniel Catchpole 2014-07-31 11:50:21 +01:00
parent 6749237dcb
commit 050ce49fec
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/includes/install.core.inc
View File

@ -1175,7 +1175,7 @@ function install_select_language(&$install_state) {
// If a valid language code is set, continue with the next installation step. // If a valid language code is set, continue with the next installation step.
// When translations from the localization server are used, any language code // When translations from the localization server are used, any language code
// is accepted because the standard language list is kept in sync with the // is accepted because the standard language list is kept in sync with the
// langauges available at http://localize.drupal.org. // languages available at http://localize.drupal.org.
// When files from the translation directory are used, we only accept // When files from the translation directory are used, we only accept
// languages for which a file is available. // languages for which a file is available.
if (!empty($install_state['parameters']['langcode'])) { if (!empty($install_state['parameters']['langcode'])) {

2
core/modules/locale/src/Tests/LocaleUpdateTest.php
View File

@ -392,7 +392,7 @@ class LocaleUpdateTest extends LocaleUpdateBase {
} }
/** /**
* Tests automatic translation import when a custom langauge is added. * Tests automatic translation import when a custom language is added.
*/ */
public function testEnableCustomLanguage() { public function testEnableCustomLanguage() {
// Make the hidden test modules look like a normal custom module. // Make the hidden test modules look like a normal custom module.

6
core/modules/menu_link_content/src/Plugin/Menu/MenuLinkContent.php
View File

@ -92,7 +92,7 @@ class MenuLinkContent extends MenuLinkBase implements ContainerFactoryPluginInte
} }
$this->entityManager = $entity_manager; $this->entityManager = $entity_manager;
$this->langaugeManager = $language_manager; $this->languageManager = $language_manager;
} }
/** /**
@ -157,7 +157,7 @@ class MenuLinkContent extends MenuLinkBase implements ContainerFactoryPluginInte
// We only need to get the title from the actual entity if it may be a // We only need to get the title from the actual entity if it may be a
// translation based on the current language context. This can only happen // translation based on the current language context. This can only happen
// if the site is configured to be multilingual. // if the site is configured to be multilingual.
if ($this->langaugeManager->isMultilingual()) { if ($this->languageManager->isMultilingual()) {
return $this->getEntity()->getTitle(); return $this->getEntity()->getTitle();
} }
return $this->pluginDefinition['title']; return $this->pluginDefinition['title'];
@ -170,7 +170,7 @@ class MenuLinkContent extends MenuLinkBase implements ContainerFactoryPluginInte
// We only need to get the description from the actual entity if it may be a // We only need to get the description from the actual entity if it may be a
// translation based on the current language context. This can only happen // translation based on the current language context. This can only happen
// if the site is configured to be multilingual. // if the site is configured to be multilingual.
if ($this->langaugeManager->isMultilingual()) { if ($this->languageManager->isMultilingual()) {
return $this->getEntity()->getDescription(); return $this->getEntity()->getDescription();
} }
return $this->pluginDefinition['description']; return $this->pluginDefinition['description'];

2
core/modules/system/src/Tests/Entity/EntityTranslationTest.php
View File

@ -500,7 +500,7 @@ class EntityTranslationTest extends EntityLanguageTestBase {
$this->assertEqual($build['label']['#markup'], $values[$current_langcode]['name'], 'By default the entity is rendered in the current language.'); $this->assertEqual($build['label']['#markup'], $values[$current_langcode]['name'], 'By default the entity is rendered in the current language.');
$langcodes = array_combine($this->langcodes, $this->langcodes); $langcodes = array_combine($this->langcodes, $this->langcodes);
// We have no translation for the $langcode2 langauge, hence the expected // We have no translation for the $langcode2 language, hence the expected
// result is the topmost existing translation, that is $langcode. // result is the topmost existing translation, that is $langcode.
$langcodes[$langcode2] = $langcode; $langcodes[$langcode2] = $langcode;
foreach ($langcodes as $desired => $expected) { foreach ($langcodes as $desired => $expected) {