diff --git a/core/modules/media/config/schema/media.schema.yml b/core/modules/media/config/schema/media.schema.yml index 27e0768..b9156b2 100644 --- a/core/modules/media/config/schema/media.schema.yml +++ b/core/modules/media/config/schema/media.schema.yml @@ -52,11 +52,11 @@ media.source.image: type: media.source.field_aware label: '"Image" media source configuration' -media.source.file_audio: +media.source.audio_file: type: media.source.field_aware label: '"Audio" media source configuration' -media.source.file_video: +media.source.video_file: type: media.source.field_aware label: '"Video" media source configuration' diff --git a/core/modules/media/src/Plugin/media/Source/LocalAudio.php b/core/modules/media/src/Plugin/media/Source/AudioFile.php similarity index 89% rename from core/modules/media/src/Plugin/media/Source/LocalAudio.php rename to core/modules/media/src/Plugin/media/Source/AudioFile.php index 0fbb650..06cff9b 100644 --- a/core/modules/media/src/Plugin/media/Source/LocalAudio.php +++ b/core/modules/media/src/Plugin/media/Source/AudioFile.php @@ -11,14 +11,14 @@ * @see \Drupal\file\FileInterface * * @MediaSource( - * id = "file_audio", - * label = @Translation("Audio (local)"), + * id = "audio_file", + * label = @Translation("Audio file"), * description = @Translation("Use audio files for reusable media."), * allowed_field_types = {"file"}, * default_thumbnail_filename = "audio.png" * ) */ -class LocalAudio extends File { +class AudioFile extends File { /** * {@inheritdoc} diff --git a/core/modules/media/src/Plugin/media/Source/LocalVideo.php b/core/modules/media/src/Plugin/media/Source/VideoFile.php similarity index 89% rename from core/modules/media/src/Plugin/media/Source/LocalVideo.php rename to core/modules/media/src/Plugin/media/Source/VideoFile.php index a285d3c..02c0bea 100644 --- a/core/modules/media/src/Plugin/media/Source/LocalVideo.php +++ b/core/modules/media/src/Plugin/media/Source/VideoFile.php @@ -11,14 +11,14 @@ * @see \Drupal\file\FileInterface * * @MediaSource( - * id = "file_video", - * label = @Translation("Video (local)"), + * id = "video_file", + * label = @Translation("Video file"), * description = @Translation("Use video files for reusable media."), * allowed_field_types = {"file"}, * default_thumbnail_filename = "video.png" * ) */ -class LocalVideo extends File { +class VideoFile extends File { /** * {@inheritdoc} diff --git a/core/modules/media/tests/src/FunctionalJavascript/MediaSourceAudioVideoTest.php b/core/modules/media/tests/src/FunctionalJavascript/MediaSourceAudioVideoTest.php index 218821a..b5329ce 100644 --- a/core/modules/media/tests/src/FunctionalJavascript/MediaSourceAudioVideoTest.php +++ b/core/modules/media/tests/src/FunctionalJavascript/MediaSourceAudioVideoTest.php @@ -21,7 +21,7 @@ public function testAudioTypeCreation() { $assert_session = $this->assertSession(); $page = $this->getSession()->getPage(); - $source_id = 'file_audio'; + $source_id = 'audio_file'; $type_name = 'audio_type'; $field_name = 'field_media_' . $source_id; $this->doTestCreateMediaType($type_name, $source_id); @@ -65,7 +65,7 @@ public function testVideoTypeCreation() { $assert_session = $this->assertSession(); $page = $this->getSession()->getPage(); - $source_id = 'file_video'; + $source_id = 'video_file'; $type_name = 'video_type'; $field_name = 'field_media_' . $source_id; $this->doTestCreateMediaType($type_name, $source_id);