diff --git a/modules/core/locales/en/LC_MESSAGES/core.po b/modules/core/locales/en/LC_MESSAGES/core.po index 6abe03ef7fab4ebc5696447213b263ef00508e15..c91dfeb71309cc51ffb568f9343160ed0a91f265 100644 --- a/modules/core/locales/en/LC_MESSAGES/core.po +++ b/modules/core/locales/en/LC_MESSAGES/core.po @@ -158,7 +158,7 @@ msgstr "Delete my choices of IdP in the IdP discovery services" msgid "{core:frontpage:warnings_outdated}" msgstr "" "You are running an outdated version of SimpleSAMLphp. Please update to <a" -" href=\"%LATEST_URL%\">the latest version</a> as soon as possible." +" href=\"https://simplesamlphp.org/download\">the latest version</a> as soon as possible." msgid "{core:frontpage:loggedin_as_admin}" msgstr "You are logged in as administrator" @@ -365,10 +365,10 @@ msgstr "PHP cURL extension missing. Cannot check for SimpleSAMLphp updates." msgid "" "You are running an outdated version of SimpleSAMLphp. Please update to <a" -" href=\"%LATEST_URL%\">the latest version</a> as soon as possible." +" href=\"https://simplesamlphp.org/download\">the latest version</a> as soon as possible." msgstr "" "You are running an outdated version of SimpleSAMLphp. Please update to <a" -" href=\"%LATEST_URL%\">the latest version</a> as soon as possible." +" href=\"https://simplesamlphp.org/download\">the latest version</a> as soon as possible." msgid "Metadata not found" msgstr "Metadata not found" diff --git a/modules/core/locales/es/LC_MESSAGES/core.po b/modules/core/locales/es/LC_MESSAGES/core.po index 4950c24963a20c62751d64b10b03cabee7b506af..212de1a03c2eb101b6d0efd7bfd5e3dda73b7d73 100644 --- a/modules/core/locales/es/LC_MESSAGES/core.po +++ b/modules/core/locales/es/LC_MESSAGES/core.po @@ -132,7 +132,7 @@ msgstr "Borrar mis opciones de IdP en los servicios de descubrimiento de IdP" msgid "{core:frontpage:warnings_outdated}" msgstr "" "Su instalación de SimpleSAMLphp está desactualizada. Por " -"favor, actualice a la <a href=\"%LATEST_URL%\">última " +"favor, actualice a la <a href=\"https://simplesamlphp.org/download\">última " "versión</a> lo antes posible." msgid "{core:frontpage:loggedin_as_admin}" @@ -341,10 +341,10 @@ msgstr "Usando los botones atrás y adelante de su navegador web." msgid "" "You are running an outdated version of SimpleSAMLphp. Please update to <a" -" href=\"%LATEST_URL%\">the latest version</a> as soon as possible." +" href=\"https://simplesamlphp.org/download\">the latest version</a> as soon as possible." msgstr "" "Su instalación de SimpleSAMLphp está desactualizada. Por " -"favor, actualice a la <a href=\"%LATEST_URL%\">última " +"favor, actualice a la <a href=\"https://simplesamlphp.org/download\">última " "versión</a> lo antes posible." msgid "Metadata not found" diff --git a/modules/core/locales/ja/LC_MESSAGES/core.po b/modules/core/locales/ja/LC_MESSAGES/core.po index d9f42d940f1ec631ade86886160b50d03afd189b..dab892ab3c0b7762e7c09824a11a25fbe1262113 100644 --- a/modules/core/locales/ja/LC_MESSAGES/core.po +++ b/modules/core/locales/ja/LC_MESSAGES/core.po @@ -150,7 +150,7 @@ msgid "{core:frontpage:link_cleardiscochoices}" msgstr "IdPă‡ă‚Łă‚ąă‚«ăăŞă‚µăĽă“ス内ă®IdPă®é¸ćŠžă‚’削除" msgid "{core:frontpage:warnings_outdated}" -msgstr "ć—§ăăĽă‚¸ă§ăłă®SimpleSAMLphpăŚä˝żă‚Źă‚Śă¦ă„ăľă™ă€‚ă§ăŤă‚‹ă ă‘ć—©ăŹ<a href=\"%LATEST_URL%\">最新ăăĽă‚·ă§ăł</a>ă«ă‚˘ăă—ăăĽă‰ă—ă¦ăŹă ă•ă„" +msgstr "ć—§ăăĽă‚¸ă§ăłă®SimpleSAMLphpăŚä˝żă‚Źă‚Śă¦ă„ăľă™ă€‚ă§ăŤă‚‹ă ă‘ć—©ăŹ<a href=\"https://simplesamlphp.org/download\">最新ăăĽă‚·ă§ăł</a>ă«ă‚˘ăă—ăăĽă‰ă—ă¦ăŹă ă•ă„" msgid "{core:frontpage:loggedin_as_admin}" msgstr "管ç†č€…ă§ăグイăłă—ă¦ă„ăľă™" diff --git a/modules/core/locales/nl/LC_MESSAGES/core.po b/modules/core/locales/nl/LC_MESSAGES/core.po index be8f20c20ec378ed8b4f574e74be3daddfe7dc9b..7f1435515c16486da8807aba68863c51edff8bf1 100644 --- a/modules/core/locales/nl/LC_MESSAGES/core.po +++ b/modules/core/locales/nl/LC_MESSAGES/core.po @@ -134,7 +134,7 @@ msgstr "Verwijder IDP keuzes uit de IdP discovery service" msgid "{core:frontpage:warnings_outdated}" msgstr "" "Deze installatie van SimpleSAMLphp is verouderd. Het is aan te raden zo " -"snel mogelijk te upgraden naar <a href=\"%LATEST_URL%\">de meest recente " +"snel mogelijk te upgraden naar <a href=\"https://simplesamlphp.org/download\">de meest recente " "versie</a>." msgid "{core:frontpage:warnings_curlmissing}" @@ -349,10 +349,10 @@ msgstr "Gebruik van de 'Volgende'- en 'Terug'-knoppen in de web browser." msgid "" "You are running an outdated version of SimpleSAMLphp. Please update to <a" -" href=\"%LATEST_URL%\">the latest version</a> as soon as possible." +" href=\"https://simplesamlphp.org/download\">the latest version</a> as soon as possible." msgstr "" "Deze installatie van SimpleSAMLphp is verouderd. Het is aan te raden zo " -"snel mogelijk te upgraden naar <a href=\"%LATEST_URL%\">de meest recente " +"snel mogelijk te upgraden naar <a href=\"https://simplesamlphp.org/download\">de meest recente " "versie</a>." msgid "Metadata not found" diff --git a/modules/core/templates/frontpage_config.twig b/modules/core/templates/frontpage_config.twig index 74ac7c8a5002370ff74c89e1090d6009605d80d1..bdfe9357475d18fcb3576132dedcb2cb4057d5e9 100644 --- a/modules/core/templates/frontpage_config.twig +++ b/modules/core/templates/frontpage_config.twig @@ -31,7 +31,7 @@ {% if warnings is defined and warnings is not empty %} <h2>{{ '{core:frontpage:warnings}'|trans|escape('html') }}</h2> {% for key, warning in warnings %} - <div class="caution">{{ warning|raw }}</div> + <div class="caution">{{ warning|trans|raw }}</div> {% endfor %} {% endif %} diff --git a/modules/core/www/frontpage_config.php b/modules/core/www/frontpage_config.php index bfd2cf6ade9f378e334b04dd7fdb24df2802adbb..d532564651dd4715fbb0a3187bc1049ee9fa0e37 100644 --- a/modules/core/www/frontpage_config.php +++ b/modules/core/www/frontpage_config.php @@ -85,10 +85,7 @@ if ($config->getBoolean('admin.checkforupdates', true) && $current !== 'master') if ($latest && version_compare($current, ltrim($latest['tag_name'], 'v'), 'lt')) { $outdated = true; - $warnings[] = [ - '{core:frontpage:warnings_outdated}', - ['%LATEST_URL%' => $latest['html_url']] - ]; + $warnings[] = '{core:frontpage:warnings_outdated}'; } } } @@ -167,18 +164,11 @@ $funcmatrix[] = [ $t = new \SimpleSAML\XHTML\Template($config, 'core:frontpage_config.twig'); $translator = $t->getTranslator(); $t->data['pageid'] = 'frontpage_config'; -$t->data['header'] = $translator->t('{core:frontpage:page_title}'); +$t->data['header'] = '{core:frontpage:page_title}'; $t->data['isadmin'] = $isadmin; $t->data['loginurl'] = $loginurl; $t->data['logouturl'] = $logouturl; -foreach ($warnings as &$warning) { - if (is_array($warning)) { - $warning = $translator->t($warning[0], $warning[1]); - } else { - $warning = $translator->t($warning); - } -} $t->data['warnings'] = $warnings;