Commit c051385d authored by catch's avatar catch

Issue #2600576 by droplet: MIME, not Mime / mime

parent 59725230
......@@ -535,7 +535,7 @@ public function preHandle(Request $request) {
// Set the allowed protocols.
UrlHelper::setAllowedProtocols($this->container->getParameter('filter_protocols'));
// Override of Symfony's mime type guesser singleton.
// Override of Symfony's MIME type guesser singleton.
MimeTypeGuesser::registerWithSymfonyGuesser($this->container);
$this->prepared = TRUE;
......
......@@ -109,7 +109,7 @@ protected function sortGuessers() {
}
/**
* A helper function to register with Symfony's singleton mime type guesser.
* A helper function to register with Symfony's singleton MIME type guesser.
*
* Symfony's default mimetype guessers have dependencies on PHP's fileinfo
* extension or being able to run the system command file. Drupal's guesser
......
......@@ -247,7 +247,7 @@ display:
relationship: none
group_type: group
admin_label: ''
label: 'Mime type'
label: 'MIME type'
exclude: false
alter:
alter_text: false
......@@ -623,7 +623,7 @@ display:
exposed: true
expose:
operator_id: filemime_op
label: 'Mime type'
label: 'MIME type'
description: ''
use_operator: false
operator: filemime_op
......
......@@ -1266,7 +1266,7 @@ function template_preprocess_file_link(&$variables) {
'file',
// Add a specific class for each and every mime type.
'file--mime-' . strtr($mime_type, array('/' => '-', '.' => '-')),
// Add a more general class for groups of well known mime types.
// Add a more general class for groups of well known MIME types.
'file--' . file_icon_class($mime_type),
);
......
......@@ -12,11 +12,11 @@
use Drupal\Core\Form\FormStateInterface;
/**
* Formatter to render the file mime type, with an optional icon.
* Formatter to render the file MIME type, with an optional icon.
*
* @FieldFormatter(
* id = "file_filemime",
* label = @Translation("File mime"),
* label = @Translation("File MIME"),
* field_types = {
* "string"
* }
......
......@@ -85,7 +85,7 @@ public function fields() {
'uid' => $this->t('The {users}.uid who added the file. If set to 0, this file was added by an anonymous user.'),
'filename' => $this->t('File name'),
'filepath' => $this->t('File path'),
'filemime' => $this->t('File Mime Type'),
'filemime' => $this->t('File MIME Type'),
'status' => $this->t('The published status of a file.'),
'timestamp' => $this->t('The time that the file was added.'),
'file_directory_path' => $this->t('The Drupal files path.'),
......
......@@ -105,7 +105,7 @@ public function fields() {
'uid' => $this->t('The {users}.uid who added the file. If set to 0, this file was added by an anonymous user.'),
'filename' => $this->t('File name'),
'filepath' => $this->t('File path'),
'filemime' => $this->t('File Mime Type'),
'filemime' => $this->t('File MIME Type'),
'status' => $this->t('The published status of a file.'),
'timestamp' => $this->t('The time that the file was added.'),
);
......
......@@ -50,7 +50,7 @@ public function testFileDenormalize() {
$this->assertTrue(file_exists($denormalized->getFileUri()), 'The temporary file was found.');
$this->assertIdentical($file->uuid(), $denormalized->uuid(), 'The expected UUID was found');
$this->assertIdentical($file->getMimeType(), $denormalized->getMimeType(), 'The expected mime type was found.');
$this->assertIdentical($file->getMimeType(), $denormalized->getMimeType(), 'The expected MIME type was found.');
$this->assertIdentical($file->getFilename(), $denormalized->getFilename(), 'The expected filename was found.');
$this->assertTrue($denormalized->isPermanent(), 'The file has a permanent status.');
......@@ -72,7 +72,7 @@ public function testFileDenormalize() {
$this->assertIdentical('temporary://' . $file_name, $denormalized->getFileUri(), 'The expected file URI was found.');
$this->assertTrue(file_exists($denormalized->getFileUri()), 'The temporary file was found.');
$this->assertIdentical('text/plain', $denormalized->getMimeType(), 'The expected mime type was found.');
$this->assertIdentical('text/plain', $denormalized->getMimeType(), 'The expected MIME type was found.');
$this->assertIdentical($file_name, $denormalized->getFilename(), 'The expected filename was found.');
$this->assertFalse($denormalized->isPermanent(), 'The file has a permanent status.');
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment