From 4e7faa738bf0a5e85b5eef8be5ed7d8202705c02 Mon Sep 17 00:00:00 2001
From: Olav Morken <olav.morken@uninett.no>
Date: Wed, 2 Jul 2008 13:05:07 +0000
Subject: [PATCH] Template: remove language.base config option.
git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@757 44740490-163a-0410-bde0-09ae8108e29a
---
config-templates/config.php | 8 --------
lib/SimpleSAML/XHTML/Template.php | 2 +-
2 files changed, 1 insertion(+), 9 deletions(-)
diff --git a/config-templates/config.php b/config-templates/config.php
index e0f08ce74..8546299ec 100644
--- a/config-templates/config.php
+++ b/config-templates/config.php
@@ -154,14 +154,6 @@ $config = array (
'language.available' => array('en', 'no', 'nn', 'se', 'fi', 'da', 'sv', 'de', 'es', 'fr', 'nl', 'lb', 'hr', 'hu', 'sl'),
'language.default' => 'en',
- /*
- * Leave the language.base to 'en' (english). The language base MUST be set
- * to a language that contains 100% of the strings available. It is used as
- * a fallback language if not the selected, nor the default have a translation
- * for a specific string.
- */
- 'language.base' => 'en',
-
/*
* Which theme directory should be used? The base is fallback (leave it to default).
*/
diff --git a/lib/SimpleSAML/XHTML/Template.php b/lib/SimpleSAML/XHTML/Template.php
index e89f6849b..0aee736ac 100644
--- a/lib/SimpleSAML/XHTML/Template.php
+++ b/lib/SimpleSAML/XHTML/Template.php
@@ -160,7 +160,7 @@ class SimpleSAML_XHTML_Template {
* Returns the language base (from configuration)
*/
private function getBaseLanguage() {
- return $this->configuration->getValue('language.base', 'en');
+ return 'en';
}
/**
--
GitLab