From c999d7ccbf9b6b9365a494797ca9f0c9296379a7 Mon Sep 17 00:00:00 2001
From: Olav Morken <olav.morken@uninett.no>
Date: Wed, 7 Apr 2010 05:52:13 +0000
Subject: [PATCH] frontpage: Make page title translateable.
git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@2248 44740490-163a-0410-bde0-09ae8108e29a
---
modules/core/dictionaries/frontpage.definition.json | 3 +++
modules/core/templates/frontpage_auth.tpl.php | 1 +
modules/core/templates/frontpage_config.tpl.php | 9 +++------
modules/core/templates/frontpage_federation.tpl.php | 9 +++------
modules/core/templates/frontpage_welcome.tpl.php | 1 +
modules/core/www/frontpage_auth.php | 2 --
modules/core/www/frontpage_config.php | 1 -
modules/core/www/frontpage_federation.php | 1 -
modules/core/www/frontpage_welcome.php | 1 -
9 files changed, 11 insertions(+), 17 deletions(-)
diff --git a/modules/core/dictionaries/frontpage.definition.json b/modules/core/dictionaries/frontpage.definition.json
index 23008fa8a..11d385e4c 100644
--- a/modules/core/dictionaries/frontpage.definition.json
+++ b/modules/core/dictionaries/frontpage.definition.json
@@ -1,4 +1,7 @@
{
+ "page_title": {
+ "en": "simpleSAMLphp installation page"
+ },
"intro": {
"en": "<strong>Congratulations<\/strong>, you have successfully installed simpleSAMLphp. This is the start page of your installation, where you will find links to test examples, diagnostics, metadata and even links to relevant documentation."
},
diff --git a/modules/core/templates/frontpage_auth.tpl.php b/modules/core/templates/frontpage_auth.tpl.php
index 7e58920b2..3b9aae74b 100644
--- a/modules/core/templates/frontpage_auth.tpl.php
+++ b/modules/core/templates/frontpage_auth.tpl.php
@@ -1,5 +1,6 @@
<?php
+$this->data['header'] = $this->t('{core:frontpage:page_title}');
$this->includeAtTemplateBase('includes/header.php');
?>
diff --git a/modules/core/templates/frontpage_config.tpl.php b/modules/core/templates/frontpage_config.tpl.php
index 5e0f63a92..9e7d1fdc6 100644
--- a/modules/core/templates/frontpage_config.tpl.php
+++ b/modules/core/templates/frontpage_config.tpl.php
@@ -1,10 +1,7 @@
-<?php
-
-
-
-$this->includeAtTemplateBase('includes/header.php');
-
+<?php
+$this->data['header'] = $this->t('{core:frontpage:page_title}');
+$this->includeAtTemplateBase('includes/header.php');
?>
diff --git a/modules/core/templates/frontpage_federation.tpl.php b/modules/core/templates/frontpage_federation.tpl.php
index e1b3ce4f8..55c827dd4 100644
--- a/modules/core/templates/frontpage_federation.tpl.php
+++ b/modules/core/templates/frontpage_federation.tpl.php
@@ -1,10 +1,7 @@
-<?php
-
-
-
-$this->includeAtTemplateBase('includes/header.php');
-
+<?php
+$this->data['header'] = $this->t('{core:frontpage:page_title}');
+$this->includeAtTemplateBase('includes/header.php');
?>
diff --git a/modules/core/templates/frontpage_welcome.tpl.php b/modules/core/templates/frontpage_welcome.tpl.php
index 4d36927ad..1809a676d 100644
--- a/modules/core/templates/frontpage_welcome.tpl.php
+++ b/modules/core/templates/frontpage_welcome.tpl.php
@@ -1,5 +1,6 @@
<?php
+$this->data['header'] = $this->t('{core:frontpage:page_title}');
$this->includeAtTemplateBase('includes/header.php');
?>
diff --git a/modules/core/www/frontpage_auth.php b/modules/core/www/frontpage_auth.php
index 506bf2e9a..6ba33d18e 100644
--- a/modules/core/www/frontpage_auth.php
+++ b/modules/core/www/frontpage_auth.php
@@ -59,8 +59,6 @@ $t = new SimpleSAML_XHTML_Template($config, 'core:frontpage_auth.tpl.php');
$t->data['pageid'] = 'frontpage_auth';
$t->data['isadmin'] = $isadmin;
$t->data['loginurl'] = $loginurl;
-$t->data['header'] = 'simpleSAMLphp installation page';
-
$t->data['links'] = $links;
$t->data['links_welcome'] = $links_welcome;
diff --git a/modules/core/www/frontpage_config.php b/modules/core/www/frontpage_config.php
index 453fba3d9..bbba51944 100644
--- a/modules/core/www/frontpage_config.php
+++ b/modules/core/www/frontpage_config.php
@@ -129,7 +129,6 @@ $t = new SimpleSAML_XHTML_Template($config, 'core:frontpage_config.tpl.php');
$t->data['pageid'] = 'frontpage_config';
$t->data['isadmin'] = $isadmin;
$t->data['loginurl'] = $loginurl;
-$t->data['header'] = 'simpleSAMLphp installation page';
$t->data['warnings'] = $warnings;
diff --git a/modules/core/www/frontpage_federation.php b/modules/core/www/frontpage_federation.php
index 51d779cfa..436a82082 100644
--- a/modules/core/www/frontpage_federation.php
+++ b/modules/core/www/frontpage_federation.php
@@ -139,7 +139,6 @@ $t = new SimpleSAML_XHTML_Template($config, 'core:frontpage_federation.tpl.php')
$t->data['pageid'] = 'frontpage_federation';
$t->data['isadmin'] = $isadmin;
$t->data['loginurl'] = $loginurl;
-$t->data['header'] = 'simpleSAMLphp installation page';
$t->data['links'] = $links;
diff --git a/modules/core/www/frontpage_welcome.php b/modules/core/www/frontpage_welcome.php
index bd905f882..73bc7cf11 100644
--- a/modules/core/www/frontpage_welcome.php
+++ b/modules/core/www/frontpage_welcome.php
@@ -51,7 +51,6 @@ $t = new SimpleSAML_XHTML_Template($config, 'core:frontpage_welcome.tpl.php');
$t->data['pageid'] = 'frontpage_welcome';
$t->data['isadmin'] = $isadmin;
$t->data['loginurl'] = $loginurl;
-$t->data['header'] = 'simpleSAMLphp installation page';
$t->data['links'] = $links;
$t->data['links_welcome'] = $links_welcome;
--
GitLab