diff --git a/calibre-plugin/ffdl_plugin.py b/calibre-plugin/ffdl_plugin.py index ca2710d..1973599 100644 --- a/calibre-plugin/ffdl_plugin.py +++ b/calibre-plugin/ffdl_plugin.py @@ -904,13 +904,13 @@ make_firstimage_cover:true # mi.tags needs to be list, but set kills dups. mi.tags = list(set(list(old_tags)+mi.tags)) - if 'langcode' in book['all_metadata']: + if book['all_metadata']['langcode']: mi.languages=[book['all_metadata']['langcode']] else: # Set language english, but only if not already set. if not oldmi.languages: - mi.languages=['eng'] - + mi.languages=['en'] + if options['fileform'] == 'epub' and prefs['updatecover']: existingepub = db.format(book_id,'EPUB',index_is_id=True, as_file=True) epubmi = get_metadata(existingepub,'EPUB') diff --git a/fanficdownloader/adapters/adapter_efpfanficnet.py b/fanficdownloader/adapters/adapter_efpfanficnet.py index 232a5b1..2c38f1f 100644 --- a/fanficdownloader/adapters/adapter_efpfanficnet.py +++ b/fanficdownloader/adapters/adapter_efpfanficnet.py @@ -158,6 +158,7 @@ class EFPFanFicNet(BaseSiteAdapter): self.chapterUrls.append((title,url)) self.story.setMetadata('numChapters',len(self.chapterUrls)) + self.story.setMetadata('language','Italian') # normalize story URL to first chapter if later chapter URL was given: url = self.chapterUrls[0][1].replace('&i=1','') diff --git a/fanficdownloader/story.py b/fanficdownloader/story.py index a90f0f7..66f9e31 100644 --- a/fanficdownloader/story.py +++ b/fanficdownloader/story.py @@ -240,7 +240,8 @@ class Story(Configurable): self.metadata[key]=value if key == "language": try: - self.metadata['langcode'] = langs[self.metadata[key]] + # getMetadata not just self.metadata[] to do replace_metadata. + self.metadata['langcode'] = langs[self.getMetadata(key)] except: self.metadata['langcode'] = 'en' if key == 'dateUpdated':