translation: Always use the correct path to the Icinga library in the…

… translation helper refs #9615
Icinga · Jul 31, 2015 · 834017f · 834017f
1 parent cc0dfed
commit 834017f
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/modules/translation/library/Translation/Util/GettextTranslationHelper.php b/modules/translation/library/Translation/Util/GettextTranslationHelper.php
@@ -79,6 +79,13 @@ class GettextTranslationHelper
      */
     private $moduleDir;
 
+    /**
+     * Path to the Icinga library
+     *
+     * @var string
+     */
+    protected $libDir;
+
     /**
      * The path to the file catalog
      *
@@ -110,6 +117,7 @@ public function __construct(ApplicationBootstrap $bootstrap, $locale)
     {
         $this->moduleMgr = $bootstrap->getModuleManager()->loadEnabledModules();
         $this->appDir = $bootstrap->getApplicationDir();
+        $this->libDir = $bootstrap->getLibraryDir('Icinga');
         $this->locale = $locale;
     }
 
@@ -396,7 +404,7 @@ private function createFileCatalog()
                 $this->getSourceFileNames($this->moduleDir, $catalog);
             } else {
                 $this->getSourceFileNames($this->appDir, $catalog);
-                $this->getSourceFileNames(realpath($this->appDir . '/../library/Icinga'), $catalog);
+                $this->getSourceFileNames($this->libDir, $catalog);
             }
         } catch (Exception $error) {
             throw $error;