Dropped defaultUserLanguage from viewer_settings.js

kiwix · Jan 31, 2024 · c697611 · c697611
1 parent e5dab19
commit c697611
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 51 deletions.
diff --git a/src/server/internalServer.cpp b/src/server/internalServer.cpp
@@ -767,8 +767,7 @@ std::unique_ptr<Response> InternalServer::handle_viewer_settings(const RequestCo
   const kainjow::mustache::object data{
     {"enable_toolbar", m_withTaskbar ? "true" : "false" },
     {"enable_link_blocking", m_blockExternalLinks ? "true" : "false" },
-    {"enable_library_button", m_withLibraryButton ? "true" : "false" },
-    {"default_user_language", request.get_user_language() }
+    {"enable_library_button", m_withLibraryButton ? "true" : "false" }
   };
   return ContentResponse::build(RESOURCE::templates::viewer_settings_js, data, "application/javascript; charset=utf-8");
 }

diff --git a/static/templates/viewer_settings.js b/static/templates/viewer_settings.js
@@ -1,6 +1,5 @@
 const viewerSettings = {
   toolbarEnabled:       {{enable_toolbar}},
   linkBlockingEnabled:  {{enable_link_blocking}},
-  libraryButtonEnabled: {{enable_library_button}},
-  defaultUserLanguage:  "{{default_user_language}}"
+  libraryButtonEnabled: {{enable_library_button}}
 }
diff --git a/test/server.cpp b/test/server.cpp
@@ -2077,8 +2077,7 @@ TEST_F(ServerTest, viewerSettings)
 R"(const viewerSettings = {
   toolbarEnabled:       false,
   linkBlockingEnabled:  false,
-  libraryButtonEnabled: false,
-  defaultUserLanguage:  "en"
+  libraryButtonEnabled: false
 }
 )");
   }
@@ -2089,8 +2088,7 @@ R"(const viewerSettings = {
 R"(const viewerSettings = {
   toolbarEnabled:       false,
   linkBlockingEnabled:  true,
-  libraryButtonEnabled: false,
-  defaultUserLanguage:  "en"
+  libraryButtonEnabled: false
 }
 )");
   }
@@ -2101,8 +2099,7 @@ R"(const viewerSettings = {
 R"(const viewerSettings = {
   toolbarEnabled:       true,
   linkBlockingEnabled:  false,
-  libraryButtonEnabled: false,
-  defaultUserLanguage:  "en"
+  libraryButtonEnabled: false
 }
 )");
   }
@@ -2113,47 +2110,7 @@ R"(const viewerSettings = {
 R"(const viewerSettings = {
   toolbarEnabled:       true,
   linkBlockingEnabled:  false,
-  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"
+  libraryButtonEnabled: true
 }
 )");
   }