diff options
| author | Adrian Lang <dokuwiki@adrianlang.de> | 2011-01-14 21:45:52 +0100 |
|---|---|---|
| committer | Adrian Lang <dokuwiki@adrianlang.de> | 2011-01-14 21:45:52 +0100 |
| commit | 731ae6527af8e2b8cdb211aecac260988e8379e9 (patch) | |
| tree | a44a5637394e7fee3c5835e3955cd716699bbea8 /lib/plugins/syntax.php | |
| parent | fa7c70ff4d7f9999466436e7d559eb0c81571779 (diff) | |
| parent | 301971b3769a2d1a440cf58fd84f2c100a1348e3 (diff) | |
| download | rpg-731ae6527af8e2b8cdb211aecac260988e8379e9.tar.gz rpg-731ae6527af8e2b8cdb211aecac260988e8379e9.tar.bz2 | |
Merge branch 'master' of github.com:splitbrain/dokuwiki
Diffstat (limited to 'lib/plugins/syntax.php')
| -rw-r--r-- | lib/plugins/syntax.php | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/lib/plugins/syntax.php b/lib/plugins/syntax.php index 05b0dc466..12451f636 100644 --- a/lib/plugins/syntax.php +++ b/lib/plugins/syntax.php @@ -188,10 +188,13 @@ class DokuWiki_Syntax_Plugin extends Doku_Parser_Mode { function localFN($id) { global $conf; $plugin = $this->getPluginName(); - $file = DOKU_PLUGIN.$plugin.'/lang/'.$conf['lang'].'/'.$id.'.txt'; - if(!@file_exists($file)){ - //fall back to english - $file = DOKU_PLUGIN.$plugin.'/lang/en/'.$id.'.txt'; + $file = DOKU_CONF.'/plugin_lang/'.$plugin.'/'.$conf['lang'].'/'.$id.'.txt'; + if (!@file_exists($file)){ + $file = DOKU_PLUGIN.$plugin.'/lang/'.$conf['lang'].'/'.$id.'.txt'; + if(!@file_exists($file)){ + //fall back to english + $file = DOKU_PLUGIN.$plugin.'/lang/en/'.$id.'.txt'; + } } return $file; } |