Merge branch '3371516-message-is-showing' into '8.x-1.x'

Issue #3371516: Message is showing in the default language instead of current

See merge request !17

src/Entity/MessageTemplate.php

@@ -264,9 +264,8 @@ class MessageTemplate extends ConfigEntityBundleBase implements MessageTemplateI
     if ($language_manager instanceof ConfigurableLanguageManagerInterface) {
 
       if ($langcode == Language::LANGCODE_NOT_SPECIFIED) {
-        // Get the default language code when not specified.
-        $langcode = $language_manager->getDefaultLanguage()->getId();
-      }
+        // Get the current language code when not specified.
+        $langcode = $language_manager->getCurrentLanguage()->getId();      }
 
       if ($this->langcode !== $langcode) {
         $config_translation = $language_manager->getLanguageConfigOverride($langcode, 'message.template.' . $this->id());