diff --git a/app/models/concerns/with_citations.rb b/app/models/concerns/with_citations.rb index 3ebef124df61180c8e7a19030ce4a56cd220a773..ace51af138c42ee1949e120bb0c6c196ad68ce46 100644 --- a/app/models/concerns/with_citations.rb +++ b/app/models/concerns/with_citations.rb @@ -1,23 +1,23 @@ module WithCitations extend ActiveSupport::Concern - def citation_apa(website: nil) - citation_for("apa", website: website) + def citation_apa(website: nil, locale: nil) + citation_for("apa", website: website, locale: locale) end - def citation_iso690(website: nil) - citation_for("iso690-author-date-fr-no-abstract", website: website) + def citation_iso690(website: nil, locale: nil) + citation_for("iso690-author-date-fr-no-abstract", website: website, locale: locale) end - def citation_mla(website: nil) - citation_for("modern-language-association", website: website) + def citation_mla(website: nil, locale: nil) + citation_for("modern-language-association", website: website, locale: locale) end protected - def citation_for(style, website: nil) + def citation_for(style, website: nil, locale: nil) citeproc = to_citeproc(website: website) - processor = CiteProc::Processor.new style: style, format: 'text' + processor = CiteProc::Processor.new style: style, format: 'text', locale: locale processor.import([citeproc]) processor.render(:bibliography, id: citeproc["id"]).first end diff --git a/app/models/research/journal/paper.rb b/app/models/research/journal/paper.rb index dacacb04f44ed567a57f5b7fd3b4b90b375c1bd7..0b489feb53577c399fee794bd8ca2439b2a45a6b 100644 --- a/app/models/research/journal/paper.rb +++ b/app/models/research/journal/paper.rb @@ -113,8 +113,10 @@ class Research::Journal::Paper < ApplicationRecord { "family" => person.last_name, "given" => person.first_name } }, "URL" => website.url + Communication::Website::Permalink.for_object(self, website).computed_path, + "DOI" => doi.present? ? doi : nil, "container-title" => journal.title, - "publisher" => university.name, + "volume" => volume&.number, + # "publisher" => university.name, "keywords" => keywords, "pdf" => pdf.attached? ? pdf.url : nil, "month-numeric" => published_at.present? ? published_at.month.to_s : nil,