From 8ae26f747f36cf2075f538e9c6d80da5ddcdfe02 Mon Sep 17 00:00:00 2001
From: Jaime Perez Crespo <jaime.perez@uninett.no>
Date: Fri, 5 Feb 2016 15:00:18 +0100
Subject: [PATCH] Minor fixes.
---
lib/SimpleSAML/Locale/Translate.php | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/lib/SimpleSAML/Locale/Translate.php b/lib/SimpleSAML/Locale/Translate.php
index 837b0e397..01de9e0bd 100644
--- a/lib/SimpleSAML/Locale/Translate.php
+++ b/lib/SimpleSAML/Locale/Translate.php
@@ -13,22 +13,32 @@ namespace SimpleSAML\Locale;
class Translate
{
- private $configuration = null;
+ /**
+ * The configuration to be used for this translator.
+ *
+ * @var \SimpleSAML_Configuration
+ */
+ private $configuration;
private $langtext = array();
-
/**
* Associative array of dictionaries.
*/
private $dictionaries = array();
-
/**
* The default dictionary.
*/
private $defaultDictionary = null;
+ /**
+ * The language object we'll use internally.
+ *
+ * @var \SimpleSAML\Locale\Language
+ */
+ private $language;
+
/**
* Constructor
@@ -327,7 +337,6 @@ class Translate
*/
public function includeLanguageFile($file, $otherConfig = null)
{
- $filebase = null;
if (!empty($otherConfig)) {
$filebase = $otherConfig->getPathValue('dictionarydir', 'dictionaries/');
} else {
--
GitLab