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

Issue #1733746 by penyaskito, sxnc, jsbalsera, Gábor Hojtsy: Fixed D8 installer is broken if selecting a non-English language on installation.

8.0.x
webchick 2012-08-18 12:42:31 +02:00
parent 25cc86df68
commit 3f92626087
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/includes/install.inc
View File

@ -700,6 +700,9 @@ function st($string, array $args = array(), array $options = array()) {
// that multiple files end with the same extension, even if unlikely. // that multiple files end with the same extension, even if unlikely.
$files = install_find_translation_files($install_state['parameters']['langcode']); $files = install_find_translation_files($install_state['parameters']['langcode']);
if (!empty($files)) { if (!empty($files)) {
// Register locale classes with the classloader. Locale module is not
// yet enabled at this stage, so this is not happening automatically.
drupal_classloader_register('locale', drupal_get_path('module', 'locale'));
$strings = Gettext::filesToArray($install_state['parameters']['langcode'], $files); $strings = Gettext::filesToArray($install_state['parameters']['langcode'], $files);
} }
} }

9
core/lib/Drupal/Component/Gettext/PoMemoryWriter.php
View File

@ -34,11 +34,12 @@ class PoMemoryWriter implements PoWriterInterface {
* Implements Drupal\Component\Gettext\PoWriterInterface::writeItem(). * Implements Drupal\Component\Gettext\PoWriterInterface::writeItem().
*/ */
public function writeItem(PoItem $item) { public function writeItem(PoItem $item) {
if (is_array($item->source)) { if (is_array($item->getSource())) {
$item->source = implode(LOCALE_PLURAL_DELIMITER, $item->source); $item->setSource(implode(LOCALE_PLURAL_DELIMITER, $item->getSource()));
$item->translation = implode(LOCALE_PLURAL_DELIMITER, $item->translation); $item->setTranslation(implode(LOCALE_PLURAL_DELIMITER, $item->getTranslation()));
} }
$this->_items[isset($item->context) ? $item->context : ''][$item->source] = $item->translation; $context = $item->getContext();
$this->_items[$context != NULL ? $context : ''][$item->getSource()] = $item->getTranslation();
} }
/** /**