Language files can now be customized in the conf/ directory

As suggested by Robin Getz locale .txt files can now be duplicated and changed in the conf/lang/ directory and conf/plugin_lang/$plugin/ directory for plugins.
dokuwiki · Dec 29, 2010 · e6cecb0 · e6cecb0
1 parent 650ebc1
commit e6cecb0
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 11 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,6 +6,8 @@
 /conf/user*.css
 /conf/user*.js
 /conf/words.aspell
+/conf/lang/*
+/conf/plugin_lang/*
 .htaccess
 *.swp
 *.bak

diff --git a/inc/pageutils.php b/inc/pageutils.php
@@ -344,10 +344,13 @@ function mediaFN($id){
  */
 function localeFN($id){
     global $conf;
-    $file = DOKU_INC.'inc/lang/'.$conf['lang'].'/'.$id.'.txt';
+    $file = DOKU_CONF.'/lang/'.$conf['lang'].'/'.$id.'.txt';
     if(!@file_exists($file)){
-        //fall back to english
-        $file = DOKU_INC.'inc/lang/en/'.$id.'.txt';
+        $file = DOKU_INC.'inc/lang/'.$conf['lang'].'/'.$id.'.txt';
+        if(!@file_exists($file)){
+            //fall back to english
+            $file = DOKU_INC.'inc/lang/en/'.$id.'.txt';
+        }
     }
     return $file;
 }

diff --git a/inc/plugin.php b/inc/plugin.php
@@ -88,10 +88,13 @@ function locale_xhtml($id) {
     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;
     }

diff --git a/lib/plugins/syntax.php b/lib/plugins/syntax.php
@@ -188,10 +188,13 @@ function locale_xhtml($id) {
     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;
     }