smallsolar
/
libkiwix
mirror of https://github.com/kiwix/libkiwix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Dropped defaultUserLanguage from viewer_settings.js

This commit is contained in:
Veloman Yunkan 2024-01-28 17:58:16 +04:00
parent e5dab19844
commit c697611064
3 changed files with 6 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/server/internalServer.cpp
View File

@ -767,8 +767,7 @@ std::unique_ptr<Response> InternalServer::handle_viewer_settings(const RequestCo
const kainjow::mustache::object data{ const kainjow::mustache::object data{
{"enable_toolbar", m_withTaskbar ? "true" : "false" }, {"enable_toolbar", m_withTaskbar ? "true" : "false" },
{"enable_link_blocking", m_blockExternalLinks ? "true" : "false" }, {"enable_link_blocking", m_blockExternalLinks ? "true" : "false" },
{"enable_library_button", m_withLibraryButton ? "true" : "false" }, {"enable_library_button", m_withLibraryButton ? "true" : "false" }
{"default_user_language", request.get_user_language() }
}; };
return ContentResponse::build(RESOURCE::templates::viewer_settings_js, data, "application/javascript; charset=utf-8"); return ContentResponse::build(RESOURCE::templates::viewer_settings_js, data, "application/javascript; charset=utf-8");
} }

3
static/templates/viewer_settings.js
View File

@ -1,6 +1,5 @@
const viewerSettings = { const viewerSettings = {
toolbarEnabled: {{enable_toolbar}}, toolbarEnabled: {{enable_toolbar}},
linkBlockingEnabled: {{enable_link_blocking}}, linkBlockingEnabled: {{enable_link_blocking}},
libraryButtonEnabled: {{enable_library_button}}, libraryButtonEnabled: {{enable_library_button}}
defaultUserLanguage: "{{default_user_language}}"
} }

51
test/server.cpp
View File

@ -2077,8 +2077,7 @@ TEST_F(ServerTest, viewerSettings)
R"(const viewerSettings = { R"(const viewerSettings = {
toolbarEnabled: false, toolbarEnabled: false,
linkBlockingEnabled: false, linkBlockingEnabled: false,
libraryButtonEnabled: false, libraryButtonEnabled: false
defaultUserLanguage: "en"
} }
)"); )");
} }
@ -2089,8 +2088,7 @@ R"(const viewerSettings = {
R"(const viewerSettings = { R"(const viewerSettings = {
toolbarEnabled: false, toolbarEnabled: false,
linkBlockingEnabled: true, linkBlockingEnabled: true,
libraryButtonEnabled: false, libraryButtonEnabled: false
defaultUserLanguage: "en"
} }
)"); )");
} }
@ -2101,8 +2099,7 @@ R"(const viewerSettings = {
R"(const viewerSettings = { R"(const viewerSettings = {
toolbarEnabled: true, toolbarEnabled: true,
linkBlockingEnabled: false, linkBlockingEnabled: false,
libraryButtonEnabled: false, libraryButtonEnabled: false
defaultUserLanguage: "en"
} }
)"); )");
} }
@ -2113,47 +2110,7 @@ R"(const viewerSettings = {
R"(const viewerSettings = { R"(const viewerSettings = {
toolbarEnabled: true, toolbarEnabled: true,
linkBlockingEnabled: false, linkBlockingEnabled: false,
libraryButtonEnabled: true, libraryButtonEnabled: true
defaultUserLanguage: "en"
}
)");
}
{
resetServer(ZimFileServer::WITH_TASKBAR_AND_LIBRARY_BUTTON);
const Headers headers{ {"Accept-Language", "fr"} };
ASSERT_EQ(zfs1_->GET("/ROOT%23%3F/viewer_settings.js", headers)->body,
R"(const viewerSettings = {
toolbarEnabled: true,
linkBlockingEnabled: false,
libraryButtonEnabled: true,
defaultUserLanguage: "fr"
}
)");
}
{
resetServer(ZimFileServer::WITH_TASKBAR_AND_LIBRARY_BUTTON);
const Headers headers{ {"Accept-Language", "test;q=0.2, en;q=0.9"} };
ASSERT_EQ(zfs1_->GET("/ROOT%23%3F/viewer_settings.js", headers)->body,
R"(const viewerSettings = {
toolbarEnabled: true,
linkBlockingEnabled: false,
libraryButtonEnabled: true,
defaultUserLanguage: "en"
}
)");
}
{
resetServer(ZimFileServer::WITH_TASKBAR_AND_LIBRARY_BUTTON);
const Headers headers{ {"Accept-Language", "test;q=0.9, en;q=0.2"} };
ASSERT_EQ(zfs1_->GET("/ROOT%23%3F/viewer_settings.js", headers)->body,
R"(const viewerSettings = {
toolbarEnabled: true,
linkBlockingEnabled: false,
libraryButtonEnabled: true,
defaultUserLanguage: "test"
} }
)"); )");
} }