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

bozana · Jan 13, 2025 · b495687 · b495687
1 parent 1361507
commit b495687
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/WebFeedGatewayPlugin.php b/WebFeedGatewayPlugin.php
@@ -25,6 +25,7 @@
 use Exception;
 use PKP\category\Category;
 use PKP\core\Registry;
+use PKP\facades\Locale;
 use PKP\plugins\GatewayPlugin;
 use PKP\userGroup\UserGroup;
 
@@ -127,7 +128,8 @@ public function fetch($args, $request): bool
                     'latestDate' => $latestDate,
                     'feedUrl' => $request->getRequestUrl(),
                     'userGroups' => $userGroups,
-                    'includeIdentifiers' => $includeIdentifiers
+                    'includeIdentifiers' => $includeIdentifiers,
+                    'language' => str_replace(['_', '@'], '-', Locale::getLocale()),
                 ]
             )
             ->setHeaders(['content-type: ' . static::FEED_MIME_TYPE[$feedType] . '; charset=utf-8'])

diff --git a/templates/rss.tpl b/templates/rss.tpl
@@ -36,9 +36,7 @@
 			<dc:publisher>{$publisherInstitution|strip|escape:"html"}</dc:publisher>
 		{/if}
 
-		{if $context->getPrimaryLocale()}
-			<dc:language>{$context->getPrimaryLocale()|replace:'_':'-'|strip|escape:"html"}</dc:language>
-		{/if}
+		<dc:language>{$language|escape}</dc:language>
 
 		<prism:publicationName>{$context->getLocalizedName()|strip|escape:"html"}</prism:publicationName>
 

diff --git a/templates/rss2.tpl b/templates/rss2.tpl
@@ -25,9 +25,7 @@
 		<description>{$description|strip|escape:"html"}</description>
 
 		{* optional elements *}
-		{if $context->getPrimaryLocale()}
-			<language>{$context->getPrimaryLocale()|replace:'_':'-'|strip|escape:"html"}</language>
-		{/if}
+		<language>{$language|escape}</language>
 
 		{if $context->getLocalizedData('licenseTerms')}
 			<copyright>{$context->getLocalizedData('licenseTerms')|strip|escape:"html"}</copyright>