summaryrefslogtreecommitdiff
path: root/riscos
diff options
context:
space:
mode:
authorMichael Drake <tlsa@netsurf-browser.org>2012-10-16 22:01:55 +0100
committerMichael Drake <tlsa@netsurf-browser.org>2012-10-16 22:01:55 +0100
commite3261a38e2ca461caebcd4a67365c81ba39014d0 (patch)
tree9375715dd6a7e1a6ed2dac3fa1aca7df29373d4e /riscos
parente2bde3482b07ee61c933dedaa8089b3d2daceeb3 (diff)
downloadnetsurf-e3261a38e2ca461caebcd4a67365c81ba39014d0.tar.gz
netsurf-e3261a38e2ca461caebcd4a67365c81ba39014d0.tar.bz2
Document messages_load behaviour.
Diffstat (limited to 'riscos')
-rw-r--r--riscos/gui.c4
1 files changed, 4 insertions, 0 deletions
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);