diff options
author | Sven Weidauer <sven@5sw.de> | 2018-02-10 00:20:05 +0100 |
---|---|---|
committer | Sven Weidauer <sven@5sw.de> | 2018-02-10 00:20:05 +0100 |
commit | 885c5ac91823b2f3d94e72028f603274d5cb3a42 (patch) | |
tree | 2caeb4ccc21283be8ad458de502234922f6851c7 /frontends/riscos/gui.c | |
parent | 7b4163e0216538823630113ed7534c319e19c385 (diff) | |
parent | 470dce645bc9cfca1d438f62a8ffe7a6db80a278 (diff) | |
download | netsurf-885c5ac91823b2f3d94e72028f603274d5cb3a42.tar.gz netsurf-885c5ac91823b2f3d94e72028f603274d5cb3a42.tar.bz2 |
Merge remote-tracking branch 'origin/master' into svenw/cocoa
Diffstat (limited to 'frontends/riscos/gui.c')
-rw-r--r-- | frontends/riscos/gui.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/frontends/riscos/gui.c b/frontends/riscos/gui.c index cfc513f72..be1bc8d9a 100644 --- a/frontends/riscos/gui.c +++ b/frontends/riscos/gui.c @@ -195,6 +195,7 @@ static struct static nsurl *gui_get_resource_url(const char *path) { static const char base_url[] = "file:///NetSurf:/Resources/"; + const char *lang; size_t path_len, length; char *raw; nsurl *url = NULL; @@ -220,8 +221,12 @@ static nsurl *gui_get_resource_url(const char *path) path_len = strlen(path); + lang = ro_gui_default_language(); + /* Find max URL length */ - length = SLEN(base_url) + SLEN("xx/") + path_len + 1; + length = SLEN(base_url) + + strlen(lang) + 1 + /* <lang> + / */ + path_len + 1; /* + NUL */ raw = malloc(length); if (raw != NULL) { @@ -230,13 +235,11 @@ static nsurl *gui_get_resource_url(const char *path) ptr += SLEN(base_url); /* Add language directory to URL, for translated files */ - /* TODO: handle non-en langauages - * handle non-html translated files */ + /* TODO: handle non-html translated files */ if (path_len > SLEN(".html") && strncmp(path + path_len - SLEN(".html"), ".html", SLEN(".html")) == 0) { - memcpy(ptr, "en/", SLEN("en/")); - ptr += SLEN("en/"); + ptr += sprintf(ptr, "%s/", lang); } /* Add filename to URL */ |