Skip to content
Snippets Groups Projects
Commit 88d27781 authored by Thijs Kinkhorst's avatar Thijs Kinkhorst
Browse files

Unbreak frontpage_core & simplify

parent 92870d87
No related branches found
No related tags found
No related merge requests found
...@@ -158,7 +158,7 @@ msgstr "Delete my choices of IdP in the IdP discovery services" ...@@ -158,7 +158,7 @@ msgstr "Delete my choices of IdP in the IdP discovery services"
msgid "{core:frontpage:warnings_outdated}" msgid "{core:frontpage:warnings_outdated}"
msgstr "" msgstr ""
"You are running an outdated version of SimpleSAMLphp. Please update to <a" "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}" msgid "{core:frontpage:loggedin_as_admin}"
msgstr "You are logged in as administrator" msgstr "You are logged in as administrator"
...@@ -365,10 +365,10 @@ msgstr "PHP cURL extension missing. Cannot check for SimpleSAMLphp updates." ...@@ -365,10 +365,10 @@ msgstr "PHP cURL extension missing. Cannot check for SimpleSAMLphp updates."
msgid "" msgid ""
"You are running an outdated version of SimpleSAMLphp. Please update to <a" "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 "" msgstr ""
"You are running an outdated version of SimpleSAMLphp. Please update to <a" "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" msgid "Metadata not found"
msgstr "Metadata not found" msgstr "Metadata not found"
......
...@@ -132,7 +132,7 @@ msgstr "Borrar mis opciones de IdP en los servicios de descubrimiento de IdP" ...@@ -132,7 +132,7 @@ msgstr "Borrar mis opciones de IdP en los servicios de descubrimiento de IdP"
msgid "{core:frontpage:warnings_outdated}" msgid "{core:frontpage:warnings_outdated}"
msgstr "" msgstr ""
"Su instalaci&oacute;n de SimpleSAMLphp est&aacute; desactualizada. Por " "Su instalaci&oacute;n de SimpleSAMLphp est&aacute; desactualizada. Por "
"favor, actualice a la <a href=\"%LATEST_URL%\">&uacute;ltima " "favor, actualice a la <a href=\"https://simplesamlphp.org/download\">&uacute;ltima "
"versi&oacute;n</a> lo antes posible." "versi&oacute;n</a> lo antes posible."
msgid "{core:frontpage:loggedin_as_admin}" msgid "{core:frontpage:loggedin_as_admin}"
...@@ -341,10 +341,10 @@ msgstr "Usando los botones atrás y adelante de su navegador web." ...@@ -341,10 +341,10 @@ msgstr "Usando los botones atrás y adelante de su navegador web."
msgid "" msgid ""
"You are running an outdated version of SimpleSAMLphp. Please update to <a" "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 "" msgstr ""
"Su instalaci&oacute;n de SimpleSAMLphp est&aacute; desactualizada. Por " "Su instalaci&oacute;n de SimpleSAMLphp est&aacute; desactualizada. Por "
"favor, actualice a la <a href=\"%LATEST_URL%\">&uacute;ltima " "favor, actualice a la <a href=\"https://simplesamlphp.org/download\">&uacute;ltima "
"versi&oacute;n</a> lo antes posible." "versi&oacute;n</a> lo antes posible."
msgid "Metadata not found" msgid "Metadata not found"
......
...@@ -150,7 +150,7 @@ msgid "{core:frontpage:link_cleardiscochoices}" ...@@ -150,7 +150,7 @@ msgid "{core:frontpage:link_cleardiscochoices}"
msgstr "IdPディスカバリサービス内のIdPの選択を削除" msgstr "IdPディスカバリサービス内のIdPの選択を削除"
msgid "{core:frontpage:warnings_outdated}" 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}" msgid "{core:frontpage:loggedin_as_admin}"
msgstr "管理者でログインしています" msgstr "管理者でログインしています"
......
...@@ -134,7 +134,7 @@ msgstr "Verwijder IDP keuzes uit de IdP discovery service" ...@@ -134,7 +134,7 @@ msgstr "Verwijder IDP keuzes uit de IdP discovery service"
msgid "{core:frontpage:warnings_outdated}" msgid "{core:frontpage:warnings_outdated}"
msgstr "" msgstr ""
"Deze installatie van SimpleSAMLphp is verouderd. Het is aan te raden zo " "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>." "versie</a>."
msgid "{core:frontpage:warnings_curlmissing}" msgid "{core:frontpage:warnings_curlmissing}"
...@@ -349,10 +349,10 @@ msgstr "Gebruik van de 'Volgende'- en 'Terug'-knoppen in de web browser." ...@@ -349,10 +349,10 @@ msgstr "Gebruik van de 'Volgende'- en 'Terug'-knoppen in de web browser."
msgid "" msgid ""
"You are running an outdated version of SimpleSAMLphp. Please update to <a" "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 "" msgstr ""
"Deze installatie van SimpleSAMLphp is verouderd. Het is aan te raden zo " "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>." "versie</a>."
msgid "Metadata not found" msgid "Metadata not found"
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
{% if warnings is defined and warnings is not empty %} {% if warnings is defined and warnings is not empty %}
<h2>{{ '{core:frontpage:warnings}'|trans|escape('html') }}</h2> <h2>{{ '{core:frontpage:warnings}'|trans|escape('html') }}</h2>
{% for key, warning in warnings %} {% for key, warning in warnings %}
<div class="caution">{{ warning|raw }}</div> <div class="caution">{{ warning|trans|raw }}</div>
{% endfor %} {% endfor %}
{% endif %} {% endif %}
......
...@@ -85,10 +85,7 @@ if ($config->getBoolean('admin.checkforupdates', true) && $current !== 'master') ...@@ -85,10 +85,7 @@ if ($config->getBoolean('admin.checkforupdates', true) && $current !== 'master')
if ($latest && version_compare($current, ltrim($latest['tag_name'], 'v'), 'lt')) { if ($latest && version_compare($current, ltrim($latest['tag_name'], 'v'), 'lt')) {
$outdated = true; $outdated = true;
$warnings[] = [ $warnings[] = '{core:frontpage:warnings_outdated}';
'{core:frontpage:warnings_outdated}',
['%LATEST_URL%' => $latest['html_url']]
];
} }
} }
} }
...@@ -167,18 +164,11 @@ $funcmatrix[] = [ ...@@ -167,18 +164,11 @@ $funcmatrix[] = [
$t = new \SimpleSAML\XHTML\Template($config, 'core:frontpage_config.twig'); $t = new \SimpleSAML\XHTML\Template($config, 'core:frontpage_config.twig');
$translator = $t->getTranslator(); $translator = $t->getTranslator();
$t->data['pageid'] = 'frontpage_config'; $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['isadmin'] = $isadmin;
$t->data['loginurl'] = $loginurl; $t->data['loginurl'] = $loginurl;
$t->data['logouturl'] = $logouturl; $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; $t->data['warnings'] = $warnings;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment