Changeset 376 for trunk/zoo-project/zoo-kernel/zoo_service_loader.c

Timestamp:

Nov 3, 2012, 3:07:43 AM (11 years ago)

Author:

djay

Message:

Add _ method to the zoo Python module to enable translation from zoo-services textdomain. Add gettextPath in the main section of the main.cfg to set the directory to search for language files.

File:

• trunk/zoo-project/zoo-kernel/zoo_service_loader.c (modified) (5 diffs)

trunk/zoo-project/zoo-kernel/zoo_service_loader.c

@@ -28 +28 @@
 extern "C" int crlex();
 
+#include "cgic.h"
+
 extern "C" {
 #include <libxml/tree.h>
@@ -36 +38 @@
 }
 
-#include "cgic.h"
 #include "ulinet.h"
 
@@ -108 +109 @@
 
 #define _(String) dgettext ("zoo-kernel",String)
+#define __(String) dgettext ("zoo-service",String)
 
 
@@ -541 +543 @@
 #endif
 
-  bindtextdomain ("zoo-kernel","/usr/share/locale/");
-  bindtextdomain ("zoo-services","/usr/share/locale/");
+  map *getPath=getMapFromMaps(m,"main","gettextPath");
+  if(getPath!=NULL){
+    bindtextdomain ("zoo-kernel",getPath->value);
+    bindtextdomain ("zoo-services",getPath->value);    
+  }else{
+    bindtextdomain ("zoo-kernel","/usr/share/locale/");
+    bindtextdomain ("zoo-services","/usr/share/locale/");
+  }
 
   /**
@@ -554 +562 @@
         fstde = freopen(fstdem->value, "a+", stderr) ;
 
-  if((r_inputs=getMap(request_inputs,"language"))!=NULL){
+  r_inputs=getMap(request_inputs,"language");
+  if(r_inputs==NULL)
+    r_inputs=getMapFromMaps(m,"main","language");
+  if(r_inputs!=NULL){
     char *tmp=strdup(r_inputs->value);
+    setMapInMaps(m,"main","language",tmp);
     translateChar(tmp,'-','_');
     setlocale (LC_ALL, tmp);
+#ifdef WIN32
+    char tmp1[12];
+    sprintf(tmp1,"LC_ALL=%s",tmp);
+    putenv(tmp1);
+#endif
     free(tmp);
-    setMapInMaps(m,"main","language",r_inputs->value);
   }
   else{
     setlocale (LC_ALL, "en_US");
+#ifdef WIN32
+    char tmp1[12];
+    sprintf(tmp1,"LC_ALL=en_US");
+    putenv(tmp1);
+#endif
     setMapInMaps(m,"main","language","en-US");
   }