Remove concat: required-flag

For simplesamlphp#455
tvdijen · Aug 7, 2017 · bc60d80 · bc60d80
1 parent 1a6a594
commit bc60d80
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/modules/core/templates/frontpage_config.tpl.php b/modules/core/templates/frontpage_config.tpl.php
@@ -87,8 +87,8 @@
 
 
 	foreach ($this->data['funcmatrix'] AS $func) {
-		echo '<tr class="' . ($func['enabled'] ? 'enabled' : 'disabled') . '"><td>' . ($func['enabled'] ? $icon_enabled : $icon_disabled) . '</td>
-		<td>' . $this->t('{core:frontpage:' . $func['required']. '}') . '</td><td>' . $func['descr'] . '</td></tr>';
+		echo '<tr class="' . ($func['enabled'] ? 'enabled' : 'disabled') . '"><td>' . ($func['enabled'] ? $icon_enabled : $icon_disabled) . '</td>';
+		echo '<td>' . $this->t($t->data['requiredmap'][$func['required']]) . '</td><td>' . $func['descr'] . '</td></tr>';
 	}
 	echo('</table></div>');
 }

diff --git a/modules/core/www/frontpage_config.php b/modules/core/www/frontpage_config.php
@@ -177,6 +177,7 @@
 
 $t->data['enablematrix'] = $enablematrix;
 $t->data['funcmatrix'] = $funcmatrix;
+$t->data['requiredmap'] = array('recommended' => $t->noop('{core:frontpage:recommended}');
 $t->data['version'] = $config->getVersion();
 $t->data['directory'] = dirname(dirname(dirname(dirname(__FILE__))));