Fix merge conflicts and add language information on the feed rss

client/components/modals/podcast/NewModal.vue

@@ -29,21 +29,19 @@
           </div>
         </div>
         <div class="flex flex-wrap">
-          <div class="w-full md:w-1/2 p-2">
+          <div class="md:w-1/4 p-2">
+            <ui-dropdown :label="$strings.LabelPodcastType" v-model="podcast.type" :items="podcastTypes" small />
+          </div>
+          <div class="md:w-1/4 p-2">
             <ui-text-input-with-label v-model="podcast.language" :label="$strings.LabelLanguage" />
           </div>
-          <div class="flex-grow px-1 pt-6">
+          <div class="md:w-1/4 px-2 pt-7">
             <ui-checkbox v-model="podcast.explicit" :label="$strings.LabelExplicit" checkbox-bg="primary" border-color="gray-600" label-class="pl-2 text-base font-semibold" />
           </div>
         </div>
         <div class="p-2 w-full">
           <ui-textarea-with-label v-model="podcast.description" :label="$strings.LabelDescription" :rows="3" />
         </div>
-        <div class="flex flex-wrap">
-          <div class="w-full md:w-1/2 p-2">
-            <ui-dropdown :label="$strings.LabelPodcastType" v-model="podcast.type" :items="podcastTypes" small />
-          </div>
-        </div>
         <div class="flex flex-wrap">
           <div class="w-full md:w-1/2 p-2">
             <ui-dropdown v-model="selectedFolderId" :items="folderItems" :disabled="processing" :label="$strings.LabelFolder" @input="folderUpdated" />

server/objects/Feed.js

@@ -107,6 +107,7 @@ class Feed {
     this.meta.link = `${serverAddress}/item/${libraryItem.id}`
     this.meta.explicit = !!mediaMetadata.explicit
     this.meta.type = mediaMetadata.type
+    this.meta.language = mediaMetadata.language
 
     this.episodes = []
     if (isPodcast) { // PODCAST EPISODES
@@ -144,6 +145,7 @@ class Feed {
     this.meta.imageUrl = media.coverPath ? `${this.serverAddress}/feed/${this.slug}/cover` : `${this.serverAddress}/Logo.png`
     this.meta.explicit = !!mediaMetadata.explicit
     this.meta.type = mediaMetadata.type
+    this.meta.language = mediaMetadata.language
 
     this.episodes = []
     if (isPodcast) { // PODCAST EPISODES

server/objects/FeedMeta.js

@@ -8,6 +8,7 @@ class FeedMeta {
     this.link = null
     this.explicit = null
     this.type = null
+    this.language = null
 
     if (meta) {
       this.construct(meta)
@@ -23,6 +24,7 @@ class FeedMeta {
     this.link = meta.link
     this.explicit = meta.explicit
     this.type = meta.type
+    this.language = meta.language
   }
 
   toJSON() {
@@ -34,7 +36,8 @@ class FeedMeta {
       feedUrl: this.feedUrl,
       link: this.link,
       explicit: this.explicit,
-      type: this.type
+      type: this.type,
+      language: this.language
     }
   }
 
@@ -46,13 +49,13 @@ class FeedMeta {
       feed_url: this.feedUrl,
       site_url: this.link,
       image_url: this.imageUrl,
-      language: 'en',
       custom_namespaces: {
         'itunes': 'http://www.itunes.com/dtds/podcast-1.0.dtd',
         'psc': 'http://podlove.org/simple-chapters',
         'podcast': 'https://podcastindex.org/namespace/1.0'
       },
       custom_elements: [
+        { 'language': this.language || 'en' },
         { 'author': this.author || 'advplyr' },
         { 'itunes:author': this.author || 'advplyr' },
         { 'itunes:summary': this.description || '' },