mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2025-01-22 10:22:06 +03:00
Code Issues Packages Projects Releases Wiki Activity

Haiku: use the native locale API to get the language name

Browse Source 
We used getenv() on LC_MESSAGES but we currently set it incorrectly
anyway... We keep this as a fallback.
This commit is contained in:
François Revol 2018-08-21 21:16:06 +02:00
parent bec6428c6c
commit 579465df50
1 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
frontends/beos/gui.cpp
View File

@ -42,6 +42,9 @@
#include <Roster.h>
#include <Screen.h>
#include <String.h>
#ifdef __HAIKU__
#include <LocaleRoster.h>
#endif
extern "C" {
@ -519,9 +522,18 @@ static BPath get_messages_path()
BPath p;
f.FindPath(B_FIND_PATH_APPS_DIRECTORY, "netsurf/res", p);
// TODO: use Haiku's BLocale stuff
BString lang(getenv("LC_MESSAGES"));
lang.Truncate(2);
BString lang;
#ifdef __HAIKU__
BMessage preferredLangs;
if (BLocaleRoster::Default()->GetPreferredLanguages(&preferredLangs) == B_OK) {
preferredLangs.FindString("language", 0, &lang);
lang.Truncate(2);
}
#endif
if (lang.Length() < 1) {
lang.SetTo(getenv("LC_MESSAGES"));
lang.Truncate(2);
}
BDirectory d(p.Path());
if (!d.Contains(lang.String(), B_DIRECTORY_NODE))
lang = "en";
@ -1040,9 +1052,19 @@ int main(int argc, char** argv)
BResources resources;
resources.SetToImage((const void*)main);
size_t size = 0;
BString lang;
#ifdef __HAIKU__
BMessage preferredLangs;
if (BLocaleRoster::Default()->GetPreferredLanguages(&preferredLangs) == B_OK) {
preferredLangs.FindString("language", 0, &lang);
}
#endif
if (lang.Length() < 1)
lang.SetTo(getenv("LC_MESSAGES"));
char path[12];
sprintf(path,"%.2s/Messages", getenv("LC_MESSAGES"));
sprintf(path,"%.2s/Messages", lang.String());
NSLOG(netsurf, INFO, "Loading messages from resource %s\n", path);
const uint8_t* res = (const uint8_t*)resources.LoadResource('data', path, &size);