Changeset 5683

Timestamp:

02/24/10 19:08:50 (3 years ago)

Author:

blogic

Message:

make languages load fromt the correct path

Location:

luci2/cbi2

Files:

• cbi.c (modified) (1 diff)
• cbi.h (modified) (1 diff)
• lang.c (modified) (1 diff)
• Makefile (modified) (1 diff)

luci2/cbi2/cbi.c

@@ -544 +544 @@
 }
 
-static const char* cbi_virt_path(struct cbi_ctx *ctx, const char *path, const char *file)
+const char* cbi_virt_path(struct cbi_ctx *ctx, const char *path, const char *file)
 {
     static char buf[256];

luci2/cbi2/cbi.h

@@ -108 +108 @@
 int cbi_dump_blob(char *file);
 void cbi_request(struct cbi_ctx *ctx, char *request);
+const char* cbi_virt_path(struct cbi_ctx *ctx, const char *path, const char *file);
 
 void cbi_widget_register(char *name, struct cbi_widget *w);

luci2/cbi2/lang.c

@@ -8 +8 @@
     if(ctx->lmo)
         lmo_close(ctx->lmo);
-    ctx->lmo = (lmo_archive_t *)lmo_open(file);
+    printf("loading %s\n", cbi_virt_path(ctx, ctx->path, file));
+    ctx->lmo = (lmo_archive_t *)lmo_open(cbi_virt_path(ctx, ctx->path, file));
     if(!ctx->lmo)
     {

luci2/cbi2/Makefile

@@ -30 +30 @@
 
 run: $(BINARY)
-    mkdir -p ./root
+    mkdir -p ./root/lib/luci2/ ./root/etc/config/
     cp *.luci ./root/lib/luci2/
-    ./lmo_po2lmo en.po en.lmo
-    ./luci -s -V ./root/
+    cp luci.uci ./root/etc/config/luci
+    ./lmo_po2lmo en.po ./root/lib/luci2/en.lmo
+    ./luci -s -V ./root
 
 %.o: $(wildcard *.h)