opdavies/drupalcampbristol
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update to Drupal 8.2.6. For more information, see https://www.drupal.org/project/drupal/releases/8.2.6

Browse source
This commit is contained in:
Pantheon Automation 2017-02-02 16:28:38 -08:00 • committed by Greg Anderson
parent db56c09587
commit f1e72395cb
588 changed files with 26857 additions and 2777 deletions
Download patch file Download diff file Expand all files Collapse all files

12
core/modules/locale/locale.api.php
View file

@ -27,8 +27,8 @@
* Example .info.yml file properties for a custom module with a po file located
* in the module's folder.
* @code
* interface translation project = example_module
* interface translation server pattern = modules/custom/example_module/%project-%version.%language.po
* 'interface translation project': example_module
* 'interface translation server pattern': modules/custom/example_module/%project-%version.%language.po
* @endcode
*
* Streamwrappers can be used in the server pattern definition. The interface
@ -36,10 +36,10 @@
* using the "translations://" streamwrapper. But also other streamwrappers can
* be used.
* @code
* interface translation server pattern = translations://%project-%version.%language.po
* 'interface translation server pattern': translations://%project-%version.%language.po
* @endcode
* @code
* interface translation server pattern = public://translations/%project-%version.%language.po
* 'interface translation server pattern': public://translations/%project-%version.%language.po
* @endcode
*
* Multiple custom modules or themes sharing the same po file should have
@ -51,8 +51,8 @@
* Example .info.yml file properties for a custom module with a po file located
* on a remote translation server.
* @code
* interface translation project = example_module
* interface translation server pattern = http://example.com/files/translations/%core/%project/%project-%version.%language.po
* 'interface translation project': example_module
* 'interface translation server pattern': http://example.com/files/translations/%core/%project/%project-%version.%language.po
* @endcode
*
* Custom themes, features and distributions can implement these .info.yml file

18
core/modules/locale/src/Form/ExportForm.php
View file

@ -3,6 +3,7 @@
namespace Drupal\locale\Form;
use Drupal\Component\Gettext\PoStreamWriter;
use Drupal\Core\File\FileSystemInterface;
use Drupal\Core\Form\FormBase;
use Drupal\Core\Form\FormStateInterface;
use Drupal\Core\Language\LanguageInterface;
@ -23,14 +24,24 @@ class ExportForm extends FormBase {
*/
protected $languageManager;
/**
* The file system service.
*
* @var \Drupal\Core\File\FileSystemInterface
*/
protected $fileSystem;
/**
* Constructs a new ExportForm.
*
* @param \Drupal\Core\Language\LanguageManagerInterface $language_manager
* The language manager.
* @param \Drupal\Core\File\FileSystemInterface $file_system
* The file system service.
*/
public function __construct(LanguageManagerInterface $language_manager) {
public function __construct(LanguageManagerInterface $language_manager, FileSystemInterface $file_system) {
$this->languageManager = $language_manager;
$this->fileSystem = $file_system;
}
/**
@ -38,7 +49,8 @@ class ExportForm extends FormBase {
*/
public static function create(ContainerInterface $container) {
return new static(
$container->get('language_manager')
$container->get('language_manager'),
$container->get('file_system')
);
}
@ -148,7 +160,7 @@ class ExportForm extends FormBase {
$item = $reader->readItem();
if (!empty($item)) {
$uri = tempnam('temporary://', 'po_');
$uri = $this->fileSystem->tempnam('temporary://', 'po_');
$header = $reader->getHeader();
$header->setProjectName($this->config('system.site')->get('name'));
$header->setLanguageName($language_name);

4
core/modules/locale/src/Tests/LocaleExportTest.php
View file

@ -43,7 +43,7 @@ class LocaleExportTest extends WebTestBase {
public function testExportTranslation() {
// First import some known translations.
// This will also automatically add the 'fr' language.
$name = tempnam('temporary://', "po_") . '.po';
$name = \Drupal::service('file_system')->tempnam('temporary://', "po_") . '.po';
file_put_contents($name, $this->getPoFile());
$this->drupalPostForm('admin/config/regional/translate/import', array(
'langcode' => 'fr',
@ -62,7 +62,7 @@ class LocaleExportTest extends WebTestBase {
$this->assertRaw('msgstr "lundi"', 'French translations present in exported file.');
// Import some more French translations which will be marked as customized.
$name = tempnam('temporary://', "po2_") . '.po';
$name = \Drupal::service('file_system')->tempnam('temporary://', "po2_") . '.po';
file_put_contents($name, $this->getCustomPoFile());
$this->drupalPostForm('admin/config/regional/translate/import', array(
'langcode' => 'fr',

2
core/modules/locale/src/Tests/LocaleImportFunctionalTest.php
View file

@ -369,7 +369,7 @@ class LocaleImportFunctionalTest extends WebTestBase {
* (optional) Additional options to pass to the translation import form.
*/
public function importPoFile($contents, array $options = array()) {
$name = tempnam('temporary://', "po_") . '.po';
$name = \Drupal::service('file_system')->tempnam('temporary://', "po_") . '.po';
file_put_contents($name, $contents);
$options['files[file]'] = $name;
$this->drupalPostForm('admin/config/regional/translate/import', $options, t('Import'));

2
core/modules/locale/src/Tests/LocalePluralFormatTest.php
View file

@ -351,7 +351,7 @@ class LocalePluralFormatTest extends WebTestBase {
* Additional options to pass to the translation import form.
*/
public function importPoFile($contents, array $options = array()) {
$name = tempnam('temporary://', "po_") . '.po';
$name = \Drupal::service('file_system')->tempnam('temporary://', "po_") . '.po';
file_put_contents($name, $contents);
$options['files[file]'] = $name;
$this->drupalPostForm('admin/config/regional/translate/import', $options, t('Import'));

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

@ -136,7 +136,7 @@ class LocaleUpdateTest extends LocaleUpdateBase {
// Check the status on the Available translation status page.
$this->assertRaw('<label for="edit-langcodes-de" class="visually-hidden">Update German</label>', 'German language found');
$this->assertText('Updates for: Contributed module one, Contributed module two, Custom module one, Locale test', 'Updates found');
$this->assertText('Contributed module one (' . format_date($this->timestampNow, 'html_date') . ')', 'Updates for Contrib module one');
$this->assertText('Contributed module one (' . format_date($this->timestampNew, 'html_date') . ')', 'Updates for Contrib module one');
$this->assertText('Contributed module two (' . format_date($this->timestampNew, 'html_date') . ')', 'Updates for Contrib module two');
// Execute the translation update.