From d51b6be9d1750c42e655dad25b7a66c9d2f45a4f Mon Sep 17 00:00:00 2001
From: Christian Marsilius <marsilius@ub.uni-heidelberg.de>
Date: Tue, 24 Mar 2026 17:50:38 +0100
Subject: [PATCH 1/2] pkp/pkp-lib#7527 stamp context identity metadata

---
 CitationStyleLanguagePlugin.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/CitationStyleLanguagePlugin.php b/CitationStyleLanguagePlugin.php
index 6a01218..7c348d0 100644
--- a/CitationStyleLanguagePlugin.php
+++ b/CitationStyleLanguagePlugin.php
@@ -451,7 +451,7 @@ public function getCitation(PKPRequest $request, Submission $submission, string
             $citationData->risType = 'JOUR';
             $citationData->id = $submission->getId();
             $citationData->title = $publication->getLocalizedFullTitle();
-            $citationData->{'container-title'} = $context->getLocalizedName();
+            $citationData->{'container-title'} = $publication->getLocalizedData('contextName');
             $issueId = $publication->getData('issueId');
             $issue ??= $issueId ? Repo::issue()->get($issueId) : null;
             if ($issue) {
@@ -485,7 +485,7 @@ public function getCitation(PKPRequest $request, Submission $submission, string
             $citationData->id = $submission->getId();
             $citationData->title = $publication->getLocalizedFullTitle();
             $citationData = $this->addSeriesInformation($citationData, $publication);
-            $citationData->publisher = $context->getLocalizedName();
+            $citationData->publisher = $publication->getLocalizedData('contextName');
             $citationData->keywords = $keywords[Locale::getLocale()] ?? [];
             if ($publication->getData('pages')) {
                 $citationData->page = htmlspecialchars($publication->getData('pages'));
@@ -504,7 +504,7 @@ public function getCitation(PKPRequest $request, Submission $submission, string
             $citationData->title = $chapter->getLocalizedFullTitle();
             $citationData->{'container-title'} = $publication->getLocalizedFullTitle();
             $citationData = $this->addSeriesInformation($citationData, $publication);
-            $citationData->publisher = $context->getLocalizedName();
+            $citationData->publisher = $publication->getLocalizedData('contextName');
             if ($chapter->getPages()) {
                 $citationData->page = htmlspecialchars($chapter->getPages());
             }
@@ -533,7 +533,7 @@ public function getCitation(PKPRequest $request, Submission $submission, string
             ->push($submission->getData('locale'))
             ->filter()->unique()->sort()->values()->toArray();
 
-        $citationData->{'publisher-place'} = $this->getSetting($context->getId(), 'publisherLocation');
+        $citationData->{'publisher-place'} = $publication->getData('publisherLocation');
         $abbreviation = $context->getData('abbreviation', $context->getPrimaryLocale()) ?? $context->getData('acronym', $context->getPrimaryLocale());
         if ($abbreviation) {
             $citationData->{'container-title-short'} = $abbreviation;

From e04d5d9a379649c9e9fdd6860e0ab3599261577e Mon Sep 17 00:00:00 2001
From: Bozana Bokan <bozana.bokan@posteo.net>
Date: Mon, 8 Jun 2026 18:24:13 +0200
Subject: [PATCH 2/2] pkp/pkp-lib#7527 Resolve journal identity through
 stamped-or-context fallback

---
 CitationStyleLanguagePlugin.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/CitationStyleLanguagePlugin.php b/CitationStyleLanguagePlugin.php
index 7c348d0..4d1bd28 100644
--- a/CitationStyleLanguagePlugin.php
+++ b/CitationStyleLanguagePlugin.php
@@ -451,7 +451,7 @@ public function getCitation(PKPRequest $request, Submission $submission, string
             $citationData->risType = 'JOUR';
             $citationData->id = $submission->getId();
             $citationData->title = $publication->getLocalizedFullTitle();
-            $citationData->{'container-title'} = $publication->getLocalizedData('contextName');
+            $citationData->{'container-title'} = $publication->getLocalizedContextName($context);
             $issueId = $publication->getData('issueId');
             $issue ??= $issueId ? Repo::issue()->get($issueId) : null;
             if ($issue) {
@@ -485,7 +485,7 @@ public function getCitation(PKPRequest $request, Submission $submission, string
             $citationData->id = $submission->getId();
             $citationData->title = $publication->getLocalizedFullTitle();
             $citationData = $this->addSeriesInformation($citationData, $publication);
-            $citationData->publisher = $publication->getLocalizedData('contextName');
+            $citationData->publisher = $publication->getLocalizedContextName($context);
             $citationData->keywords = $keywords[Locale::getLocale()] ?? [];
             if ($publication->getData('pages')) {
                 $citationData->page = htmlspecialchars($publication->getData('pages'));
@@ -504,7 +504,7 @@ public function getCitation(PKPRequest $request, Submission $submission, string
             $citationData->title = $chapter->getLocalizedFullTitle();
             $citationData->{'container-title'} = $publication->getLocalizedFullTitle();
             $citationData = $this->addSeriesInformation($citationData, $publication);
-            $citationData->publisher = $publication->getLocalizedData('contextName');
+            $citationData->publisher = $publication->getLocalizedContextName($context);
             if ($chapter->getPages()) {
                 $citationData->page = htmlspecialchars($chapter->getPages());
             }
@@ -533,7 +533,7 @@ public function getCitation(PKPRequest $request, Submission $submission, string
             ->push($submission->getData('locale'))
             ->filter()->unique()->sort()->values()->toArray();
 
-        $citationData->{'publisher-place'} = $publication->getData('publisherLocation');
+        $citationData->{'publisher-place'} = $publication->getData('publisherLocation') ?: $this->getSetting($context->getId(), 'publisherLocation');
         $abbreviation = $context->getData('abbreviation', $context->getPrimaryLocale()) ?? $context->getData('acronym', $context->getPrimaryLocale());
         if ($abbreviation) {
             $citationData->{'container-title-short'} = $abbreviation;