diff options
author | Evan Prodromou <evan@status.net> | 2010-10-05 14:09:17 -0400 |
---|---|---|
committer | Evan Prodromou <evan@status.net> | 2010-10-05 14:09:17 -0400 |
commit | 8aa9c271dffe6ec6766b94486c0635c9db588db7 (patch) | |
tree | f6cb465062767bdf5642121e61d143bdd2e4dcfe /lib/plugin.php | |
parent | 829a017a5d0104f495cd0b645ecb1f3cdeda25ac (diff) | |
parent | 5c4723919fa757b3e14a59350415cfe53e0900d1 (diff) |
Merge remote branch 'gitorious/1.0.x' into 1.0.x
Diffstat (limited to 'lib/plugin.php')
-rw-r--r-- | lib/plugin.php | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/plugin.php b/lib/plugin.php index f63bdf309..3f84afa27 100644 --- a/lib/plugin.php +++ b/lib/plugin.php @@ -88,7 +88,12 @@ class Plugin $class = get_class($this); if (substr($class, -6) == 'Plugin') { $name = substr($class, 0, -6); - $path = INSTALLDIR . "/plugins/$name/locale"; + $path = common_config('plugins', 'locale_path'); + if (!$path) { + // @fixme this will fail for things installed in local/plugins + // ... but then so will web links so far. + $path = INSTALLDIR . "/plugins/$name/locale"; + } if (file_exists($path) && is_dir($path)) { bindtextdomain($name, $path); bind_textdomain_codeset($name, 'UTF-8'); @@ -112,9 +117,9 @@ class Plugin $name = mb_substr($cls, 0, -6); $versions[] = array('name' => $name, + // TRANS: Displayed as version information for a plugin if no version information was found. 'version' => _('Unknown')); return true; } } - |