Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add support for ContentDB package translation #14410

Merged
merged 2 commits into from
Feb 25, 2024
Merged

Add support for ContentDB package translation #14410

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d6f5f1e
Add Accept-Language to ContentDB request
rubenwardy Feb 25, 2024
8dcfd5b
Update
rubenwardy Feb 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
19 changes: 17 additions & 2 deletions builtin/mainmenu/content/dlg_contentstore.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,9 @@ local function start_install(package, reason)

if conf_path then
local conf = Settings(conf_path)
conf:set("title", package.title)
if not conf:get("title") then
conf:set("title", package.title)
end
if not name_is_title then
conf:set("name", package.name)
end
Expand Down Expand Up @@ -642,8 +644,21 @@ local function fetch_pkgs()
end
end

local languages
local current_language = core.get_language()
if current_language ~= "" then
languages = { current_language, "en;q=0.8" }
else
languages = { "en" }
end

local http = core.get_http_api()
local response = http.fetch_sync({ url = url })
local response = http.fetch_sync({
url = url,
extra_headers = {
"Accept-Language: " .. table.concat(languages, ", ")
},
})
if not response.succeeded then
return
end
Expand Down
13 changes: 13 additions & 0 deletions src/script/lua_api/l_mainmenu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -933,6 +933,17 @@ int ModApiMainMenu::l_get_video_drivers(lua_State *L)
return 1;
}

/******************************************************************************/
int ModApiMainMenu::l_get_language(lua_State *L)
{
std::string lang = gettext("LANG_CODE");
if (lang == "LANG_CODE")
lang = "";

lua_pushstring(L, lang.c_str());
return 1;
}

/******************************************************************************/
int ModApiMainMenu::l_gettext(lua_State *L)
{
Expand Down Expand Up @@ -1151,6 +1162,7 @@ void ModApiMainMenu::Initialize(lua_State *L, int top)
API_FCT(get_mainmenu_path);
API_FCT(show_path_select_dialog);
API_FCT(download_file);
API_FCT(get_language);
API_FCT(gettext);
API_FCT(get_video_drivers);
API_FCT(get_window_info);
Expand Down Expand Up @@ -1191,5 +1203,6 @@ void ModApiMainMenu::InitializeAsync(lua_State *L, int top)
API_FCT(download_file);
API_FCT(get_min_supp_proto);
API_FCT(get_max_supp_proto);
API_FCT(get_language);
API_FCT(gettext);
}
2 changes: 2 additions & 0 deletions src/script/lua_api/l_mainmenu.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,8 @@ class ModApiMainMenu: public ModApiBase

static int l_get_mapgen_names(lua_State *L);

static int l_get_language(lua_State *L);

static int l_gettext(lua_State *L);

//packages
Expand Down