updated core to 8.6.1 via composer

This commit is contained in:
2018-09-12 13:58:26 +02:00
parent a9a219f2ed
commit ea56b9fba3
4443 changed files with 112098 additions and 40708 deletions
+1 -1
View File
@@ -180,7 +180,7 @@ class ExportForm extends FormBase {
$form_state->setResponse($response);
}
else {
drupal_set_message($this->t('Nothing to export.'));
$this->messenger()->addStatus($this->t('Nothing to export.'));
}
}
+2 -1
View File
@@ -46,6 +46,7 @@ class ImportForm extends FormBase {
$container->get('language_manager')
);
}
/**
* Constructs a form for language import.
*
@@ -175,7 +176,7 @@ class ImportForm extends FormBase {
if (empty($language)) {
$language = ConfigurableLanguage::createFromLangcode($form_state->getValue('langcode'));
$language->save();
drupal_set_message($this->t('The language %language has been created.', ['%language' => $this->t($language->label())]));
$this->messenger()->addStatus($this->t('The language %language has been created.', ['%language' => $this->t($language->label())]));
}
$options = array_merge(_locale_translation_default_update_options(), [
'langcode' => $form_state->getValue('langcode'),
@@ -219,7 +219,7 @@ class TranslateEditForm extends TranslateFormBase {
}
}
drupal_set_message($this->t('The strings have been saved.'));
$this->messenger()->addStatus($this->t('The strings have been saved.'));
// Keep the user on the current pager page.
$page = $this->getRequest()->query->get('page');
@@ -43,7 +43,7 @@ class LocaleConfigManager {
/**
* The string storage for reading and writing translations.
*
* @var \Drupal\locale\StringStorageInterface;
* @var \Drupal\locale\StringStorageInterface
*/
protected $localeStorage;
+11 -1
View File
@@ -16,7 +16,7 @@ class PoDatabaseWriter implements PoWriterInterface {
* An associative array indicating what data should be overwritten, if any.
*
* Elements of the array:
* - override_options
* - overwrite_options
* - not_customized: boolean indicating that not customized strings should
* be overwritten.
* - customized: boolean indicating that customized strings should be
@@ -109,6 +109,16 @@ class PoDatabaseWriter implements PoWriterInterface {
/**
* Set the options for the current writer.
*
* @param array $options
* An associative array containing:
* - overwrite_options: An array of options. Each option contains:
* - not_customized: Boolean indicating that not customized strings should
* be overwritten.
* - customized: Boolean indicating that customized strings should be
* overwritten.
* - customized: The strings being imported should be saved as customized.
* One of LOCALE_CUSTOMIZED or LOCALE_NOT_CUSTOMIZED.
*/
public function setOptions(array $options) {
if (!isset($options['overwrite_options'])) {
+1
View File
@@ -10,6 +10,7 @@ namespace Drupal\locale;
* value, and is assumed to be in English language.
*/
class SourceString extends StringBase {
/**
* {@inheritdoc}
*/