diff --git a/lib/SimpleSAML/Locale/Translate.php b/lib/SimpleSAML/Locale/Translate.php
index 837b0e397950ad9106d55d122ac8d6fe4f331628..01de9e0bdd7dbccc70d8853bf8c952172f185a2e 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 {