Do not use the new configpage hook yet.

We'll use it in the new admin interface. For now, we just fix the old hook so that translations work for strings stored in dictionaries in the hooking module.

modules/consentAdmin/hooks/hook_configpage.php

@@ -7,13 +7,9 @@
 
 function consentAdmin_hook_configpage(\SimpleSAML\XHTML\Template &$template)
 {
-    $template->data['links_config']['consentAdmin'] = [
+    $template->data['links']['consentAdmin'] = [
         'href' => SimpleSAML\Module::getModuleURL('consentAdmin/consentAdmin.php'),
-        'text' => '{consentAdmin:consentadmin:link_consentAdmin}',
+        'text' => \SimpleSAML\Locale\Translate::noop('Consent administration'),
     ];
-
-    $config = \SimpleSAML\Configuration::getInstance();
-    if ($config->getBoolean('usenewui', false)) {
-        $template->getLocalization()->addModuleDomain('consentAdmin');
-    }
+    $template->getLocalization()->addModuleDomain('consentAdmin');
 }

modules/consentAdmin/hooks/hook_frontpage.php

+<?php
+/**
+ * Hook to add the consentAdmin module to the frontpage.
+ *
+ * @param array &$links  The links on the frontpage, split into sections.
+ */
+
+function consentAdmin_hook_frontpage(&$links)
+{
+    assert(is_array($links));
+    assert(array_key_exists('links', $links));
+
+    $links['config'][] = [
+        'href' => SimpleSAML\Module::getModuleURL('consentAdmin/consentAdmin.php'),
+        'text' => '{consentAdmin:consentadmin:link_consentAdmin}',
+    ];
+}
+

modules/consentAdmin/locales/en/LC_MESSAGES/consentAdmin.po

@@ -168,3 +168,6 @@ msgstr "show/hide attributes"
 msgid "Organisation"
 msgstr "Organisation"
 
+msgid "Consent administration"
+msgstr "Consent administration"
+

modules/consentAdmin/locales/es/LC_MESSAGES/consentAdmin.po

@@ -162,3 +162,5 @@ msgstr "Mostrar/ocultar atributos"
 msgid "Organisation"
 msgstr "Organización"
 
+msgid "Consent administration"
+msgstr "Administración del consentimiento"

modules/consentAdmin/locales/nb/LC_MESSAGES/consentAdmin.po

@@ -158,3 +158,5 @@ msgstr "vis/skjul persondata"
 msgid "Organisation"
 msgstr "Organisasjon"
 
+msgid "Consent administration"
+msgstr "Samtykke administrasjon"

modules/consentAdmin/locales/nn/LC_MESSAGES/consentAdmin.po

@@ -158,3 +158,5 @@ msgstr "vis/skjul personinformasjon"
 msgid "Organisation"
 msgstr "Organisasjon"
 
+msgid "Consent administration"
+msgstr "Samtykke administrasjon"

modules/core/www/frontpage_config.php

@@ -199,6 +199,4 @@ $t->data['requiredmap'] = [
 $t->data['version'] = $config->getVersion();
 $t->data['directory'] = dirname(dirname(dirname(dirname(__FILE__))));
 
-\SimpleSAML\Module::callHooks('configpage', $t);
-
 $t->show();

modules/cron/hooks/hook_configpage.php

@@ -7,13 +7,9 @@
 
 function cron_hook_configpage(\SimpleSAML\XHTML\Template &$template)
 {
-    $template->data['links_config']['cron'] = [
+    $template->data['links']['cron'] = [
         'href' => SimpleSAML\Module::getModuleURL('cron/croninfo.php'),
-        'text' => '{cron:cron:link_cron}',
+        'text' => \SimpleSAML\Locale\Translate::noop('Cron module information page'),
     ];
-
-    $config = \SimpleSAML\Configuration::getInstance();
-    if ($config->getBoolean('usenewui', false)) {
-        $template->getLocalization()->addModuleDomain('cron');
-    }
+    $template->getLocalization()->addModuleDomain('cron');
 }

modules/cron/hooks/hook_frontpage.php

+<?php
+/**
+ * Hook to add the modinfo module to the frontpage.
+ *
+ * @param array &$links  The links on the frontpage, split into sections.
+ */
+
+function cron_hook_frontpage(&$links)
+{
+    assert(is_array($links));
+    assert(array_key_exists('links', $links));
+
+    $links['config'][] = [
+        'href' => SimpleSAML\Module::getModuleURL('cron/croninfo.php'),
+        'text' => '{cron:cron:link_cron}',
+    ];
+}
+

modules/cron/locales/en/LC_MESSAGES/cron.po

@@ -65,3 +65,6 @@ msgstr "Cron result page"
 
 msgid "{cron:cron:link_cron}"
 msgstr "Cron module information page"
+
+msgid "Cron module information page"
+msgstr "Cron module information page"

modules/cron/locales/es/LC_MESSAGES/cron.po

@@ -65,3 +65,6 @@ msgstr "Página de resultado del cron"
 
 msgid "{cron:cron:link_cron}"
 msgstr "Informe de cron"
+
+msgid "Cron module information page"
+msgstr "Informe de cron"

modules/cron/locales/nb/LC_MESSAGES/cron.po

@@ -65,3 +65,6 @@ msgstr "Cron resultatside"
 
 msgid "{cron:cron:link_cron}"
 msgstr "Informasjon om cron"
+
+msgid "Cron module information page"
+msgstr "Informasjon om cron"

modules/cron/locales/nn/LC_MESSAGES/cron.po

@@ -65,3 +65,6 @@ msgstr "Cron resultatside"
 
 msgid "{cron:cron:link_cron}"
 msgstr "Informasjon om cron"
+
+msgid "Cron module information page"
+msgstr "Informasjon om cron"

modules/memcacheMonitor/hooks/hook_configpage.php

@@ -7,13 +7,9 @@
 
 function memcacheMonitor_hook_configpage(\SimpleSAML\XHTML\Template &$template)
 {
-    $template->data['links_config']['memcacheMonitor'] = [
+    $template->data['links']['memcacheMonitor'] = [
         'href' => SimpleSAML\Module::getModuleURL('memcacheMonitor/memcachestat.php'),
-        'text' => '{memcacheMonitor:memcachestat:link_memcacheMonitor}',
+        'text' => \SimpleSAML\Locale\Translate::noop('Memcache statistics'),
     ];
-
-    $config = \SimpleSAML\Configuration::getInstance();
-    if ($config->getBoolean('usenewui', false)) {
-        $template->getLocalization()->addModuleDomain('memcacheMonitor');
-    }
+    $template->getLocalization()->addModuleDomain('memcacheMonitor');
 }

modules/memcacheMonitor/hooks/hook_frontpage.php

+<?php
+/**
+ * Hook to add the simple consenet admin module to the frontpage.
+ *
+ * @param array &$links  The links on the frontpage, split into sections.
+ */
+
+function memcacheMonitor_hook_frontpage(&$links)
+{
+    assert(is_array($links));
+    assert(array_key_exists('links', $links));
+
+    $links['config'][] = [
+        'href' => SimpleSAML\Module::getModuleURL('memcacheMonitor/memcachestat.php'),
+        'text' => '{memcacheMonitor:memcachestat:link_memcacheMonitor}',
+    ];
+}
+

modules/memcacheMonitor/locales/en/LC_MESSAGES/memcacheMonitor.po

@@ -266,3 +266,6 @@ msgstr "Total connections"
 
 msgid "{memcacheMonitor:memcachestat:link_memcacheMonitor}"
 msgstr "Memcache statistics"
+
+msgid "Memcache statistics"
+msgstr "Memcache statistics"

modules/memcacheMonitor/locales/es/LC_MESSAGES/memcacheMonitor.po

@@ -131,3 +131,6 @@ msgstr "Total de conexiones"
 
 msgid "{memcacheMonitor:memcachestat:link_memcacheMonitor}"
 msgstr "Estadísticas de memcache"
+
+msgid "Memcache statistics"
+msgstr "Estadísticas de memcache"

modules/memcacheMonitor/locales/nb/LC_MESSAGES/memcacheMonitor.po

@@ -131,3 +131,6 @@ msgstr "Totalt antall forbindelser"
 
 msgid "{memcacheMonitor:memcachestat:link_memcacheMonitor}"
 msgstr "Memcache statistikker"
+
+msgid "Memcache statistics"
+msgstr "Memcache statistikker"

modules/memcacheMonitor/locales/nn/LC_MESSAGES/memcacheMonitor.po

@@ -131,3 +131,6 @@ msgstr "Opne tilkoplingar (totalt)"
 
 msgid "{memcacheMonitor:memcachestat:link_memcacheMonitor}"
 msgstr "Memcache statistikkar"
+
+msgid "Memcache statistics"
+msgstr "Memcache statistikkar"

modules/sanitycheck/hooks/hook_configpage.php

@@ -6,13 +6,9 @@
  */
 function sanitycheck_hook_configpage(\SimpleSAML\XHTML\Template &$template)
 {
-    $template->data['links_config']['sanitycheck'] = [
+    $template->data['links']['sanitycheck'] = [
         'href' => SimpleSAML\Module::getModuleURL('sanitycheck/index.php'),
-        'text' => '{sanitycheck:strings:link_sanitycheck}',
+        'text' => \SimpleSAML\Locale\Translate::noop('Sanity check of your SimpleSAMLphp setup'),
     ];
-
-    $config = \SimpleSAML\Configuration::getInstance();
-    if ($config->getBoolean('usenewui', false)) {
-        $template->getLocalization()->addModuleDomain('sanitycheck');
-    }
+    $template->getLocalization()->addModuleDomain('sanitycheck');
 }