pkp/pkp-lib#9910 Use UI Language in Announcement Feeds

pkp · Jul 17, 2024 · d74620c · d74620c
1 parent eb30649
commit d74620c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/plugins/generic/announcementFeed/AnnouncementFeedGatewayPlugin.php b/plugins/generic/announcementFeed/AnnouncementFeedGatewayPlugin.php
@@ -19,6 +19,7 @@
 use APP\template\TemplateManager;
 use PKP\core\Core;
 use PKP\db\DAORegistry;
+use PKP\facades\Locale;
 use PKP\plugins\GatewayPlugin;
 use PKP\site\VersionDAO;
 
@@ -161,6 +162,7 @@ public function fetch($args, $request)
             'dateUpdated' => $dateUpdated,
             'announcements' => $announcements,
             'journal' => $journal,
+            'language' => str_replace('_', '-', str_replace(['@cyrillic', '@latin', '_Latn', '_Cyrl'], '', Locale::getLocale())),
         ]);
 
         $templateMgr->setHeaders(['content-type: ' . $mimeTypeMap[$type] . '; charset=utf-8']);

diff --git a/plugins/generic/announcementFeed/templates/rss.tpl b/plugins/generic/announcementFeed/templates/rss.tpl
@@ -28,7 +28,7 @@
 
 		{* optional elements *}
 		{if $journal->getPrimaryLocale()}
-		<dc:language>{$journal->getPrimaryLocale()|replace:'_':'-'|strip|escape:"html"}</dc:language>
+		<dc:language>{$language|escape}</dc:language>
 		{/if}
 
 		<items>

diff --git a/plugins/generic/announcementFeed/templates/rss2.tpl b/plugins/generic/announcementFeed/templates/rss2.tpl
@@ -23,7 +23,7 @@
 
 		{* optional elements *}
 		{if $journal->getPrimaryLocale()}
-			<language>{$journal->getPrimaryLocale()|replace:'_':'-'|strip|escape:"html"}</language>
+			<language>{$language|escape}</language>
 		{/if}
 		{capture assign="dateUpdated"}{$dateUpdated|strtotime}{/capture}
 		<pubDate>{$smarty.const.DATE_RSS|date:$dateUpdated}</pubDate>