Ensure the directory path provided by the classes extending Horde_Translation always...

diff --git a/framework/Alarm/lib/Horde/Alarm/Translation.php b/framework/Alarm/lib/Horde/Alarm/Translation.php
index 034ce63..b432215 100644 (file)
--- a/framework/Alarm/lib/Horde/Alarm/Translation.php
+++ b/framework/Alarm/lib/Horde/Alarm/Translation.php
@@ -27,7 +27,7 @@ class Horde_Alarm_Translation extends Horde_Translation
     static public function t($message)
     {
         self::$_domain = 'Horde_Alarm';
-        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? '../../../locale' : '@data_dir@/Alarm/locale';
+        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? dirname(__FILE__) . '/../../../locale' : '@data_dir@/Alarm/locale';
         return parent::t($message);
     }
 
@@ -44,7 +44,7 @@ class Horde_Alarm_Translation extends Horde_Translation
     static public function ngettext($singular, $plural, $number)
     {
         self::$_domain = 'Horde_Alarm';
-        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? '../../../locale' : '@data_dir@/Alarm/locale';
+        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? dirname(__FILE__) . '/../../../locale' : '@data_dir@/Alarm/locale';
         return parent::ngettext($singular, $plural, $number);
     }
 }

diff --git a/framework/Argv/lib/Horde/Argv/Translation.php b/framework/Argv/lib/Horde/Argv/Translation.php
index 51387aa..780f605 100644 (file)
--- a/framework/Argv/lib/Horde/Argv/Translation.php
+++ b/framework/Argv/lib/Horde/Argv/Translation.php
@@ -27,7 +27,7 @@ class Horde_Argv_Translation extends Horde_Translation
     static public function t($message)
     {
         self::$_domain = 'Horde_Argv';
-        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? '../../../locale' : '@data_dir@/Argv/locale';
+        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? dirname(__FILE__) . '/../../../locale' : '@data_dir@/Argv/locale';
         return parent::t($message);
     }
 
@@ -44,7 +44,7 @@ class Horde_Argv_Translation extends Horde_Translation
     static public function ngettext($singular, $plural, $number)
     {
         self::$_domain = 'Horde_Argv';
-        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? '../../../locale' : '@data_dir@/Argv/locale';
+        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? dirname(__FILE__) . '/../../../locale' : '@data_dir@/Argv/locale';
         return parent::ngettext($singular, $plural, $number);
     }
 }

diff --git a/framework/Block/lib/Horde/Block/Translation.php b/framework/Block/lib/Horde/Block/Translation.php
index 7affcf2..1ad00c9 100644 (file)
--- a/framework/Block/lib/Horde/Block/Translation.php
+++ b/framework/Block/lib/Horde/Block/Translation.php
@@ -27,7 +27,7 @@ class Horde_Block_Translation extends Horde_Translation
     static public function t($message)
     {
         self::$_domain = 'Horde_Block';
-        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? '../../../locale' : '@data_dir@/Block/locale';
+        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? dirname(__FILE__) . '/../../../locale' : '@data_dir@/Block/locale';
         return parent::t($message);
     }
 
@@ -44,7 +44,7 @@ class Horde_Block_Translation extends Horde_Translation
     static public function ngettext($singular, $plural, $number)
     {
         self::$_domain = 'Horde_Block';
-        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? '../../../locale' : '@data_dir@/Block/locale';
+        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? dirname(__FILE__) . '/../../../locale' : '@data_dir@/Block/locale';
         return parent::ngettext($singular, $plural, $number);
     }
 }

diff --git a/framework/Cli/lib/Horde/Cli/Translation.php b/framework/Cli/lib/Horde/Cli/Translation.php
index 090e4de..aa682e8 100644 (file)
--- a/framework/Cli/lib/Horde/Cli/Translation.php
+++ b/framework/Cli/lib/Horde/Cli/Translation.php
@@ -27,7 +27,7 @@ class Horde_Cli_Translation extends Horde_Translation
     static public function t($message)
     {
         self::$_domain = 'Horde_Cli';
-        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? '../../../locale' : '@data_dir@/Cli/locale';
+        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? dirname(__FILE__) . '/../../../locale' : '@data_dir@/Cli/locale';
         return parent::t($message);
     }
 
@@ -44,7 +44,7 @@ class Horde_Cli_Translation extends Horde_Translation
     static public function ngettext($singular, $plural, $number)
     {
         self::$_domain = 'Horde_Cli';
-        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? '../../../locale' : '@data_dir@/Cli/locale';
+        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? dirname(__FILE__) . '/../../../locale' : '@data_dir@/Cli/locale';
         return parent::ngettext($singular, $plural, $number);
     }
 }

diff --git a/framework/Compress/lib/Horde/Compress/Translation.php b/framework/Compress/lib/Horde/Compress/Translation.php
index 6d7b6d9..94034ba 100644 (file)
--- a/framework/Compress/lib/Horde/Compress/Translation.php
+++ b/framework/Compress/lib/Horde/Compress/Translation.php
@@ -27,7 +27,7 @@ class Horde_Compress_Translation extends Horde_Translation
     static public function t($message)
     {
         self::$_domain = 'Horde_Compress';
-        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? '../../../locale' : '@data_dir@/Compress/locale';
+        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? dirname(__FILE__) . '/../../../locale' : '@data_dir@/Compress/locale';
         return parent::t($message);
     }
 
@@ -44,7 +44,7 @@ class Horde_Compress_Translation extends Horde_Translation
     static public function ngettext($singular, $plural, $number)
     {
         self::$_domain = 'Horde_Compress';
-        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? '../../../locale' : '@data_dir@/Compress/locale';
+        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? dirname(__FILE__) . '/../../../locale' : '@data_dir@/Compress/locale';
         return parent::ngettext($singular, $plural, $number);
     }
 }

diff --git a/framework/Core/lib/Horde/Core/Translation.php b/framework/Core/lib/Horde/Core/Translation.php
index 73f32b4..e6a8f47 100644 (file)
--- a/framework/Core/lib/Horde/Core/Translation.php
+++ b/framework/Core/lib/Horde/Core/Translation.php
@@ -27,7 +27,7 @@ class Horde_Core_Translation extends Horde_Translation
     static public function t($message)
     {
         self::$_domain = 'Horde_Core';
-        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? '../../../locale' : '@data_dir@/Core/locale';
+        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? dirname(__FILE__) . '/../../../locale' : '@data_dir@/Core/locale';
         return parent::t($message);
     }
 
@@ -44,7 +44,7 @@ class Horde_Core_Translation extends Horde_Translation
     static public function ngettext($singular, $plural, $number)
     {
         self::$_domain = 'Horde_Core';
-        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? '../../../locale' : '@data_dir@/Core/locale';
+        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? dirname(__FILE__) . '/../../../locale' : '@data_dir@/Core/locale';
         return parent::ngettext($singular, $plural, $number);
     }
 }

diff --git a/framework/Crypt/lib/Horde/Crypt/Translation.php b/framework/Crypt/lib/Horde/Crypt/Translation.php
index 4718ed7..0f92e66 100644 (file)
--- a/framework/Crypt/lib/Horde/Crypt/Translation.php
+++ b/framework/Crypt/lib/Horde/Crypt/Translation.php
@@ -27,7 +27,7 @@ class Horde_Crypt_Translation extends Horde_Translation
     static public function t($message)
     {
         self::$_domain = 'Horde_Crypt';
-        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? '../../../locale' : '@data_dir@/Crypt/locale';
+        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? dirname(__FILE__) . '/../../../locale' : '@data_dir@/Crypt/locale';
         return parent::t($message);
     }
 
@@ -44,7 +44,7 @@ class Horde_Crypt_Translation extends Horde_Translation
     static public function ngettext($singular, $plural, $number)
     {
         self::$_domain = 'Horde_Crypt';
-        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? '../../../locale' : '@data_dir@/Crypt/locale';
+        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? dirname(__FILE__) . '/../../../locale' : '@data_dir@/Crypt/locale';
         return parent::ngettext($singular, $plural, $number);
     }
 }

diff --git a/framework/Data/lib/Horde/Data/Translation.php b/framework/Data/lib/Horde/Data/Translation.php
index 1d90a4d..c4e6ee5 100644 (file)
--- a/framework/Data/lib/Horde/Data/Translation.php
+++ b/framework/Data/lib/Horde/Data/Translation.php
@@ -27,7 +27,7 @@ class Horde_Data_Translation extends Horde_Translation
     static public function t($message)
     {
         self::$_domain = 'Horde_Data';
-        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? '../../../locale' : '@data_dir@/Data/locale';
+        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? dirname(__FILE__) . '/../../../locale' : '@data_dir@/Data/locale';
         return parent::t($message);
     }
 
@@ -44,7 +44,7 @@ class Horde_Data_Translation extends Horde_Translation
     static public function ngettext($singular, $plural, $number)
     {
         self::$_domain = 'Horde_Data';
-        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? '../../../locale' : '@data_dir@/Data/locale';
+        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? dirname(__FILE__) . '/../../../locale' : '@data_dir@/Data/locale';
         return parent::ngettext($singular, $plural, $number);
     }
 }

diff --git a/framework/Date/lib/Horde/Date/Translation.php b/framework/Date/lib/Horde/Date/Translation.php
index 5bbf66b..50f3b84 100644 (file)
--- a/framework/Date/lib/Horde/Date/Translation.php
+++ b/framework/Date/lib/Horde/Date/Translation.php
@@ -27,7 +27,7 @@ class Horde_Date_Translation extends Horde_Translation
     static public function t($message)
     {
         self::$_domain = 'Horde_Date';
-        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? '../../../locale' : '@data_dir@/Date/locale';
+        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? dirname(__FILE__) . '/../../../locale' : '@data_dir@/Date/locale';
         return parent::t($message);
     }
 
@@ -44,7 +44,7 @@ class Horde_Date_Translation extends Horde_Translation
     static public function ngettext($singular, $plural, $number)
     {
         self::$_domain = 'Horde_Date';
-        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? '../../../locale' : '@data_dir@/Date/locale';
+        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? dirname(__FILE__) . '/../../../locale' : '@data_dir@/Date/locale';
         return parent::ngettext($singular, $plural, $number);
     }
 }

diff --git a/framework/Exception/lib/Horde/Exception/Translation.php b/framework/Exception/lib/Horde/Exception/Translation.php
index a5e58f7..8e94306 100644 (file)
--- a/framework/Exception/lib/Horde/Exception/Translation.php
+++ b/framework/Exception/lib/Horde/Exception/Translation.php
@@ -27,7 +27,7 @@ class Horde_Exception_Translation extends Horde_Translation
     static public function t($message)
     {
         self::$_domain = 'Horde_Exception';
-        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? '../../../locale' : '@data_dir@/Exception/locale';
+        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? dirname(__FILE__) . '/../../../locale' : '@data_dir@/Exception/locale';
         return parent::t($message);
     }
 
@@ -44,7 +44,7 @@ class Horde_Exception_Translation extends Horde_Translation
     static public function ngettext($singular, $plural, $number)
     {
         self::$_domain = 'Horde_Exception';
-        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? '../../../locale' : '@data_dir@/Exception/locale';
+        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? dirname(__FILE__) . '/../../../locale' : '@data_dir@/Exception/locale';
         return parent::ngettext($singular, $plural, $number);
     }
 }

diff --git a/framework/Form/Form/Translation.php b/framework/Form/Form/Translation.php
index 47dbe86..3b5557f 100644 (file)
--- a/framework/Form/Form/Translation.php
+++ b/framework/Form/Form/Translation.php
@@ -27,7 +27,7 @@ class Horde_Form_Translation extends Horde_Translation
     static public function t($message)
     {
         self::$_domain = 'Horde_Form';
-        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? '../locale' : '@data_dir@/Form/locale';
+        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? dirname(__FILE__) . '/../locale' : '@data_dir@/Form/locale';
         return parent::t($message);
     }
 
@@ -44,7 +44,7 @@ class Horde_Form_Translation extends Horde_Translation
     static public function ngettext($singular, $plural, $number)
     {
         self::$_domain = 'Horde_Form';
-        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? '../locale' : '@data_dir@/Form/locale';
+        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? dirname(__FILE__) . '/../locale' : '@data_dir@/Form/locale';
         return parent::ngettext($singular, $plural, $number);
     }
 }

diff --git a/framework/Icalendar/lib/Horde/Icalendar/Translation.php b/framework/Icalendar/lib/Horde/Icalendar/Translation.php
index e9e2078..8cc95f3 100644 (file)
--- a/framework/Icalendar/lib/Horde/Icalendar/Translation.php
+++ b/framework/Icalendar/lib/Horde/Icalendar/Translation.php
@@ -27,7 +27,7 @@ class Horde_Icalendar_Translation extends Horde_Translation
     static public function t($message)
     {
         self::$_domain = 'Horde_Icalendar';
-        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? '../../../locale' : '@data_dir@/Icalendar/locale';
+        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? dirname(__FILE__) . '/../../../locale' : '@data_dir@/Icalendar/locale';
         return parent::t($message);
     }
 
@@ -44,7 +44,7 @@ class Horde_Icalendar_Translation extends Horde_Translation
     static public function ngettext($singular, $plural, $number)
     {
         self::$_domain = 'Horde_Icalendar';
-        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? '../../../locale' : '@data_dir@/Icalendar/locale';
+        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? dirname(__FILE__) . '/../../../locale' : '@data_dir@/Icalendar/locale';
         return parent::ngettext($singular, $plural, $number);
     }
 }

diff --git a/framework/Image/lib/Horde/Image/Translation.php b/framework/Image/lib/Horde/Image/Translation.php
index db5ffdd..d5eb8b0 100644 (file)
--- a/framework/Image/lib/Horde/Image/Translation.php
+++ b/framework/Image/lib/Horde/Image/Translation.php
@@ -27,7 +27,7 @@ class Horde_Image_Translation extends Horde_Translation
     static public function t($message)
     {
         self::$_domain = 'Horde_Image';
-        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? '../../../locale' : '@data_dir@/Image/locale';
+        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? dirname(__FILE__) . '/../../../locale' : '@data_dir@/Image/locale';
         return parent::t($message);
     }
 
@@ -44,7 +44,7 @@ class Horde_Image_Translation extends Horde_Translation
     static public function ngettext($singular, $plural, $number)
     {
         self::$_domain = 'Horde_Image';
-        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? '../../../locale' : '@data_dir@/Image/locale';
+        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? dirname(__FILE__) . '/../../../locale' : '@data_dir@/Image/locale';
         return parent::ngettext($singular, $plural, $number);
     }
 }

diff --git a/framework/Itip/lib/Horde/Itip/Translation.php b/framework/Itip/lib/Horde/Itip/Translation.php
index 716df81..7ba373c 100644 (file)
--- a/framework/Itip/lib/Horde/Itip/Translation.php
+++ b/framework/Itip/lib/Horde/Itip/Translation.php
@@ -27,7 +27,7 @@ class Horde_Itip_Translation extends Horde_Translation
     static public function t($message)
     {
         self::$_domain = 'Horde_Itip';
-        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? '../../../locale' : '@data_dir@/Itip/locale';
+        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? dirname(__FILE__) . '/../../../locale' : '@data_dir@/Itip/locale';
         return parent::t($message);
     }
 
@@ -44,7 +44,7 @@ class Horde_Itip_Translation extends Horde_Translation
     static public function ngettext($singular, $plural, $number)
     {
         self::$_domain = 'Horde_Itip';
-        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? '../../../locale' : '@data_dir@/Itip/locale';
+        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? dirname(__FILE__) . '/../../../locale' : '@data_dir@/Itip/locale';
         return parent::ngettext($singular, $plural, $number);
     }
 }

diff --git a/framework/Kolab/Kolab/Translation.php b/framework/Kolab/Kolab/Translation.php
index f4bbc13..810ef44 100644 (file)
--- a/framework/Kolab/Kolab/Translation.php
+++ b/framework/Kolab/Kolab/Translation.php
@@ -27,7 +27,7 @@ class Horde_Kolab_Translation extends Horde_Translation
     static public function t($message)
     {
         self::$_domain = 'Horde_Kolab';
-        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? '../locale' : '@data_dir@/Kolab/locale';
+        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? dirname(__FILE__) . '/../locale' : '@data_dir@/Kolab/locale';
         return parent::t($message);
     }
 
@@ -44,7 +44,7 @@ class Horde_Kolab_Translation extends Horde_Translation
     static public function ngettext($singular, $plural, $number)
     {
         self::$_domain = 'Horde_Kolab';
-        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? '../locale' : '@data_dir@/Kolab/locale';
+        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? dirname(__FILE__) . '/../locale' : '@data_dir@/Kolab/locale';
         return parent::ngettext($singular, $plural, $number);
     }
 }

diff --git a/framework/Kolab_Format/lib/Horde/Kolab/Format/Translation.php b/framework/Kolab_Format/lib/Horde/Kolab/Format/Translation.php
index 19b32cb..1a22126 100644 (file)
--- a/framework/Kolab_Format/lib/Horde/Kolab/Format/Translation.php
+++ b/framework/Kolab_Format/lib/Horde/Kolab/Format/Translation.php
@@ -27,7 +27,7 @@ class Horde_Kolab_Format_Translation extends Horde_Translation
     static public function t($message)
     {
         self::$_domain = 'Horde_Kolab_Format';
-        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? '../../../../locale' : '@data_dir@/Kolab_Format/locale';
+        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? dirname(__FILE__) . '/../../../../locale' : '@data_dir@/Kolab_Format/locale';
         return parent::t($message);
     }
 
@@ -44,7 +44,7 @@ class Horde_Kolab_Format_Translation extends Horde_Translation
     static public function ngettext($singular, $plural, $number)
     {
         self::$_domain = 'Horde_Kolab_Format';
-        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? '../../../../locale' : '@data_dir@/Kolab_Format/locale';
+        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? dirname(__FILE__) . '/../../../../locale' : '@data_dir@/Kolab_Format/locale';
         return parent::ngettext($singular, $plural, $number);
     }
 }

diff --git a/framework/Kolab_FreeBusy/lib/Horde/Kolab/FreeBusy/Translation.php b/framework/Kolab_FreeBusy/lib/Horde/Kolab/FreeBusy/Translation.php
index 6d0acfa..4c00368 100644 (file)
--- a/framework/Kolab_FreeBusy/lib/Horde/Kolab/FreeBusy/Translation.php
+++ b/framework/Kolab_FreeBusy/lib/Horde/Kolab/FreeBusy/Translation.php
@@ -27,7 +27,7 @@ class Horde_Kolab_FreeBusy_Translation extends Horde_Translation
     static public function t($message)
     {
         self::$_domain = 'Horde_Kolab_FreeBusy';
-        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? '../../../../locale' : '@data_dir@/Kolab_FreeBusy/locale';
+        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? dirname(__FILE__) . '/../../../../locale' : '@data_dir@/Kolab_FreeBusy/locale';
         return parent::t($message);
     }
 
@@ -44,7 +44,7 @@ class Horde_Kolab_FreeBusy_Translation extends Horde_Translation
     static public function ngettext($singular, $plural, $number)
     {
         self::$_domain = 'Horde_Kolab_FreeBusy';
-        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? '../../../../locale' : '@data_dir@/Kolab_FreeBusy/locale';
+        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? dirname(__FILE__) . '/../../../../locale' : '@data_dir@/Kolab_FreeBusy/locale';
         return parent::ngettext($singular, $plural, $number);
     }
 }

diff --git a/framework/Kolab_Resource/lib/Horde/Kolab/Resource/Translation.php b/framework/Kolab_Resource/lib/Horde/Kolab/Resource/Translation.php
index d9d7187..012d5d9 100644 (file)
--- a/framework/Kolab_Resource/lib/Horde/Kolab/Resource/Translation.php
+++ b/framework/Kolab_Resource/lib/Horde/Kolab/Resource/Translation.php
@@ -27,7 +27,7 @@ class Horde_Kolab_Resource_Translation extends Horde_Translation
     static public function t($message)
     {
         self::$_domain = 'Horde_Kolab_Resource';
-        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? '../../../../locale' : '@data_dir@/Kolab_Resource/locale';
+        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? dirname(__FILE__) . '/../../../../locale' : '@data_dir@/Kolab_Resource/locale';
         return parent::t($message);
     }
 
@@ -44,7 +44,7 @@ class Horde_Kolab_Resource_Translation extends Horde_Translation
     static public function ngettext($singular, $plural, $number)
     {
         self::$_domain = 'Horde_Kolab_Resource';
-        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? '../../../../locale' : '@data_dir@/Kolab_Resource/locale';
+        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? dirname(__FILE__) . '/../../../../locale' : '@data_dir@/Kolab_Resource/locale';
         return parent::ngettext($singular, $plural, $number);
     }
 }

diff --git a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Translation.php b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Translation.php
index 130366c..57d2a54 100644 (file)
--- a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Translation.php
+++ b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Translation.php
@@ -27,7 +27,7 @@ class Horde_Kolab_Storage_Translation extends Horde_Translation
     static public function t($message)
     {
         self::$_domain = 'Horde_Kolab_Storage';
-        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? '../../../../locale' : '@data_dir@/Kolab_Storage/locale';
+        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? dirname(__FILE__) . '/../../../../locale' : '@data_dir@/Kolab_Storage/locale';
         return parent::t($message);
     }
 
@@ -44,7 +44,7 @@ class Horde_Kolab_Storage_Translation extends Horde_Translation
     static public function ngettext($singular, $plural, $number)
     {
         self::$_domain = 'Horde_Kolab_Storage';
-        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? '../../../../locale' : '@data_dir@/Kolab_Storage/locale';
+        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? dirname(__FILE__) . '/../../../../locale' : '@data_dir@/Kolab_Storage/locale';
         return parent::ngettext($singular, $plural, $number);
     }
 }

diff --git a/framework/LoginTasks/lib/Horde/LoginTasks/Translation.php b/framework/LoginTasks/lib/Horde/LoginTasks/Translation.php
index 6788567..b23f1e5 100644 (file)
--- a/framework/LoginTasks/lib/Horde/LoginTasks/Translation.php
+++ b/framework/LoginTasks/lib/Horde/LoginTasks/Translation.php
@@ -27,7 +27,7 @@ class Horde_LoginTasks_Translation extends Horde_Translation
     static public function t($message)
     {
         self::$_domain = 'Horde_LoginTasks';
-        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? '../../../locale' : '@data_dir@/LoginTasks/locale';
+        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? dirname(__FILE__) . '/../../../locale' : '@data_dir@/LoginTasks/locale';
         return parent::t($message);
     }
 
@@ -44,7 +44,7 @@ class Horde_LoginTasks_Translation extends Horde_Translation
     static public function ngettext($singular, $plural, $number)
     {
         self::$_domain = 'Horde_LoginTasks';
-        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? '../../../locale' : '@data_dir@/LoginTasks/locale';
+        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? dirname(__FILE__) . '/../../../locale' : '@data_dir@/LoginTasks/locale';
         return parent::ngettext($singular, $plural, $number);
     }
 }

diff --git a/framework/Mime/lib/Horde/Mime/Translation.php b/framework/Mime/lib/Horde/Mime/Translation.php
index 5b311cf..38a7ebc 100644 (file)
--- a/framework/Mime/lib/Horde/Mime/Translation.php
+++ b/framework/Mime/lib/Horde/Mime/Translation.php
@@ -27,7 +27,7 @@ class Horde_Mime_Translation extends Horde_Translation
     static public function t($message)
     {
         self::$_domain = 'Horde_Mime';
-        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? '../../../locale' : '@data_dir@/Mime/locale';
+        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? dirname(__FILE__) . '/../../../locale' : '@data_dir@/Mime/locale';
         return parent::t($message);
     }
 
@@ -44,7 +44,7 @@ class Horde_Mime_Translation extends Horde_Translation
     static public function ngettext($singular, $plural, $number)
     {
         self::$_domain = 'Horde_Mime';
-        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? '../../../locale' : '@data_dir@/Mime/locale';
+        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? dirname(__FILE__) . '/../../../locale' : '@data_dir@/Mime/locale';
         return parent::ngettext($singular, $plural, $number);
     }
 }

diff --git a/framework/Mime_Viewer/lib/Horde/Mime/Viewer/Translation.php b/framework/Mime_Viewer/lib/Horde/Mime/Viewer/Translation.php
index b8dc429..0b658c8 100644 (file)
--- a/framework/Mime_Viewer/lib/Horde/Mime/Viewer/Translation.php
+++ b/framework/Mime_Viewer/lib/Horde/Mime/Viewer/Translation.php
@@ -27,7 +27,7 @@ class Horde_Mime_Viewer_Translation extends Horde_Translation
     static public function t($message)
     {
         self::$_domain = 'Horde_Mime_Viewer';
-        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? '../../../../locale' : '@data_dir@/Mime_Viewer/locale';
+        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? dirname(__FILE__) . '/../../../../locale' : '@data_dir@/Mime_Viewer/locale';
         return parent::t($message);
     }
 
@@ -44,7 +44,7 @@ class Horde_Mime_Viewer_Translation extends Horde_Translation
     static public function ngettext($singular, $plural, $number)
     {
         self::$_domain = 'Horde_Mime_Viewer';
-        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? '../../../../locale' : '@data_dir@/Mime_Viewer/locale';
+        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? dirname(__FILE__) . '/../../../../locale' : '@data_dir@/Mime_Viewer/locale';
         return parent::ngettext($singular, $plural, $number);
     }
 }

diff --git a/framework/Model/lib/Horde/Model/Translation.php b/framework/Model/lib/Horde/Model/Translation.php
index e6e82c9..47357ba 100644 (file)
--- a/framework/Model/lib/Horde/Model/Translation.php
+++ b/framework/Model/lib/Horde/Model/Translation.php
@@ -27,7 +27,7 @@ class Horde_Model_Translation extends Horde_Translation
     static public function t($message)
     {
         self::$_domain = 'Horde_Model';
-        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? '../../../locale' : '@data_dir@/Model/locale';
+        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? dirname(__FILE__) . '/../../../locale' : '@data_dir@/Model/locale';
         return parent::t($message);
     }
 
@@ -44,7 +44,7 @@ class Horde_Model_Translation extends Horde_Translation
     static public function ngettext($singular, $plural, $number)
     {
         self::$_domain = 'Horde_Model';
-        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? '../../../locale' : '@data_dir@/Model/locale';
+        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? dirname(__FILE__) . '/../../../locale' : '@data_dir@/Model/locale';
         return parent::ngettext($singular, $plural, $number);
     }
 }

diff --git a/framework/Net_IMSP/IMSP/Translation.php b/framework/Net_IMSP/IMSP/Translation.php
index 7401026..9e92675 100644 (file)
--- a/framework/Net_IMSP/IMSP/Translation.php
+++ b/framework/Net_IMSP/IMSP/Translation.php
@@ -27,7 +27,7 @@ class Horde_Net_IMSP_Translation extends Horde_Translation
     static public function t($message)
     {
         self::$_domain = 'Horde_Net_IMSP';
-        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? '../locale' : '@data_dir@/Net_IMSP/locale';
+        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? dirname(__FILE__) . '/../locale' : '@data_dir@/Net_IMSP/locale';
         return parent::t($message);
     }
 
@@ -44,7 +44,7 @@ class Horde_Net_IMSP_Translation extends Horde_Translation
     static public function ngettext($singular, $plural, $number)
     {
         self::$_domain = 'Horde_Net_IMSP';
-        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? '../locale' : '@data_dir@/Net_IMSP/locale';
+        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? dirname(__FILE__) . '/../locale' : '@data_dir@/Net_IMSP/locale';
         return parent::ngettext($singular, $plural, $number);
     }
 }

diff --git a/framework/Nls/lib/Horde/Nls/Translation.php b/framework/Nls/lib/Horde/Nls/Translation.php
index 19cc8e7..9c5fab9 100644 (file)
--- a/framework/Nls/lib/Horde/Nls/Translation.php
+++ b/framework/Nls/lib/Horde/Nls/Translation.php
@@ -27,7 +27,7 @@ class Horde_Nls_Translation extends Horde_Translation
     static public function t($message)
     {
         self::$_domain = 'Horde_Nls';
-        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? '../../../locale' : '@data_dir@/Nls/locale';
+        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? dirname(__FILE__) . '/../../../locale' : '@data_dir@/Nls/locale';
         return parent::t($message);
     }
 
@@ -44,7 +44,7 @@ class Horde_Nls_Translation extends Horde_Translation
     static public function ngettext($singular, $plural, $number)
     {
         self::$_domain = 'Horde_Nls';
-        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? '../../../locale' : '@data_dir@/Nls/locale';
+        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? dirname(__FILE__) . '/../../../locale' : '@data_dir@/Nls/locale';
         return parent::ngettext($singular, $plural, $number);
     }
 }

diff --git a/framework/Perms/lib/Horde/Perms/Translation.php b/framework/Perms/lib/Horde/Perms/Translation.php
index 6498eef..45a1389 100644 (file)
--- a/framework/Perms/lib/Horde/Perms/Translation.php
+++ b/framework/Perms/lib/Horde/Perms/Translation.php
@@ -27,7 +27,7 @@ class Horde_Perms_Translation extends Horde_Translation
     static public function t($message)
     {
         self::$_domain = 'Horde_Perms';
-        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? '../../../locale' : '@data_dir@/Perms/locale';
+        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? dirname(__FILE__) . '/../../../locale' : '@data_dir@/Perms/locale';
         return parent::t($message);
     }
 
@@ -44,7 +44,7 @@ class Horde_Perms_Translation extends Horde_Translation
     static public function ngettext($singular, $plural, $number)
     {
         self::$_domain = 'Horde_Perms';
-        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? '../../../locale' : '@data_dir@/Perms/locale';
+        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? dirname(__FILE__) . '/../../../locale' : '@data_dir@/Perms/locale';
         return parent::ngettext($singular, $plural, $number);
     }
 }

diff --git a/framework/Prefs/lib/Horde/Prefs/Translation.php b/framework/Prefs/lib/Horde/Prefs/Translation.php
index 6c265d5..77371af 100644 (file)
--- a/framework/Prefs/lib/Horde/Prefs/Translation.php
+++ b/framework/Prefs/lib/Horde/Prefs/Translation.php
@@ -27,7 +27,7 @@ class Horde_Prefs_Translation extends Horde_Translation
     static public function t($message)
     {
         self::$_domain = 'Horde_Prefs';
-        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? '../../../locale' : '@data_dir@/Prefs/locale';
+        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? dirname(__FILE__) . '/../../../locale' : '@data_dir@/Prefs/locale';
         return parent::t($message);
     }
 
@@ -44,7 +44,7 @@ class Horde_Prefs_Translation extends Horde_Translation
     static public function ngettext($singular, $plural, $number)
     {
         self::$_domain = 'Horde_Prefs';
-        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? '../../../locale' : '@data_dir@/Prefs/locale';
+        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? dirname(__FILE__) . '/../../../locale' : '@data_dir@/Prefs/locale';
         return parent::ngettext($singular, $plural, $number);
     }
 }

diff --git a/framework/Rpc/lib/Horde/Rpc/Translation.php b/framework/Rpc/lib/Horde/Rpc/Translation.php
index 7884520..73122df 100644 (file)
--- a/framework/Rpc/lib/Horde/Rpc/Translation.php
+++ b/framework/Rpc/lib/Horde/Rpc/Translation.php
@@ -27,7 +27,7 @@ class Horde_Rpc_Translation extends Horde_Translation
     static public function t($message)
     {
         self::$_domain = 'Horde_Rpc';
-        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? '../../../locale' : '@data_dir@/Rpc/locale';
+        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? dirname(__FILE__) . '/../../../locale' : '@data_dir@/Rpc/locale';
         return parent::t($message);
     }
 
@@ -44,7 +44,7 @@ class Horde_Rpc_Translation extends Horde_Translation
     static public function ngettext($singular, $plural, $number)
     {
         self::$_domain = 'Horde_Rpc';
-        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? '../../../locale' : '@data_dir@/Rpc/locale';
+        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? dirname(__FILE__) . '/../../../locale' : '@data_dir@/Rpc/locale';
         return parent::ngettext($singular, $plural, $number);
     }
 }

diff --git a/framework/Service_Facebook/lib/Horde/Service/Facebook/Translation.php b/framework/Service_Facebook/lib/Horde/Service/Facebook/Translation.php
index d4a3844..5e050f1 100644 (file)
--- a/framework/Service_Facebook/lib/Horde/Service/Facebook/Translation.php
+++ b/framework/Service_Facebook/lib/Horde/Service/Facebook/Translation.php
@@ -27,7 +27,7 @@ class Horde_Service_Facebook_Translation extends Horde_Translation
     static public function t($message)
     {
         self::$_domain = 'Horde_Services_Facebook';
-        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? '../../../../locale' : '@data_dir@/Services_Facebook/locale';
+        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? dirname(__FILE__) . '/../../../../locale' : '@data_dir@/Services_Facebook/locale';
         return parent::t($message);
     }
 
@@ -44,7 +44,7 @@ class Horde_Service_Facebook_Translation extends Horde_Translation
     static public function ngettext($singular, $plural, $number)
     {
         self::$_domain = 'Horde_Services_Facebook';
-        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? '../../../../locale' : '@data_dir@/Services_Facebook/locale';
+        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? dirname(__FILE__) . '/../../../../locale' : '@data_dir@/Services_Facebook/locale';
         return parent::ngettext($singular, $plural, $number);
     }
 }

diff --git a/framework/Service_Scribd/lib/Horde/Service/Scribd/Translation.php b/framework/Service_Scribd/lib/Horde/Service/Scribd/Translation.php
index 02dfdd8..6c406a8 100644 (file)
--- a/framework/Service_Scribd/lib/Horde/Service/Scribd/Translation.php
+++ b/framework/Service_Scribd/lib/Horde/Service/Scribd/Translation.php
@@ -27,7 +27,7 @@ class Horde_Service_Scribd_Translation extends Horde_Translation
     static public function t($message)
     {
         self::$_domain = 'Horde_Service_Scribd';
-        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? '../../../locale' : '@data_dir@/Service_Scribd/locale';
+        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? dirname(__FILE__) . '/../../../locale' : '@data_dir@/Service_Scribd/locale';
         return parent::t($message);
     }
 
@@ -44,7 +44,7 @@ class Horde_Service_Scribd_Translation extends Horde_Translation
     static public function ngettext($singular, $plural, $number)
     {
         self::$_domain = 'Horde_Service_Scribd';
-        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? '../../../locale' : '@data_dir@/Service_Scribd/locale';
+        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? dirname(__FILE__) . '/../../../locale' : '@data_dir@/Service_Scribd/locale';
         return parent::ngettext($singular, $plural, $number);
     }
 }

diff --git a/framework/Share/lib/Horde/Share/Translation.php b/framework/Share/lib/Horde/Share/Translation.php
index 85b281a..3acd019 100644 (file)
--- a/framework/Share/lib/Horde/Share/Translation.php
+++ b/framework/Share/lib/Horde/Share/Translation.php
@@ -27,7 +27,7 @@ class Horde_Share_Translation extends Horde_Translation
     static public function t($message)
     {
         self::$_domain = 'Horde_Share';
-        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? '../../../locale' : '@data_dir@/Share/locale';
+        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? dirname(__FILE__) . '/../../../locale' : '@data_dir@/Share/locale';
         return parent::t($message);
     }
 
@@ -44,7 +44,7 @@ class Horde_Share_Translation extends Horde_Translation
     static public function ngettext($singular, $plural, $number)
     {
         self::$_domain = 'Horde_Share';
-        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? '../../../locale' : '@data_dir@/Share/locale';
+        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? dirname(__FILE__) . '/../../../locale' : '@data_dir@/Share/locale';
         return parent::ngettext($singular, $plural, $number);
     }
 }

diff --git a/framework/SyncML/SyncML/Translation.php b/framework/SyncML/SyncML/Translation.php
index c6d0a2d..75c4c7d 100644 (file)
--- a/framework/SyncML/SyncML/Translation.php
+++ b/framework/SyncML/SyncML/Translation.php
@@ -27,7 +27,7 @@ class Horde_SyncML_Translation extends Horde_Translation
     static public function t($message)
     {
         self::$_domain = 'Horde_SyncML';
-        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? '../locale' : '@data_dir@/SyncML/locale';
+        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? dirname(__FILE__) . '/../locale' : '@data_dir@/SyncML/locale';
         return parent::t($message);
     }
 
@@ -44,7 +44,7 @@ class Horde_SyncML_Translation extends Horde_Translation
     static public function ngettext($singular, $plural, $number)
     {
         self::$_domain = 'Horde_SyncML';
-        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? '../locale' : '@data_dir@/SyncML/locale';
+        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? dirname(__FILE__) . '/../locale' : '@data_dir@/SyncML/locale';
         return parent::ngettext($singular, $plural, $number);
     }
 }

diff --git a/framework/Text_Filter/lib/Horde/Text/Filter/Translation.php b/framework/Text_Filter/lib/Horde/Text/Filter/Translation.php
index e235bcc..21f6ecc 100644 (file)
--- a/framework/Text_Filter/lib/Horde/Text/Filter/Translation.php
+++ b/framework/Text_Filter/lib/Horde/Text/Filter/Translation.php
@@ -27,7 +27,7 @@ class Horde_Text_Filter_Translation extends Horde_Translation
     static public function t($message)
     {
         self::$_domain = 'Horde_Text_Filter';
-        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? '../../../../locale' : '@data_dir@/Text_Filter/locale';
+        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? dirname(__FILE__) . '/../../../../locale' : '@data_dir@/Text_Filter/locale';
         return parent::t($message);
     }
 
@@ -44,7 +44,7 @@ class Horde_Text_Filter_Translation extends Horde_Translation
     static public function ngettext($singular, $plural, $number)
     {
         self::$_domain = 'Horde_Text_Filter';
-        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? '../../../../locale' : '@data_dir@/Text_Filter/locale';
+        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? dirname(__FILE__) . '/../../../../locale' : '@data_dir@/Text_Filter/locale';
         return parent::ngettext($singular, $plural, $number);
     }
 }

diff --git a/framework/Translation/lib/Horde/Translation.php b/framework/Translation/lib/Horde/Translation.php
index d45186b..d53ce93 100644 (file)
--- a/framework/Translation/lib/Horde/Translation.php
+++ b/framework/Translation/lib/Horde/Translation.php
@@ -54,9 +54,7 @@ abstract class Horde_Translation
         if (!self::$_domain || !self::$_directory) {
             throw new Horde_Translation_Exception('The domain and directory properties must be set by the class that extends Horde_Translation.');
         }
-        $backtrace = debug_backtrace();
-        $directory = dirname($backtrace[1]['file']) . '/' . self::$_directory;
-        self::setHandler(new $handlerClass(self::$_domain, $directory));
+        self::setHandler(new $handlerClass(self::$_domain, self::$_directory));
     }
 
     /**

diff --git a/framework/Translation/test/Horde/Translation/WrapperTest.php b/framework/Translation/test/Horde/Translation/WrapperTest.php
index 0084b11..9a9e79f 100644 (file)
--- a/framework/Translation/test/Horde/Translation/WrapperTest.php
+++ b/framework/Translation/test/Horde/Translation/WrapperTest.php
@@ -23,14 +23,14 @@ class Horde_Translation_TestWrapper extends Horde_Translation
     static public function t($message)
     {
         self::$_domain = 'Horde_Translation';
-        self::$_directory = 'locale';
+        self::$_directory = dirname(__FILE__) . '/locale';
         return parent::t($message);
     }
 
     static public function ngettext($singular, $plural, $number)
     {
         self::$_domain = 'Horde_Translation';
-        self::$_directory = 'locale';
+        self::$_directory = dirname(__FILE__) . '/locale';
         return parent::ngettext($singular, $plural, $number);
     }
 }

diff --git a/framework/VFS/lib/VFS/Translation.php b/framework/VFS/lib/VFS/Translation.php
index d533498..2615659 100644 (file)
--- a/framework/VFS/lib/VFS/Translation.php
+++ b/framework/VFS/lib/VFS/Translation.php
@@ -27,7 +27,7 @@ class Horde_VFS_Translation extends Horde_Translation
     static public function t($message)
     {
         self::$_domain = 'Horde_VFS';
-        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? '../../../locale' : '@data_dir@/VFS/locale';
+        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? dirname(__FILE__) . '/../../../locale' : '@data_dir@/VFS/locale';
         return parent::t($message);
     }
 
@@ -44,7 +44,7 @@ class Horde_VFS_Translation extends Horde_Translation
     static public function ngettext($singular, $plural, $number)
     {
         self::$_domain = 'Horde_VFS';
-        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? '../../../locale' : '@data_dir@/VFS/locale';
+        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? dirname(__FILE__) . '/../../../locale' : '@data_dir@/VFS/locale';
         return parent::ngettext($singular, $plural, $number);
     }
 }

diff --git a/framework/VFS_ISOWriter/ISOWriter/Translation.php b/framework/VFS_ISOWriter/ISOWriter/Translation.php
index 38dd5dc..fb2beda 100644 (file)
--- a/framework/VFS_ISOWriter/ISOWriter/Translation.php
+++ b/framework/VFS_ISOWriter/ISOWriter/Translation.php
@@ -27,7 +27,7 @@ class Horde_VFS_ISOWriter_Translation extends Horde_Translation
     static public function t($message)
     {
         self::$_domain = 'Horde_VFS_ISOWriter';
-        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? '../locale' : '@data_dir@/VFS_ISOWriter/locale';
+        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? dirname(__FILE__) . '/../locale' : '@data_dir@/VFS_ISOWriter/locale';
         return parent::t($message);
     }
 
@@ -44,7 +44,7 @@ class Horde_VFS_ISOWriter_Translation extends Horde_Translation
     static public function ngettext($singular, $plural, $number)
     {
         self::$_domain = 'Horde_VFS_ISOWriter';
-        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? '../locale' : '@data_dir@/VFS_ISOWriter/locale';
+        self::$_directory = '@data_dir@' == '@'.'data_dir'.'@' ? dirname(__FILE__) . '/../locale' : '@data_dir@/VFS_ISOWriter/locale';
         return parent::ngettext($singular, $plural, $number);
     }
 }