summaryrefslogtreecommitdiffstats
path: root/lib/SimpleSAML
diff options
context:
space:
mode:
authorJaime Perez Crespo <jaime.perez@uninett.no>2016-02-05 15:00:18 +0100
committerJaime Perez Crespo <jaime.perez@uninett.no>2016-02-05 15:00:18 +0100
commit8ae26f747f36cf2075f538e9c6d80da5ddcdfe02 (patch)
treedf1cdd766a94d3ff7ab69032462ddd3007c25ecd /lib/SimpleSAML
parentf295ac5909944732a933a0c2c406cca7ad8a3951 (diff)
downloadsimplesamlphp-8ae26f747f36cf2075f538e9c6d80da5ddcdfe02.zip
simplesamlphp-8ae26f747f36cf2075f538e9c6d80da5ddcdfe02.tar.gz
simplesamlphp-8ae26f747f36cf2075f538e9c6d80da5ddcdfe02.tar.bz2
Minor fixes.
Diffstat (limited to 'lib/SimpleSAML')
-rw-r--r--lib/SimpleSAML/Locale/Translate.php17
1 files changed, 13 insertions, 4 deletions
diff --git a/lib/SimpleSAML/Locale/Translate.php b/lib/SimpleSAML/Locale/Translate.php
index 837b0e3..01de9e0 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 {