From e3261a38e2ca461caebcd4a67365c81ba39014d0 Mon Sep 17 00:00:00 2001 From: Michael Drake Date: Tue, 16 Oct 2012 22:01:55 +0100 Subject: Document messages_load behaviour. --- riscos/gui.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'riscos') diff --git a/riscos/gui.c b/riscos/gui.c index 2926f63aa..d689094ab 100644 --- a/riscos/gui.c +++ b/riscos/gui.c @@ -780,6 +780,8 @@ int main(int argc, char** argv) setbuf(stderr, NULL); + /* Pass a NULL pointer for Messages path, because until the Choices + * are loaded in netsurf_init, we don't know the Messages path. */ netsurf_init(&argc, &argv, "NetSurf:Choices", NULL); artworks_init(); @@ -794,7 +796,9 @@ int main(int argc, char** argv) "NetSurf:Resources.%s.Messages", nsoption_charp(language))) < 0 || length >= (int)sizeof(path)) die("Failed to locate Messages resource."); + /* We disabled core Messages load, so have to load them here */ messages_load(path); + /* Also load some extra RISC OS specific Messages */ messages_load("NetSurf:Resources.LangNames"); gui_init(argc, argv); -- cgit v1.2.3