diff --git a/pages/article/ArticleHandler.php b/pages/article/ArticleHandler.php index 18de5d32962..6a517b1884b 100644 --- a/pages/article/ArticleHandler.php +++ b/pages/article/ArticleHandler.php @@ -25,19 +25,23 @@ use APP\observers\events\UsageEvent; use APP\payment\ojs\OJSCompletedPaymentDAO; use APP\payment\ojs\OJSPaymentManager; +use APP\publication\Publication; use APP\security\authorization\OjsJournalMustPublishPolicy; use APP\submission\Submission; use APP\template\TemplateManager; use Firebase\JWT\Key; use PKP\citation\CitationDAO; use PKP\config\Config; +use PKP\context\Context; use PKP\core\PKPApplication; use PKP\core\PKPJwt as JWT; use PKP\db\DAORegistry; +use PKP\facades\Locale; use PKP\plugins\Hook; use PKP\plugins\PluginRegistry; use PKP\security\authorization\ContextRequiredPolicy; use PKP\security\Validation; +use PKP\services\PKPSchemaService; use PKP\submission\Genre; use PKP\submission\GenreDAO; use PKP\submission\PKPSubmission; @@ -356,6 +360,13 @@ public function view($args, $request) $templateMgr->assign('purchaseArticleEnabled', true); } + $templateMgr->assign('pubLocaleData', $this->getPublicationLocaleData( + $publication, + $templateMgr->getTemplateVars('currentLocale'), + $templateMgr->getTemplateVars('activeTheme')->getOption('showMultilingualMetadata') ?: [], + $context + )); + if (!Hook::call('ArticleHandler::view', [&$request, &$issue, &$article, $publication])) { $templateMgr->display('frontend/pages/article.tpl'); event(new UsageEvent(Application::ASSOC_TYPE_SUBMISSION, $context, $article, null, null, $this->issue)); @@ -615,4 +626,49 @@ public function userCanViewGalley($request, $articleId, $galleyId = null) } return true; } + + /** + * Multilingual publication metadata for template: + * showMultilingualMetadataOpts - Show metadata in other languages: title (by default includes fullTitle and subtitle), keywords, abstract, etc. + */ + protected function getPublicationLocaleData(Publication $publication, string $currentUILocale, array $showMultilingualMetadataOpts, Context $context): array + { + $submissionLocale = $publication->getData('locale'); + $titles = collect([ + 'title' => $publication->getTitles('html'), + 'subtitle' => $publication->getSubtitles('html'), + 'fullTitle' => $publication->getFullTitles('html'), + ]); + $multilingualProps = collect(Services::get('schema')->getMultilingualProps(PKPSchemaService::SCHEMA_PUBLICATION))->diff($titles->keys()); + $multilingualOpts = collect($showMultilingualMetadataOpts) + ->when(in_array('title', $showMultilingualMetadataOpts), fn ($m) => $m->concat($titles->keys())->unique()->values()); + $titleLocale = isset($titles->get('title')[$currentUILocale]) ? $currentUILocale : $submissionLocale; + $uiLocales = collect($context->getSupportedLocaleNames()); + $localeShowOrder = collect([$titleLocale, $currentUILocale, $submissionLocale])->concat($uiLocales->keys())->unique()->values(); + + $getText = fn (array $item, string $opt): array => [ + $opt => [ + // Select 1 text to show in some locale if not in $multilingualOpts + 'text' => ($text = $multilingualOpts->contains($opt) + ? $item + : collect($item)->only([$localeShowOrder->concat(array_keys($item))->first(fn (string $l) => isset($item[$l]))])->toArray()), + // Show headings in supported ui locale if possible + 'hLang' => collect($text)->map(fn ($_, string $locale): string => ($locale === $titleLocale || !$uiLocales->has($locale)) ? $currentUILocale : $locale) + ], + ]; + + $pubLocaleData = $titles->mapWithKeys($getText) + ->union($multilingualProps->mapWithKeys(fn (string $opt): array => ($data = $publication->getData($opt)) ? $getText($data, $opt) : [])) + ->filter(); + $metadataLocales = $pubLocaleData->map(fn (array $item): array => array_keys($item['text']))->flatten()->unique()->sort()->values(); + return $pubLocaleData + ->put('locales', $localeShowOrder + ->intersect($metadataLocales) // Remove ui locales not in $metadataLocales + ->concat($metadataLocales) // Show rest locales in alphabetical order + ->unique() + ->values()) + ->put('localeNames', $uiLocales->map(fn ($_, string $l): array => Locale::getSubmissionLocaleDisplayNames($metadataLocales->toArray(), $l))) + ->put('titleLocale', $titleLocale) + ->toArray(); + } } diff --git a/plugins/themes/default/DefaultThemePlugin.php b/plugins/themes/default/DefaultThemePlugin.php index a9a6c52c117..854711aabcc 100644 --- a/plugins/themes/default/DefaultThemePlugin.php +++ b/plugins/themes/default/DefaultThemePlugin.php @@ -124,6 +124,26 @@ public function init() 'default' => 'none', ]); + $this->addOption('showMultilingualMetadata', 'FieldOptions', [ + 'label' => __('plugins.themes.default.option.metadata.label'), + 'description' => __('plugins.themes.default.option.metadata.description'), + 'options' => [ + [ + 'value' => 'title', + 'label' => __('submission.title'), + ], + [ + 'value' => 'keywords', + 'label' => __('common.keywords'), + ], + [ + 'value' => 'abstract', + 'label' => __('common.abstract'), + ], + ], + 'default' => [], + ]); + // Load primary stylesheet $this->addStyle('stylesheet', 'styles/index.less'); diff --git a/plugins/themes/default/locale/ar/locale.po b/plugins/themes/default/locale/ar/locale.po index 6edfc630447..b90cb925edd 100644 --- a/plugins/themes/default/locale/ar/locale.po +++ b/plugins/themes/default/locale/ar/locale.po @@ -87,3 +87,7 @@ msgstr "التنزيلات" msgid "plugins.themes.default.displayStats.noStats" msgstr "تنزيل البيانات ليس متاحًا بعد." + +#, fuzzy +msgid "plugins.themes.default.titleSubtitleSeparator" +msgstr " — " diff --git a/plugins/themes/default/locale/az/locale.po b/plugins/themes/default/locale/az/locale.po index f1e3c866e9c..bf6872ea658 100644 --- a/plugins/themes/default/locale/az/locale.po +++ b/plugins/themes/default/locale/az/locale.po @@ -95,3 +95,7 @@ msgid "plugins.themes.default.option.useHomepageImageAsHeader.description" msgstr "" "Bir ana səhifə şəkli yükləndiyində, ana səhifədəki normal başlıq yerinə " "başlığın arxa planında baxın." + +#, fuzzy +msgid "plugins.themes.default.titleSubtitleSeparator" +msgstr " — " diff --git a/plugins/themes/default/locale/bg/locale.po b/plugins/themes/default/locale/bg/locale.po index a4dc9c01e0c..bde56c92b3f 100644 --- a/plugins/themes/default/locale/bg/locale.po +++ b/plugins/themes/default/locale/bg/locale.po @@ -101,3 +101,7 @@ msgstr "Сваляния" msgid "plugins.themes.default.displayStats.noStats" msgstr "Данните за свалянията все още не са налични." + +#, fuzzy +msgid "plugins.themes.default.titleSubtitleSeparator" +msgstr " — " diff --git a/plugins/themes/default/locale/bs/locale.po b/plugins/themes/default/locale/bs/locale.po index 032bc10be80..72cba850ac1 100644 --- a/plugins/themes/default/locale/bs/locale.po +++ b/plugins/themes/default/locale/bs/locale.po @@ -93,3 +93,7 @@ msgstr "" msgid "plugins.themes.default.displayStats.noStats" msgstr "" + +#, fuzzy +msgid "plugins.themes.default.titleSubtitleSeparator" +msgstr " — " diff --git a/plugins/themes/default/locale/ca/locale.po b/plugins/themes/default/locale/ca/locale.po index f5814c969d4..e3993a63f36 100644 --- a/plugins/themes/default/locale/ca/locale.po +++ b/plugins/themes/default/locale/ca/locale.po @@ -93,3 +93,7 @@ msgstr "Descàrregues" msgid "plugins.themes.default.displayStats.noStats" msgstr "Les dades de descàrrega encara no estan disponibles." + +#, fuzzy +msgid "plugins.themes.default.titleSubtitleSeparator" +msgstr " — " diff --git a/plugins/themes/default/locale/ckb/locale.po b/plugins/themes/default/locale/ckb/locale.po index 0d206c38f69..ae46d362f7c 100644 --- a/plugins/themes/default/locale/ckb/locale.po +++ b/plugins/themes/default/locale/ckb/locale.po @@ -92,3 +92,7 @@ msgstr "" msgid "plugins.themes.default.displayStats.noStats" msgstr "" + +#, fuzzy +msgid "plugins.themes.default.titleSubtitleSeparator" +msgstr " — " diff --git a/plugins/themes/default/locale/cs/locale.po b/plugins/themes/default/locale/cs/locale.po index 29be7c84941..2cd8439e19b 100644 --- a/plugins/themes/default/locale/cs/locale.po +++ b/plugins/themes/default/locale/cs/locale.po @@ -96,3 +96,7 @@ msgstr "Stažení" msgid "plugins.themes.default.displayStats.noStats" msgstr "Údaje o počtu stažení nejsou zatím k dispozici." + +#, fuzzy +msgid "plugins.themes.default.titleSubtitleSeparator" +msgstr " — " diff --git a/plugins/themes/default/locale/da/locale.po b/plugins/themes/default/locale/da/locale.po index 535e9a70100..a9e546dbcaf 100644 --- a/plugins/themes/default/locale/da/locale.po +++ b/plugins/themes/default/locale/da/locale.po @@ -96,3 +96,7 @@ msgstr "Downloads" msgid "plugins.themes.default.displayStats.noStats" msgstr "Download-data er endnu ikke tilgængelige." + +#, fuzzy +msgid "plugins.themes.default.titleSubtitleSeparator" +msgstr " — " diff --git a/plugins/themes/default/locale/de/locale.po b/plugins/themes/default/locale/de/locale.po index e7843b46c0d..9b3b370a95d 100644 --- a/plugins/themes/default/locale/de/locale.po +++ b/plugins/themes/default/locale/de/locale.po @@ -97,3 +97,7 @@ msgstr "Downloads" msgid "plugins.themes.default.displayStats.noStats" msgstr "Download-Daten sind nocht nicht verfügbar." + +#, fuzzy +msgid "plugins.themes.default.titleSubtitleSeparator" +msgstr " — " diff --git a/plugins/themes/default/locale/el/locale.po b/plugins/themes/default/locale/el/locale.po index 182c98d40c3..bdffb05237a 100644 --- a/plugins/themes/default/locale/el/locale.po +++ b/plugins/themes/default/locale/el/locale.po @@ -101,3 +101,7 @@ msgstr "" msgid "plugins.themes.default.option.displayStats.none" msgstr "" "Να μην εμφανίζονται στατιστικά στοιχεία χρήσης υποβολής για τον αναγνώστη." + +#, fuzzy +msgid "plugins.themes.default.titleSubtitleSeparator" +msgstr " — " diff --git a/plugins/themes/default/locale/en/locale.po b/plugins/themes/default/locale/en/locale.po index c783e630ff5..e83feaa4da8 100644 --- a/plugins/themes/default/locale/en/locale.po +++ b/plugins/themes/default/locale/en/locale.po @@ -98,3 +98,15 @@ msgstr "Next slide" msgid "plugins.themes.default.prevSlide" msgstr "Previous slide" + +msgid "plugins.themes.default.option.metadata.label" +msgstr "Show article metadata on the article landing page" + +msgid "plugins.themes.default.option.metadata.description" +msgstr "Select the article metadata to show in other languages." + +msgid "plugins.themes.default.submissionMetadataInLanguage" +msgstr "Article Metadata in {$inlang}" + +msgid "plugins.themes.default.titleSubtitleSeparator" +msgstr " — " diff --git a/plugins/themes/default/locale/es/locale.po b/plugins/themes/default/locale/es/locale.po index 3145a96e116..ba611d0a764 100644 --- a/plugins/themes/default/locale/es/locale.po +++ b/plugins/themes/default/locale/es/locale.po @@ -96,3 +96,7 @@ msgstr "Descargas" msgid "plugins.themes.default.displayStats.noStats" msgstr "Los datos de descarga aún no están disponibles." + +#, fuzzy +msgid "plugins.themes.default.titleSubtitleSeparator" +msgstr " — " diff --git a/plugins/themes/default/locale/es_MX/locale.po b/plugins/themes/default/locale/es_MX/locale.po index 385b3f2a58b..8cb7022a762 100644 --- a/plugins/themes/default/locale/es_MX/locale.po +++ b/plugins/themes/default/locale/es_MX/locale.po @@ -91,3 +91,7 @@ msgstr "Descargas" msgid "plugins.themes.default.displayStats.noStats" msgstr "Los datos de descarga aún no están disponibles." + +#, fuzzy +msgid "plugins.themes.default.titleSubtitleSeparator" +msgstr " — " diff --git a/plugins/themes/default/locale/fa/locale.po b/plugins/themes/default/locale/fa/locale.po index 3fd24dbb7e7..3c76da48f61 100644 --- a/plugins/themes/default/locale/fa/locale.po +++ b/plugins/themes/default/locale/fa/locale.po @@ -92,3 +92,7 @@ msgstr "دانلودها" msgid "plugins.themes.default.displayStats.noStats" msgstr "دسترسی به دانلود اطلاعات مقدور نیست." + +#, fuzzy +msgid "plugins.themes.default.titleSubtitleSeparator" +msgstr " — " diff --git a/plugins/themes/default/locale/fi/locale.po b/plugins/themes/default/locale/fi/locale.po index 22169ec90c4..1a5db88f044 100644 --- a/plugins/themes/default/locale/fi/locale.po +++ b/plugins/themes/default/locale/fi/locale.po @@ -97,3 +97,7 @@ msgstr "Lataukset" msgid "plugins.themes.default.displayStats.noStats" msgstr "Lataustiedot eivät ole vielä saatavilla." + +#, fuzzy +msgid "plugins.themes.default.titleSubtitleSeparator" +msgstr " — " diff --git a/plugins/themes/default/locale/fr_CA/locale.po b/plugins/themes/default/locale/fr_CA/locale.po index 11fedd37451..2092d39aa23 100644 --- a/plugins/themes/default/locale/fr_CA/locale.po +++ b/plugins/themes/default/locale/fr_CA/locale.po @@ -110,3 +110,7 @@ msgstr "Les données de téléchargement ne sont pas encore disponible." #~ msgid "plugins.themes.default.option.showDescriptionInJournalIndex.label" #~ msgstr "Description de la revue" + +#, fuzzy +msgid "plugins.themes.default.titleSubtitleSeparator" +msgstr " — " diff --git a/plugins/themes/default/locale/fr_FR/locale.po b/plugins/themes/default/locale/fr_FR/locale.po index 2e1148bb565..e6dcea6f8d1 100644 --- a/plugins/themes/default/locale/fr_FR/locale.po +++ b/plugins/themes/default/locale/fr_FR/locale.po @@ -95,3 +95,7 @@ msgstr "" msgid "plugins.themes.default.displayStats.noStats" msgstr "" + +#, fuzzy +msgid "plugins.themes.default.titleSubtitleSeparator" +msgstr " — " diff --git a/plugins/themes/default/locale/gl/locale.po b/plugins/themes/default/locale/gl/locale.po index b254a4122ff..81327138f13 100644 --- a/plugins/themes/default/locale/gl/locale.po +++ b/plugins/themes/default/locale/gl/locale.po @@ -92,3 +92,7 @@ msgstr "" msgid "plugins.themes.default.displayStats.noStats" msgstr "" + +#, fuzzy +msgid "plugins.themes.default.titleSubtitleSeparator" +msgstr " — " diff --git a/plugins/themes/default/locale/hu/locale.po b/plugins/themes/default/locale/hu/locale.po index f23af1a290e..a2bd318d2ce 100644 --- a/plugins/themes/default/locale/hu/locale.po +++ b/plugins/themes/default/locale/hu/locale.po @@ -97,3 +97,7 @@ msgstr "" msgid "plugins.themes.default.displayStats.noStats" msgstr "" + +#, fuzzy +msgid "plugins.themes.default.titleSubtitleSeparator" +msgstr " — " diff --git a/plugins/themes/default/locale/hy/locale.po b/plugins/themes/default/locale/hy/locale.po index be2eff4d35d..cc623d80570 100644 --- a/plugins/themes/default/locale/hy/locale.po +++ b/plugins/themes/default/locale/hy/locale.po @@ -100,3 +100,7 @@ msgstr "Ներբեռնումներ" msgid "plugins.themes.default.displayStats.noStats" msgstr "Ներբեռնման տվյալները դեռ հասանելի չեն:" + +#, fuzzy +msgid "plugins.themes.default.titleSubtitleSeparator" +msgstr " — " diff --git a/plugins/themes/default/locale/id/locale.po b/plugins/themes/default/locale/id/locale.po index 0af641f1bcc..7ccd0d56853 100644 --- a/plugins/themes/default/locale/id/locale.po +++ b/plugins/themes/default/locale/id/locale.po @@ -94,3 +94,7 @@ msgstr "Unduhan" msgid "plugins.themes.default.displayStats.noStats" msgstr "Data unduhan tidak tersedia." + +#, fuzzy +msgid "plugins.themes.default.titleSubtitleSeparator" +msgstr " — " diff --git a/plugins/themes/default/locale/it/locale.po b/plugins/themes/default/locale/it/locale.po index 79e7929a989..9fc508c2093 100644 --- a/plugins/themes/default/locale/it/locale.po +++ b/plugins/themes/default/locale/it/locale.po @@ -101,3 +101,7 @@ msgstr "Downloads" msgid "plugins.themes.default.displayStats.noStats" msgstr "La data di download non è ancora disponibile." + +#, fuzzy +msgid "plugins.themes.default.titleSubtitleSeparator" +msgstr " — " diff --git a/plugins/themes/default/locale/ja/locale.po b/plugins/themes/default/locale/ja/locale.po index ed874966b1d..787c8d5c96c 100644 --- a/plugins/themes/default/locale/ja/locale.po +++ b/plugins/themes/default/locale/ja/locale.po @@ -92,3 +92,7 @@ msgstr "" msgid "plugins.themes.default.displayStats.noStats" msgstr "" + +#, fuzzy +msgid "plugins.themes.default.titleSubtitleSeparator" +msgstr " — " diff --git a/plugins/themes/default/locale/ka/locale.po b/plugins/themes/default/locale/ka/locale.po index a6188c750b1..6dfa3170cd6 100644 --- a/plugins/themes/default/locale/ka/locale.po +++ b/plugins/themes/default/locale/ka/locale.po @@ -92,3 +92,7 @@ msgstr "" msgid "plugins.themes.default.displayStats.noStats" msgstr "" + +#, fuzzy +msgid "plugins.themes.default.titleSubtitleSeparator" +msgstr " — " diff --git a/plugins/themes/default/locale/kk/locale.po b/plugins/themes/default/locale/kk/locale.po index 26cb7cb624b..1c92e3b5ee2 100644 --- a/plugins/themes/default/locale/kk/locale.po +++ b/plugins/themes/default/locale/kk/locale.po @@ -91,3 +91,7 @@ msgstr "" msgid "plugins.themes.default.displayStats.noStats" msgstr "" + +#, fuzzy +msgid "plugins.themes.default.titleSubtitleSeparator" +msgstr " — " diff --git a/plugins/themes/default/locale/ko/locale.po b/plugins/themes/default/locale/ko/locale.po index cb62bba2a7b..ee63b4ce436 100644 --- a/plugins/themes/default/locale/ko/locale.po +++ b/plugins/themes/default/locale/ko/locale.po @@ -89,3 +89,7 @@ msgstr "" msgid "plugins.themes.default.displayStats.noStats" msgstr "" + +#, fuzzy +msgid "plugins.themes.default.titleSubtitleSeparator" +msgstr " — " diff --git a/plugins/themes/default/locale/lv/locale.po b/plugins/themes/default/locale/lv/locale.po index 6a5cd7d57be..eadfa8cb6a8 100644 --- a/plugins/themes/default/locale/lv/locale.po +++ b/plugins/themes/default/locale/lv/locale.po @@ -96,3 +96,7 @@ msgstr "Lejupielādes" msgid "plugins.themes.default.displayStats.noStats" msgstr "Lejupielādes dati vēl nav pieejami." + +#, fuzzy +msgid "plugins.themes.default.titleSubtitleSeparator" +msgstr " — " diff --git a/plugins/themes/default/locale/mk/locale.po b/plugins/themes/default/locale/mk/locale.po index 3b20fe6a041..e9dfd3d0af2 100644 --- a/plugins/themes/default/locale/mk/locale.po +++ b/plugins/themes/default/locale/mk/locale.po @@ -94,3 +94,7 @@ msgstr "Превземања" msgid "plugins.themes.default.displayStats.noStats" msgstr "Податоците за превземање не се сè уште достапни." + +#, fuzzy +msgid "plugins.themes.default.titleSubtitleSeparator" +msgstr " — " diff --git a/plugins/themes/default/locale/ms/locale.po b/plugins/themes/default/locale/ms/locale.po index 72a31998655..4fd6eee53a9 100644 --- a/plugins/themes/default/locale/ms/locale.po +++ b/plugins/themes/default/locale/ms/locale.po @@ -94,3 +94,7 @@ msgstr "Muat turun" msgid "plugins.themes.default.displayStats.noStats" msgstr "Muat turun data belum tersedia." + +#, fuzzy +msgid "plugins.themes.default.titleSubtitleSeparator" +msgstr " — " diff --git a/plugins/themes/default/locale/nb/locale.po b/plugins/themes/default/locale/nb/locale.po index fff9363a54f..4ec49edd90b 100644 --- a/plugins/themes/default/locale/nb/locale.po +++ b/plugins/themes/default/locale/nb/locale.po @@ -96,3 +96,7 @@ msgstr "Nedlastinger" msgid "plugins.themes.default.displayStats.noStats" msgstr "Nedlastingsdata er foreløpig ikke tilgjengelig." + +#, fuzzy +msgid "plugins.themes.default.titleSubtitleSeparator" +msgstr " — " diff --git a/plugins/themes/default/locale/nl/locale.po b/plugins/themes/default/locale/nl/locale.po index 277445ed6f5..afe15b63992 100644 --- a/plugins/themes/default/locale/nl/locale.po +++ b/plugins/themes/default/locale/nl/locale.po @@ -95,3 +95,7 @@ msgstr "" msgid "plugins.themes.default.displayStats.noStats" msgstr "" + +#, fuzzy +msgid "plugins.themes.default.titleSubtitleSeparator" +msgstr " — " diff --git a/plugins/themes/default/locale/pl/locale.po b/plugins/themes/default/locale/pl/locale.po index d9257a0d70d..d7a4a42174a 100644 --- a/plugins/themes/default/locale/pl/locale.po +++ b/plugins/themes/default/locale/pl/locale.po @@ -98,3 +98,7 @@ msgstr "Pobrania" msgid "plugins.themes.default.displayStats.noStats" msgstr "Statystyki pobrań niedostępne." + +#, fuzzy +msgid "plugins.themes.default.titleSubtitleSeparator" +msgstr " — " diff --git a/plugins/themes/default/locale/pt_BR/locale.po b/plugins/themes/default/locale/pt_BR/locale.po index a54e5315dc8..95b0261262f 100644 --- a/plugins/themes/default/locale/pt_BR/locale.po +++ b/plugins/themes/default/locale/pt_BR/locale.po @@ -96,3 +96,7 @@ msgstr "Downloads" msgid "plugins.themes.default.displayStats.noStats" msgstr "Os dados de download ainda não estão disponíveis." + +#, fuzzy +msgid "plugins.themes.default.titleSubtitleSeparator" +msgstr " — " diff --git a/plugins/themes/default/locale/pt_PT/locale.po b/plugins/themes/default/locale/pt_PT/locale.po index 8d7740ada98..8f878f2f937 100644 --- a/plugins/themes/default/locale/pt_PT/locale.po +++ b/plugins/themes/default/locale/pt_PT/locale.po @@ -96,3 +96,7 @@ msgstr "Downloads" msgid "plugins.themes.default.displayStats.noStats" msgstr "Os dados de download ainda não estão disponíveis." + +#, fuzzy +msgid "plugins.themes.default.titleSubtitleSeparator" +msgstr " — " diff --git a/plugins/themes/default/locale/ro/locale.po b/plugins/themes/default/locale/ro/locale.po index 48ab7ddeef7..9ff92bc7dbd 100644 --- a/plugins/themes/default/locale/ro/locale.po +++ b/plugins/themes/default/locale/ro/locale.po @@ -93,3 +93,7 @@ msgstr "" msgid "plugins.themes.default.displayStats.noStats" msgstr "" + +#, fuzzy +msgid "plugins.themes.default.titleSubtitleSeparator" +msgstr " — " diff --git a/plugins/themes/default/locale/ru/locale.po b/plugins/themes/default/locale/ru/locale.po index aa084a34cb3..d0ccdb6cee5 100644 --- a/plugins/themes/default/locale/ru/locale.po +++ b/plugins/themes/default/locale/ru/locale.po @@ -98,3 +98,7 @@ msgstr "Скачивания" msgid "plugins.themes.default.displayStats.noStats" msgstr "Данные по скачиваниям пока не доступны." + +#, fuzzy +msgid "plugins.themes.default.titleSubtitleSeparator" +msgstr " — " diff --git a/plugins/themes/default/locale/sk/locale.po b/plugins/themes/default/locale/sk/locale.po index bc02cd45725..18faca316f0 100644 --- a/plugins/themes/default/locale/sk/locale.po +++ b/plugins/themes/default/locale/sk/locale.po @@ -92,3 +92,7 @@ msgstr "" msgid "plugins.themes.default.displayStats.noStats" msgstr "" + +#, fuzzy +msgid "plugins.themes.default.titleSubtitleSeparator" +msgstr " — " diff --git a/plugins/themes/default/locale/sl/locale.po b/plugins/themes/default/locale/sl/locale.po index 230c95fb3e3..aa7bc4c99f2 100644 --- a/plugins/themes/default/locale/sl/locale.po +++ b/plugins/themes/default/locale/sl/locale.po @@ -94,3 +94,7 @@ msgstr "Prenosi" msgid "plugins.themes.default.displayStats.noStats" msgstr "Podatki o prenosih še niso na voljo." + +#, fuzzy +msgid "plugins.themes.default.titleSubtitleSeparator" +msgstr " — " diff --git a/plugins/themes/default/locale/sr@latin/locale.po b/plugins/themes/default/locale/sr@latin/locale.po index 5bb27040368..205fd53ad20 100644 --- a/plugins/themes/default/locale/sr@latin/locale.po +++ b/plugins/themes/default/locale/sr@latin/locale.po @@ -86,3 +86,7 @@ msgstr "" msgid "plugins.themes.default.displayStats.noStats" msgstr "" + +#, fuzzy +msgid "plugins.themes.default.titleSubtitleSeparator" +msgstr " — " diff --git a/plugins/themes/default/locale/sv/locale.po b/plugins/themes/default/locale/sv/locale.po index a4343c75e8c..c5d374a838b 100644 --- a/plugins/themes/default/locale/sv/locale.po +++ b/plugins/themes/default/locale/sv/locale.po @@ -96,3 +96,7 @@ msgstr "Nedladdningar" msgid "plugins.themes.default.displayStats.noStats" msgstr "Nedladdningsstatistik är inte tillgänglig ännu." + +#, fuzzy +msgid "plugins.themes.default.titleSubtitleSeparator" +msgstr " — " diff --git a/plugins/themes/default/locale/tr/locale.po b/plugins/themes/default/locale/tr/locale.po index 8a8eb47a341..08b82116151 100644 --- a/plugins/themes/default/locale/tr/locale.po +++ b/plugins/themes/default/locale/tr/locale.po @@ -98,3 +98,7 @@ msgstr "İndirmeler" msgid "plugins.themes.default.displayStats.noStats" msgstr "İndirme verisi henüz mevcut değil." + +#, fuzzy +msgid "plugins.themes.default.titleSubtitleSeparator" +msgstr " — " diff --git a/plugins/themes/default/locale/uk/locale.po b/plugins/themes/default/locale/uk/locale.po index 3a4e3e7a0c0..f77029fc2fb 100644 --- a/plugins/themes/default/locale/uk/locale.po +++ b/plugins/themes/default/locale/uk/locale.po @@ -104,3 +104,7 @@ msgstr "Завантажити" msgid "plugins.themes.default.displayStats.noStats" msgstr "Дані для завантаження поки недоступні." + +#, fuzzy +msgid "plugins.themes.default.titleSubtitleSeparator" +msgstr " — " diff --git a/plugins/themes/default/locale/uz@latin/locale.po b/plugins/themes/default/locale/uz@latin/locale.po index 56decf289e6..7a1e044a26b 100644 --- a/plugins/themes/default/locale/uz@latin/locale.po +++ b/plugins/themes/default/locale/uz@latin/locale.po @@ -98,3 +98,7 @@ msgstr "Yuklashlar" msgid "plugins.themes.default.displayStats.noStats" msgstr "Yuklab olish maʼlumotlari hali mavjud emas." + +#, fuzzy +msgid "plugins.themes.default.titleSubtitleSeparator" +msgstr " — " diff --git a/plugins/themes/default/locale/vi/locale.po b/plugins/themes/default/locale/vi/locale.po index abc7ee66b05..b32ed1127e6 100644 --- a/plugins/themes/default/locale/vi/locale.po +++ b/plugins/themes/default/locale/vi/locale.po @@ -93,3 +93,7 @@ msgstr "" msgid "plugins.themes.default.displayStats.noStats" msgstr "" + +#, fuzzy +msgid "plugins.themes.default.titleSubtitleSeparator" +msgstr " — " diff --git a/plugins/themes/default/locale/zh_CN/locale.po b/plugins/themes/default/locale/zh_CN/locale.po index a667a12b4aa..82c84f34c7a 100644 --- a/plugins/themes/default/locale/zh_CN/locale.po +++ b/plugins/themes/default/locale/zh_CN/locale.po @@ -83,3 +83,7 @@ msgstr "" msgid "plugins.themes.default.displayStats.noStats" msgstr "" + +#, fuzzy +msgid "plugins.themes.default.titleSubtitleSeparator" +msgstr " — " diff --git a/plugins/themes/default/locale/zh_Hant/locale.po b/plugins/themes/default/locale/zh_Hant/locale.po index 05ddc90eb09..94b9a53b780 100644 --- a/plugins/themes/default/locale/zh_Hant/locale.po +++ b/plugins/themes/default/locale/zh_Hant/locale.po @@ -83,3 +83,7 @@ msgstr "下載" msgid "plugins.themes.default.displayStats.noStats" msgstr "尚未有下載數據。" + +#, fuzzy +msgid "plugins.themes.default.titleSubtitleSeparator" +msgstr " — " diff --git a/plugins/themes/default/styles/objects/article_details.less b/plugins/themes/default/styles/objects/article_details.less index d8c032b0a0d..85f9291cba3 100644 --- a/plugins/themes/default/styles/objects/article_details.less +++ b/plugins/themes/default/styles/objects/article_details.less @@ -37,7 +37,7 @@ margin-bottom: 0; } - > h2 + p { + > h2 + p, h3 + p { margin-top: 0; } } @@ -52,6 +52,10 @@ .main_entry { + .metadata > .page_metadata_title { + margin: 0; + } + .item { .label { @@ -61,8 +65,7 @@ font-weight: @bold; } - &.doi .label, - &.keywords .label { + &.doi .label { display: inline; font-size: @font-base; } @@ -127,8 +130,7 @@ } } - .item.doi, - .item.keywords { + .item.doi { padding-top: 0; } @@ -315,8 +317,7 @@ font-weight: @bold; } - &.doi .label, - &.keywords .label { + &.doi .label { display: inline; font-size: @font-base; } diff --git a/templates/frontend/objects/article_details.tpl b/templates/frontend/objects/article_details.tpl index 4b6b1463e1b..f74ebc87df7 100755 --- a/templates/frontend/objects/article_details.tpl +++ b/templates/frontend/objects/article_details.tpl @@ -64,6 +64,7 @@ * @uses $licenseUrl string URL to license. Only assigned if license should be * included with published submissions. * @uses $ccLicenseBadge string An image and text with details about the license + * @uses $pubLocaleData array Array of formatted publication multilingual metadata * * @hook Templates::Article::Main [] * @hook Templates::Article::Details::Reference [] @@ -91,14 +92,17 @@ {/if} -

- {$publication->getLocalizedTitle(null, 'html')|strip_unsafe_html} +

+ {$pubLocaleData.title.text[$pubLocaleData.titleLocale]|strip_unsafe_html}

- - {if $publication->getLocalizedData('subtitle')} + {if !$activeTheme->getOption('showMultilingualMetadata') && $publication->getLocalizedData('subtitle')}

{$publication->getLocalizedSubTitle(null, 'html')|strip_unsafe_html}

+ {elseif isset($pubLocaleData.subtitle.text[$pubLocaleData.titleLocale])} +

+ {$pubLocaleData.subtitle.text[$pubLocaleData.titleLocale]|strip_unsafe_html} +

{/if}
@@ -160,32 +164,36 @@ {/if} + {* Default view or multilingual view *} + {if !$activeTheme->getOption('showMultilingualMetadata')} + {* Keywords *} + {if !empty($publication->getLocalizedData('keywords'))} +
+

+ {capture assign=translatedKeywords}{translate key="article.subject"}{/capture} + {translate key="semicolon" label=$translatedKeywords} +

+ + {foreach name="keywords" from=$publication->getLocalizedData('keywords') item="keyword"} + {$keyword|escape}{if !$smarty.foreach.keywords.last}{translate key="common.commaListSeparator"}{/if} + {/foreach} + +
+ {/if} + + {* Abstract *} + {if $publication->getLocalizedData('abstract')} +
+

{translate key="article.abstract"}

+ {$publication->getLocalizedData('abstract')|strip_unsafe_html} +
+ {/if} - {* Keywords *} - {if !empty($publication->getLocalizedData('keywords'))} -
-

- {capture assign=translatedKeywords}{translate key="article.subject"}{/capture} - {translate key="semicolon" label=$translatedKeywords} -

- - {foreach name="keywords" from=$publication->getLocalizedData('keywords') item="keyword"} - {$keyword|escape}{if !$smarty.foreach.keywords.last}{translate key="common.commaListSeparator"}{/if} - {/foreach} - -
- {/if} - - {* Abstract *} - {if $publication->getLocalizedData('abstract')} -
-

{translate key="article.abstract"}

- {$publication->getLocalizedData('abstract')|strip_unsafe_html} -
+ {call_hook name="Templates::Article::Main"} + {else} + {include file="frontend/objects/article_multilingual_metadata.tpl" pubLocaleData=$pubLocaleData} {/if} - {call_hook name="Templates::Article::Main"} - {* Usage statistics chart*} {if $activeTheme->getOption('displayStats') != 'none'} {$activeTheme->displayUsageStatsGraph($article->getId())} diff --git a/templates/frontend/objects/article_multilingual_metadata.tpl b/templates/frontend/objects/article_multilingual_metadata.tpl new file mode 100644 index 00000000000..0a3935fdff7 --- /dev/null +++ b/templates/frontend/objects/article_multilingual_metadata.tpl @@ -0,0 +1,70 @@ +{* + * Show article keywords and abstract in ui, or submission, language by default. + * Show optional multilingual metadata: titles, keywords, abstracts. + *} +{foreach from=$pubLocaleData.locales item=locale} + {* Only show if some of these *} + {if !isset($pubLocaleData.title.text[$locale]) + && !isset($pubLocaleData.keywords.text[$locale]) + && !isset($pubLocaleData.abstract.text[$locale]) + } + {continue} + {/if} + + {* Show in current ui locale by default or else in another possible supported ui locale *} + {assign var="supportedLocale" value=$currentLocale} + {if isset($pubLocaleData.localeNames[$locale])} + {assign var="supportedLocale" value=$locale} + {/if} + + {assign "hLvl" "2"} +
+ {* Multilingual metadata title *} + {if $locale !== $pubLocaleData.titleLocale} + {assign "hLvl" "3"} +

+ {translate key="plugins.themes.default.submissionMetadataInLanguage" locale=$supportedLocale inlang=$pubLocaleData.localeNames[$supportedLocale][$locale]} +

+ {* Title in other language *} + {if isset($pubLocaleData.title.text[$locale])} +
+ + {translate key="submission.title" locale=$pubLocaleData.title.hLang[$locale]} + +

+ {$pubLocaleData.title.text[$locale]|strip_tags} + {if isset($pubLocaleData.subtitle.text[$locale])} + {translate key="plugins.themes.default.titleSubtitleSeparator" locale=$pubLocaleData.title.hLang[$locale]}{$pubLocaleData.subtitle.text[$locale]|strip_tags} + {/if} +

+
+ {/if} + {/if} + + {* Keywords *} + {if isset($pubLocaleData.keywords.text[$locale])} +
+ + {translate key="common.keywords" locale=$pubLocaleData.keywords.hLang[$locale]} + +

+ {foreach from=$pubLocaleData.keywords.text[$locale] item="keyword"} + {$keyword|escape}{if !$keyword@last}{translate key="common.commaListSeparator" locale=$pubLocaleData.keywords.hLang[$locale]}{/if} + {/foreach} +

+
+ {/if} + + {* Abstract *} + {if isset($pubLocaleData.abstract.text[$locale])} +
+ + {translate key="common.abstract" locale=$pubLocaleData.abstract.hLang[$locale]} + +

{$pubLocaleData.abstract.text[$locale]|strip_tags}

+
+ {/if} + + {call_hook name="Templates::Article::Main"} +
+{/foreach} \ No newline at end of file