[Hack] Multiple spelling corrections are returned

Release 14.1.1

ChangeLog

@@ -1,3 +1,31 @@
+libkiwix 14.1.1
+===============
+
+* Server:
+  - Fix regression for kiwix-serve --nosearchbar (@veloman-yunkan #1250)
+  - Avoid results content interpretation... crash in fulltext search (@vighnesh-sawant #1241)
+  - Fix for intermittent /content/blank.html errors (@veloman-yunkan #1249)
+
+libkiwix 14.1.0
+===============
+
+ * Server:
+  - Viewer detects & tracks intrapage navigation anchors too (@veloman-yunkan #1213)
+  - Add support for catalog only mode (@veloman-yunkan #1219)
+  - Add API which returns server access url (@vighnesh-sawant #1234)
+  - Fix chrome searchbar placeholder text overflow (@aditii2712 #1185)
+  - Fix magnet link queryStyring (@rgaudin #1160)
+  - Improve chrome printing stylesheet (@kelson42 #1202)
+  - Default white background (@kelson42 #1205)
+
+ * Other:
+  - Switched to the new libzim illustrations API (@veloman-yunkan #1226)
+  - Stop building Windows with DEBUG symbols in CI (@kelson42 #1165)
+  - Update many things in the CI/CD (@kelson42 #1203 #1194 #1209 #1207 #1235)
+  - Requires now libzim 9.4.0 (@kelson42 #1231)
+  - Fix compilation for FreeBSD (@OICe2 #1173 #1174)
+  - Wait up to 1s to let aria2c to start before complaining (@kelson42 #1169)
+
 libkiwix 14.0.0
 ===============
 

include/server.h

@@ -69,6 +69,7 @@ namespace kiwix
        int getPort() const;
        IpAddress getAddress() const;
        IpMode getIpMode() const;
+       std::vector<std::string> getServerAccessUrls() const;
 
      protected:
        std::shared_ptr<Library> mp_library;

include/spelling_correction.h

@@ -32,7 +32,7 @@ class Archive;
 
 namespace Xapian
 {
-class Database;
+class WritableDatabase;
 }
 
 namespace kiwix
@@ -50,7 +50,7 @@ public: // functions
   std::vector<std::string> getSpellingCorrections(const std::string& word, uint32_t maxCount) const;
 
 private: // data
-  std::unique_ptr<Xapian::Database> impl_;
+  std::unique_ptr<Xapian::WritableDatabase> impl_;
 };
 
 } // namespace kiwix

meson.build

@@ -1,5 +1,5 @@
 project('libkiwix', 'cpp',
-  version : '14.0.0',
+  version : '14.1.1',
   license : 'GPLv3+',
   default_options : ['c_std=c11', 'cpp_std=c++17', 'werror=true'])
 

src/server.cpp

@@ -29,6 +29,22 @@
 
 namespace kiwix {
 
+namespace
+{
+
+std::string makeServerUrl(std::string host, int port, std::string root)
+{
+  const int httpDefaultPort = 80;
+
+  if (port == httpDefaultPort) {
+    return "http://" + host + root;
+  } else {
+    return "http://" + host + ":" + std::to_string(port) + root;
+  }
+}
+
+}  // unnamed namespace
+
 Server::Server(LibraryPtr library, std::shared_ptr<NameMapper> nameMapper) :
   mp_library(library),
   mp_nameMapper(nameMapper),
@@ -56,7 +72,13 @@ bool Server::start() {
     m_ipConnectionLimit,
     m_catalogOnlyMode,
     m_contentServerUrl));
-  return mp_server->start();
+  if (mp_server->start()) {
+    // this syncs m_addr of InternalServer and Server as they may diverge
+    m_addr = mp_server->getAddress();
+    return true;
+  } else {
+    return false;
+  }
 }
 
 void Server::stop() {
@@ -69,12 +91,12 @@ void Server::stop() {
 void Server::setRoot(const std::string& root)
 {
   m_root = root;
-  if (m_root[0] != '/') {
-    m_root = "/" + m_root;
-  }
-  if (m_root.back() == '/') {
-    m_root.erase(m_root.size() - 1);
-  }
+  while (!m_root.empty() && m_root.back() == '/')
+    m_root.pop_back();
+
+  while (!m_root.empty() && m_root.front() == '/')
+    m_root = m_root.substr(1);
+  m_root = m_root.empty() ? m_root : "/" + m_root;
 }
 
 void Server::setAddress(const std::string& addr)
@@ -93,12 +115,12 @@ void Server::setAddress(const std::string& addr)
 
 int Server::getPort() const
 {
-  return mp_server->getPort();
+  return m_port;
 }
 
 IpAddress Server::getAddress() const
 {
-  return mp_server->getAddress();
+  return m_addr;
 }
 
 IpMode Server::getIpMode() const
@@ -106,4 +128,16 @@ IpMode Server::getIpMode() const
   return mp_server->getIpMode();
 }
 
+std::vector<std::string> Server::getServerAccessUrls() const
+{
+  std::vector<std::string> result;
+  if (!m_addr.addr.empty()) {
+    result.push_back(makeServerUrl(m_addr.addr, m_port, m_root));
+  }
+  if (!m_addr.addr6.empty()) {
+    result.push_back(makeServerUrl("[" + m_addr.addr6 + "]", m_port, m_root));
+  }
+  return result;
+}
+
 }

src/server/internalServer.cpp

@@ -99,16 +99,6 @@ bool ipAvailable(const std::string addr)
   return false;
 }
 
-inline std::string normalizeRootUrl(std::string rootUrl)
-{
-  while ( !rootUrl.empty() && rootUrl.back() == '/' )
-    rootUrl.pop_back();
-
-  while ( !rootUrl.empty() && rootUrl.front() == '/' )
-    rootUrl = rootUrl.substr(1);
-  return rootUrl.empty() ? rootUrl : "/" + rootUrl;
-}
-
 std::string
 fullURL2LocalURL(const std::string& fullUrl, const std::string& rootLocation)
 {
@@ -440,7 +430,7 @@ InternalServer::InternalServer(LibraryPtr library,
                                std::string contentServerUrl) :
   m_addr(addr),
   m_port(port),
-  m_root(normalizeRootUrl(root)),
+  m_root(root),
   m_rootPrefixOfDecodedURL(m_root),
   m_nbThreads(nbThreads),
   m_multizimSearchLimit(multizimSearchLimit),

src/spelling_correction.cpp

@@ -43,15 +43,11 @@ std::vector<std::string> getAllTitles(const zim::Archive& a)
 void createXapianDB(std::string path, const zim::Archive& archive)
 {
   const int flags = Xapian::DB_BACKEND_GLASS|Xapian::DB_CREATE;
-  const auto tmpDbPath = path + ".tmp";
-  Xapian::WritableDatabase db(tmpDbPath, flags);
+  Xapian::WritableDatabase db(path, flags);
   for (const auto& t : getAllTitles(archive)) {
     db.add_spelling(t);
   }
   db.commit();
-  db.compact(path, Xapian::DBCOMPACT_SINGLE_FILE);
-  db.close();
-  std::filesystem::remove_all(tmpDbPath);
 }
 
 std::string spellingsDBPathForZIMArchive(std::filesystem::path cacheDirPath, const zim::Archive& a)
@@ -59,24 +55,27 @@ std::string spellingsDBPathForZIMArchive(std::filesystem::path cacheDirPath, con
   // The version of spellings DB must be updated each time an important change
   // to the implementation is made that renders using the previous version
   // impossible or undesirable.
-  const char SPELLINGS_DB_VERSION[] = "0.1";
+  const char SPELLINGS_DB_VERSION[] = "0.2";
 
   std::ostringstream filename;
   filename << a.getUuid() << ".spellingsdb.v" << SPELLINGS_DB_VERSION;
   return (cacheDirPath / filename.str()).string();
 }
 
-std::unique_ptr<Xapian::Database> openOrCreateXapianDB(std::filesystem::path cacheDirPath, const zim::Archive& archive)
+std::unique_ptr<Xapian::WritableDatabase> openOrCreateXapianDB(std::filesystem::path cacheDirPath, const zim::Archive& archive)
 {
   const auto path = spellingsDBPathForZIMArchive(cacheDirPath, archive);
   try
   {
-    return std::make_unique<Xapian::Database>(path);
+    {
+      Xapian::Database checkIfDbAlreadyExists(path);
+    }
+    return std::make_unique<Xapian::WritableDatabase>(path);
   }
   catch (const Xapian::DatabaseOpeningError& )
   {
     createXapianDB(path, archive);
-    return std::make_unique<Xapian::Database>(path);
+    return std::make_unique<Xapian::WritableDatabase>(path);
   }
 }
 
@@ -93,15 +92,23 @@ SpellingsDB::~SpellingsDB()
 
 std::vector<std::string> SpellingsDB::getSpellingCorrections(const std::string& word, uint32_t maxCount) const
 {
-  if ( maxCount > 1 ) {
-    throw std::runtime_error("More than one spelling correction was requested");
+  std::vector<std::string> result;
+  while ( result.size() < maxCount ) {
+    const auto term = impl_->get_spelling_suggestion(word, 3);
+    if ( term.empty() )
+      break;
+
+    result.push_back(term);
+
+    // temporarily remove this term so that another spellings could be obtained
+    impl_->remove_spelling(term);
   }
 
-  std::vector<std::string> result;
-  const auto term = impl_->get_spelling_suggestion(word, 3);
-  if ( !term.empty() ) {
-    result.push_back(term);
+  // restore temporarily removed terms
+  for (const auto& t : result) {
+    impl_->add_spelling(t);
   }
+
   return result;
 }
 

static/skin/i18n/ar.json

@@ -9,6 +9,7 @@
 			"محمد أحمد عبد الفتاح"
 		]
 	},
+	"name": "الإنجليزية",
 	"no-such-book": "لا يوجد مثل هذا الكتاب: {{BOOK_NAME}}",
 	"too-many-books": "طلب العديد من الكتب {{NB_BOOKS}} حيث الحد {{LIMIT}}",
 	"no-book-found": "لا يوجد كتاب يطابق معايير الاختيار",

static/skin/i18n/bn.json

@@ -5,6 +5,7 @@
 			"আফতাবুজ্জামান"
 		]
 	},
+	"name": "বাংলা",
 	"404-page-heading": "পাওয়া যায়নি",
 	"new-404-page-title": "পাতা পাওয়া যায়নি",
 	"new-404-page-heading": "ওহ! পাতা খুঁজে পাওয়া যায়নি",

static/skin/i18n/br.json

@@ -5,6 +5,7 @@
 			"Y-M D"
 		]
 	},
+	"name": "brezhoneg",
 	"suggest-full-text-search": "E lec'h emañ \"{{{SEARCH_TERMS}}}\"...",
 	"no-such-book": "N’eus ket eus al levr-mañ: {{BOOK_NAME}}",
 	"no-book-found": "N’eus levr ebet a glot gant an dezverkoù-se",

static/skin/i18n/cs.json

@@ -4,6 +4,7 @@
 			"Spotter"
 		]
 	},
+	"name": "Čeština",
 	"suggest-full-text-search": "obsahující '{{{SEARCH_TERMS}}}'...",
 	"no-such-book": "Žádná taková kniha: {{BOOK_NAME}}",
 	"too-many-books": "Bylo požadováno příliš mnoho knih ({{NB_BOOKS}}), kde je limit {{LIMIT}}",

static/skin/i18n/dag.json

@@ -5,6 +5,7 @@
 			"Ruky Wunpini"
 		]
 	},
+	"name": "Silimiinsili",
 	"suggest-full-text-search": "Gbubi la '{{{SEARCH_TERMS}}}'...",
 	"no-such-book": "Lala buku kani:{{BOOK_NAME}}",
 	"too-many-books": "Buku nima pam ka bɛ daa suhi ({{NB_BOOKS}}) din ni ka tariga nyɛ {{LIMIT}}",

static/skin/i18n/de.json

@@ -10,6 +10,7 @@
 			"ThisCarthing"
 		]
 	},
+	"name": "Deutsch",
 	"suggest-full-text-search": "enthält '{{{SEARCH_TERMS}}}'...",
 	"no-such-book": "Buch nicht gefunden: {{BOOK_NAME}}",
 	"too-many-books": "Zu viele Bücher angefragt ({{NB_BOOKS}}), die Beschränkung liegt bei {{LIMIT}}",

static/skin/i18n/el.json

@@ -1,12 +1,18 @@
 {
 	"@metadata": {
 		"authors": [
+			"Jimkats",
 			"Kelson",
 			"Norhorn",
 			"Ανώνυμος Βικιπαιδιστής"
 		]
 	},
+	"name": "Αγγλικά",
+	"suggest-full-text-search": "περιέχει '{{{SEARCH_TERMS}}}'...",
 	"no-such-book": "Δεν υπάρχει τέτοιο βιβλίο: {{BOOK_NAME}}",
+	"caution-warning": "Προσοχή!",
+	"search-result-book-info": "από {{BOOK_TITLE}}",
+	"word-count": "{{COUNT}} λέξεις",
 	"welcome-page-overzealous-filter": "Κανένα αποτέλεσμα. Θέλετε να <a href=\"{{URL}}\">επαναφέρετε το φίλτρο</a>;",
 	"powered-by-kiwix-html": "Με την υποστήριξη by&nbsp;<a href=\"https://kiwix.org\">Kiwix</a>",
 	"search": "Αναζήτηση",
@@ -18,10 +24,10 @@
 	"direct-download-alt-text": "άμεση λήψη",
 	"hash-download-alt-text": "λήψη αναγνωριστικού",
 	"magnet-alt-text": "λήψη μαγνήτη",
-	"torrent-download-link-text": "Αρχείο torrent",
-	"torrent-download-alt-text": "λήψη torrent",
-	"filter-by-tag": "Φίλτρο ανά ετικέτα \"{{TAG}}\"",
-	"stop-filtering-by-tag": "Διακοπή φίλτρου ανά ετικέτα \"{{TAG}}\"",
+	"torrent-download-link-text": "BitTorrent",
+	"torrent-download-alt-text": "Λήψη μέσω BitTorrent",
+	"filter-by-tag": "Φιλτράρισμα κατά ετικέτα \"{{{TAG}}}\"",
+	"stop-filtering-by-tag": "Διακοπή φιλτραρίσματος κατά ετικέτα \"{{{TAG}}}\"",
 	"welcome-to-kiwix-server": "Καλώς ορίσατε στον διακομιστή Kiwix",
 	"download-links-heading": "Λήψη συνδέσμων για <b><i>{{BOOK_TITLE}}</i></b>",
 	"download-links-title": "Κατεβάστε το βιβλίο",

static/skin/i18n/en.json

@@ -3,6 +3,7 @@
 		"authors": [
 		]
 	},
+	"name":"English",
 	"suggest-full-text-search" : "containing '{{{SEARCH_TERMS}}}'..."
 	, "no-such-book" : "No such book: {{BOOK_NAME}}"
 	, "too-many-books" : "Too many books requested ({{NB_BOOKS}}) where limit is {{LIMIT}}"

static/skin/i18n/es.json

@@ -10,6 +10,7 @@
 			"Vis4valentine"
 		]
 	},
+	"name": "Español",
 	"suggest-full-text-search": "que contenga \"{{{SEARCH_TERMS}}}\"...",
 	"no-such-book": "No existe el libro: {{BOOK_NAME}}",
 	"too-many-books": "Demasiadas solicitudes de libros ({{NB_BOOKS}}) donde el límite es {{LIMIT}}",

static/skin/i18n/fi.json

@@ -7,6 +7,7 @@
 			"Samoasambia"
 		]
 	},
+	"name": "suomi",
 	"suggest-full-text-search": "sisältää '{{{SEARCH_TERMS}}}'...",
 	"no-such-book": "Kirjaa {{BOOK_NAME}} ei ole olemassa",
 	"url-not-found": "Pyydettyä URL-osoitetta \"{{url}}\" ei löytynyt tältä palvelimelta.",

static/skin/i18n/fr.json

@@ -15,6 +15,7 @@
 			"Wladek92"
 		]
 	},
+	"name": "Français",
 	"suggest-full-text-search": "contenant « {{{SEARCH_TERMS}}} »...",
 	"no-such-book": "Aucun livre avec ce nom : {{BOOK_NAME}}",
 	"too-many-books": "Trop de livres demandés ({{NB_BOOKS}}) alors que la limite est de {{LIMIT}}",

static/skin/i18n/ha.json

@@ -8,6 +8,7 @@
 			"Yusuf Sa'adu"
 		]
 	},
+	"name": "Turanci",
 	"suggest-full-text-search": "dauke da ''{{{SEARCH_TERMS}}}''...",
 	"no-such-book": "Babu irin wannan littafin: {{BOOK_NAME}}",
 	"too-many-books": "An nemi littattafai da yawa ({{NB_BOOKS}}) inda iyaka shine {{LIMIT}}",

static/skin/i18n/he.json

@@ -5,6 +5,7 @@
 			"YaronSh"
 		]
 	},
+	"name": "עברית",
 	"suggest-full-text-search": "מכיל '{{{SEARCH_TERMS}}}'...",
 	"no-such-book": "אין ספר כזה: {{BOOK_NAME}}",
 	"too-many-books": "נתבקשו יותר ספרים ({{NB_BOOKS}}) והמגבלה היא {{LIMIT}}",

static/skin/i18n/hi.json

@@ -5,6 +5,7 @@
 			"Juuz0"
 		]
 	},
+	"name": "हिन्दी",
 	"suggest-full-text-search": "जिसमें '{{{SEARCH_TERMS}}}' शामिल है...",
 	"no-such-book": "ऐसी कोई किताब नहीं: {{BOOK_NAME}}",
 	"too-many-books": "बहुत सारी पुस्तकों का अनुरोध किया गया है ({{NB_BOOKS}}) जहां सीमा {{LIMIT}} है",

static/skin/i18n/hu.json

@@ -5,6 +5,7 @@
 			"Urbalazs"
 		]
 	},
+	"name": "Magyar",
 	"400-page-title": "Érvénytelen kérés",
 	"400-page-heading": "Érvénytelen kérés",
 	"404-page-title": "A tartalom nem található",

static/skin/i18n/hy.json

@@ -4,6 +4,7 @@
 			"Kareyac"
 		]
 	},
+	"name": "Հայերեն",
 	"suggest-full-text-search": "որոնել '{{{SEARCH_TERMS}}}'...",
 	"no-such-book": "Գիրքը բացակայում է՝ {{BOOK_NAME}}",
 	"url-not-found": "Սխալ հասցե՝ {{url}}",

static/skin/i18n/ia.json

@@ -5,6 +5,7 @@
 			"McDutchie"
 		]
 	},
+	"name": "interlingua",
 	"suggest-full-text-search": "continente '{{{SEARCH_TERMS}}}'...",
 	"no-such-book": "Necun tal libro: {{BOOK_NAME}}",
 	"too-many-books": "Troppo de libros demandate ({{NB_BOOKS}}); le limite es {{LIMIT}}",

static/skin/i18n/id.json

@@ -4,6 +4,7 @@
 			"Akmaie Ajam"
 		]
 	},
+	"name": "Bahasa Inggris",
 	"suggest-full-text-search": "mengandung '{{{SEARCH_TERMS}}}'...",
 	"no-such-book": "Tidak ada buku seperti ini: {{BOOK_NAME}}",
 	"too-many-books": "Terlalu banyak buku yang diminta ({{NB_BOOKS}}) dimana batasnya adalah {{LIMIT}}",

static/skin/i18n/ig.json

@@ -6,6 +6,7 @@
 			"Oby Ezeilo"
 		]
 	},
+	"name": "Bekee",
 	"suggest-full-text-search": "nwere {{{SEARCH_TERMS}}}'",
 	"no-such-book": "Enweghị akwụkwọ dị otú a: {{BOOK_NAME}}",
 	"too-many-books": "Arịrịọ ọtụtụ akwụkwọ ({{NB_BOOKS}}) ebe oke bụ {{LIMIT}}",

static/skin/i18n/it.json

@@ -9,6 +9,7 @@
 			"Wheelygay"
 		]
 	},
+	"name": "italiano",
 	"suggest-full-text-search": "contenente '{{{SEARCH_TERMS}}}'...",
 	"no-such-book": "Nessun libro con questo nome: {{BOOK_NAME}}",
 	"too-many-books": "Troppi libri richiesti ({{NB_BOOKS}}) dove il limite è {{LIMIT}}",

static/skin/i18n/ja.json

@@ -5,6 +5,7 @@
 			"もなー(偽物)"
 		]
 	},
+	"name": "日本語",
 	"no-query": "クエリを指定していません。",
 	"400-page-title": "無効なリクエストです",
 	"400-page-heading": "無効なリクエストです",

static/skin/i18n/ko.json

@@ -5,6 +5,7 @@
 			"Ykhwong"
 		]
 	},
+	"name": "한국어",
 	"suggest-full-text-search": "'{{{SEARCH_TERMS}}}' 포함...",
 	"no-such-book": "해당 책이 없습니다: {{BOOK_NAME}}",
 	"too-many-books": "요청된 책이 너무 많습니다. ({{NB_BOOKS}}) 한도는 {{LIMIT}}입니다.",

static/skin/i18n/ku-latn.json

@@ -4,6 +4,7 @@
 			"Bikarhêner"
 		]
 	},
+	"name": "kurdî",
 	"suggest-full-text-search": "'{{{SEARCH_TERMS}}}' dihewîne...",
 	"no-such-book": "Kitêbeke wisa nîne: {{BOOK_NAME}}",
 	"too-many-books": "Pir zêde kitêb hatiye xwestin ({{NB_BOOKS}}) ku sînor {{LIMIT}} ye",

static/skin/i18n/lb.json

@@ -6,6 +6,7 @@
 			"Volvox"
 		]
 	},
+	"name": "Lëtzebuergesch",
 	"suggest-full-text-search": "enthält '{{{SEARCH_TERMS}}}'...",
 	"no-such-book": "Buch net fonnt: {{BOOK_NAME}}",
 	"too-many-books": "Ze vill Bicher ugefrot ({{NB_BOOKS}}), d'Limitt läit bei {{LIMIT}}",

static/skin/i18n/mk.json

@@ -5,6 +5,7 @@
 			"Kelson"
 		]
 	},
+	"name": "македонски",
 	"suggest-full-text-search": "содржи „{{{SEARCH_TERMS}}}“...",
 	"no-such-book": "Нема книга нарчена {{BOOK_NAME}}",
 	"too-many-books": "Побаравте премногу книги ({{NB_BOOKS}}). Ограничени сте на {{LIMIT}}",
@@ -25,10 +26,21 @@
 	"new-404-page-heading": "Ах! Страницата не е пронајдена.",
 	"404-img-text": "Не е најдено!",
 	"path-was-not-found": "Не ја најдов побараната патека:",
+	"404-advice.p1": "Содржината што ја барате може сепак да е достапна, но може да се наоѓа на друго место во рамките на ZIM-податотеката.",
+	"404-advice.p2": "Ве молиме:",
+	"404-advice.p3": "Пробајте да ја употребите функцијата за пребарување за да ја најдете содржината што ви треба",
+	"404-advice.p4": "Барајте клучни зборови или наслови поврзани со информациите што ви требаат",
+	"404-advice.p5": "Овој приод треба да ви помогне да ја најдете саканата содржина, дури и ако изворната врска не работи правилно.",
 	"500-page-title": "Внатрешна грешка во опслужувачот",
-	"500-page-heading": "Внатрешна грешка во опслужувачот",
-	"500-page-text": "Настана внатрешна грешка во опслужувачот. Жал ни е :/",
+	"500-page-heading": "Страницата не работи.",
+	"500-page-text": "Побараната патека не може правилно да се достави:",
+	"500-img-text": "Страницата не работи.",
+	"external-link-detected": "Најдена е надворешна врска",
 	"caution-warning": "Внимание!",
+	"external-link-intro": "На пат сте да го напуштите ZIM-читачот на Кивикс за да појдете на",
+	"external-link-advice.p1": "Врската што пробувате да ја отворите не е дел од вашиот вонмрежен пакет и бара семрежна врска.",
+	"external-link-advice.p2": "Ако можете да се поврзете со семрежнето, пробајте да ја отворите врската.",
+	"external-link-advice.p3": "Во спротивно можете повторно да пробате да ја отворите вонмрежната содржина на вашиот ZIM стискајќи на копчето за враќање назад на вашиот прелистувач.",
 	"fulltext-search-unavailable": "Целотекстното пребарување е недостапно",
 	"no-search-results": "Погонот за целотекстно пребарување не е достапен за оваа содржина.",
 	"search-results-page-title": "Пребарување: {{SEARCH_PATTERN}}",
@@ -37,9 +49,9 @@
 	"search-result-book-info": "од {{BOOK_TITLE}}",
 	"word-count": "{{COUNT}} зборови",
 	"library-button-text": "Оди на воведната страница",
-	"home-button-text": "Оди на главната страница на „{{BOOK_TITLE}}“",
+	"home-button-text": "Оди на главната страница на „{{{BOOK_TITLE}}}“",
 	"random-page-button-text": "Оди на случајно избрана страница",
-	"searchbox-tooltip": "Пребарај го „{{BOOK_TITLE}}“",
+	"searchbox-tooltip": "Пребарај по „{{{BOOK_TITLE}}}“",
 	"confusion-of-tongues": "Во пребарувањето ќе учествуваат две или повеќе книги на различни јазици, што може да довете до збунувачки исход.",
 	"welcome-page-overzealous-filter": "Нема исход. Дали би сакале да го <a href=\"{{URL}}\">поништите филтерот</a>?",
 	"powered-by-kiwix-html": "Овозможено од&nbsp;<a href=\"https://kiwix.org\">Кивикс</a>",

static/skin/i18n/ms.json

@@ -4,6 +4,7 @@
 			"Tofeiku"
 		]
 	},
+	"name": "Bahasa Melayu",
 	"404-page-heading": "Tidak Dijumpai",
 	"500-page-title": "Ralat Pelayan Dalaman",
 	"500-page-heading": "Ralat Pelayan Dalaman",

static/skin/i18n/nb.json

@@ -4,6 +4,7 @@
 			"TorgeirS"
 		]
 	},
+	"name": "Engelsk",
 	"suggest-full-text-search": "inneholder '{{{SEARCH_TERMS}}}'...",
 	"no-such-book": "Finner ingen slik bok: {{BOOK_NAME}}",
 	"too-many-books": "Det er forespurt for mange bøker {{NB_BOOKS}} der grensen er {{LIMIT}}",

static/skin/i18n/nl.json

@@ -8,6 +8,7 @@
 			"Vistaus"
 		]
 	},
+	"name": "Nederlands",
 	"suggest-full-text-search": "bevat ‘{{{SEARCH_TERMS}}}’…",
 	"no-such-book": "Boek bestaat niet: {{BOOK_NAME}}",
 	"too-many-books": "Er zijn teveel boeken opgevraagd ({{NB_BOOKS}}). De limiet is {{LIMIT}}.",

static/skin/i18n/nqo.json

@@ -4,6 +4,7 @@
 			"Lancine.kounfantoh.fofana"
 		]
 	},
+	"name": "ߒߞߏ",
 	"suggest-full-text-search": "ߞߣߐߞߍߣߍ߲߫ ߦߋ߫ '{{{SEARCH_TERMS}}}'...",
 	"no-such-book": "ߞߊ߬ߝߊ߫ ߛߎ߮ ߏ߬ ߕߴߦߋ߲߬: {{BOOK_NAME}}",
 	"too-many-books": "ߞߝߊ߬ ߛߌߦߊߡߊ߲߫ ߡߊߢߌ߬ߣߌ߲߬ߞߊ߬ߣߍ߲߫ ߞߏߖߎ߰ {{NB_BOOKS}} ߡߍ߲ ߞߐߘߊ߲ ߦߋ߫ {{LIMIT}} ߘߌ߫",

static/skin/i18n/or.json

@@ -5,6 +5,7 @@
 			"Psubhashish"
 		]
 	},
+	"name": "ଓଡ଼ିଆ",
 	"suggest-full-text-search": "${{{SEARCH_TERMS}}} ଧାରଣ କରିଛି ...",
 	"no-such-book": "ଏପରି କୌଣସି ପୁସ୍ତକ ନାହିଁଃ ${{BOOK_NAME}}",
 	"too-many-books": "ଅତ୍ୟଧିକ ବହି ଅନୁରୋଧ (${{NB_BOOKS}}) ଯେଉଁଠାରେ ସୀମା ${{LIMIT}} |",

static/skin/i18n/pl.json

@@ -5,6 +5,7 @@
 			"WaldiSt"
 		]
 	},
+	"name": "Polski",
 	"suggest-full-text-search": "zawierający '{{{SEARCH_TERMS}}}'...",
 	"no-such-book": "Brak takiej książki: {{BOOK_NAME}}",
 	"url-not-found": "Żądany adres URL „{{url}}” nie został znaleziony na tym serwerze.",

static/skin/i18n/pt-br.json

@@ -8,6 +8,7 @@
 			"YoReaper"
 		]
 	},
+	"name": "Português",
 	"suggest-full-text-search": "Contendo '{{{SEARCH_TERMS}}}'...",
 	"no-such-book": "Não existe o livro: {{BOOK_NAME}}",
 	"too-many-books": "Muitos livros solicitados {{NB_BOOKS}} mas o limite é {{LIMIT}}",

static/skin/i18n/pt.json

@@ -4,6 +4,7 @@
 			"B3rnas"
 		]
 	},
+	"name": "português",
 	"suggest-full-text-search": "contendo '{{{SEARCH_TERMS}}}'...",
 	"no-such-book": "Não existe o livro: {{BOOK_NAME}}",
 	"too-many-books": "Demasiadas solicitações de livros ({{NB_BOOKS}}) onde o limite é {{LIMIT}}",

static/skin/i18n/qqq.json

@@ -7,6 +7,7 @@
 			"Verdy p"
 		]
 	},
+	"name": "{{Doc-important|Don't write \"English\" in your language!}}\n\n'''Write the name of ''your'' language in its native script.'''\n\nCurrent language to which the string is being translated to.\n\nFor example, write \"français\" when translating to French, or \"Deutsch\" when translating to German.\n\n'''Important:''' Do not use your language’s word for “English”. Use the word that your language uses to refer to itself. If you translate this message to mean “English” in your language, your change will be reverted.",
 	"suggest-full-text-search": "Text appearing in the suggestion list that, when selected, runs a full text search instead of the title search",
 	"no-such-book": "Error text when the requested book is not found in the library",
 	"too-many-books": "Error text when user request more books than the limit set by the administrator",

static/skin/i18n/ro.json

@@ -5,6 +5,7 @@
 			"Trotinel Iftode"
 		]
 	},
+	"name": "Engleză",
 	"suggest-full-text-search": "care conține '{{{SEARCH_TERMS}}}'...",
 	"no-such-book": "Nu există o astfel de carte: {{BOOK_NAME}}",
 	"too-many-books": "Prea multe cărți solicitate ({{NB_BOOKS}}) unde limita este {{LIMIT}}",

static/skin/i18n/ru.json

@@ -11,6 +11,7 @@
 			"Smavrina"
 		]
 	},
+	"name": "русский",
 	"suggest-full-text-search": "содержащее '{{{SEARCH_TERMS}}}'...",
 	"no-such-book": "Такой книги нет: {{BOOK_NAME}}",
 	"too-many-books": "Запрошено слишком много книг ({{NB_BOOKS}}), максимальное количество — {{LIMIT}}.",

static/skin/i18n/sc.json

@@ -5,6 +5,7 @@
 			"L2212"
 		]
 	},
+	"name": "Sardu",
 	"suggest-full-text-search": "chi cuntenet '{{{SEARCH_TERMS}}}'...",
 	"no-such-book": "Perunu libru cun custu nùmene: {{BOOK_NAME}}",
 	"too-many-books": "Tropu libros pedidos, {{NB_BOOKS}} cando su lìmite est de {{LIMIT}}",

static/skin/i18n/sk.json

@@ -4,6 +4,7 @@
 			"Yardom78"
 		]
 	},
+	"name": "slovenčina",
 	"suggest-full-text-search": "obsahuje '{{{SEARCH_TERMS}}}'...",
 	"no-such-book": "Žiadna kniha ako: {{BOOK_NAME}}",
 	"too-many-books": "Príliš veľa požadovaných kníh ({{NB_BOOKS}}), limit je {{LIMIT}}",

static/skin/i18n/skr-arab.json

@@ -4,6 +4,7 @@
 			"Saraiki"
 		]
 	},
+	"name": "سرائیکی",
 	"400-page-title": "غلط ارداس",
 	"400-page-heading": "غلط ارداس",
 	"404-page-title": "مواد کائنی لبھیا",

static/skin/i18n/sl.json

@@ -6,6 +6,7 @@
 			"Rofiatmustapha12"
 		]
 	},
+	"name": "slovenščina",
 	"suggest-full-text-search": "vsebuje »{{{SEARCH_TERMS}}}« ...",
 	"no-such-book": "Ni take knjige: {{BOOK_NAME}}",
 	"too-many-books": "Preveč zahtevanih knjig ({{NB_BOOKS}}), omejitev je {{LIMIT}}",

static/skin/i18n/sq.json

@@ -4,6 +4,7 @@
 			"Besnik b"
 		]
 	},
+	"name": "Shqip",
 	"suggest-full-text-search": "që përmban '{{{SEARCH_TERMS}}}'…",
 	"no-such-book": "S’ka libër të tillë: {{BOOK_NAME}}",
 	"too-many-books": "U kërkuan shumë libra ({{NB_BOOKS}}), teksa kufiri është {{LIMIT}}",

static/skin/i18n/sv.json

@@ -1,6 +1,7 @@
 {
 	"@metadata": {
 		"authors": [
+			"Apq",
 			"Jopparn",
 			"Larsa",
 			"Rofiatmustapha12",
@@ -8,6 +9,7 @@
 			"WikiPhoenix"
 		]
 	},
+	"name": "Svenska",
 	"suggest-full-text-search": "innehåller '{{{SEARCH_TERMS}}}'...",
 	"no-such-book": "Ingen sådan bok: {{BOOK_NAME}}",
 	"too-many-books": "För många böcker begärda ({{NB_BOOKS}}) där gränsen är {{LIMIT}}",
@@ -24,9 +26,25 @@
 	"400-page-heading": "Ogiltig begäran",
 	"404-page-title": "Innehållet hittades inte",
 	"404-page-heading": "Hittades inte",
+	"new-404-page-title": "Sidan kunde inte hittas",
+	"new-404-page-heading": "Hoppsan. Sidan hittades inte.",
+	"404-img-text": "Hittades ej!",
+	"path-was-not-found": "Den begärda sökvägen hittades ej:",
+	"404-advice.p1": "Innehållet du letar efter kan fortfarande vara tillgängligt, men det kan finnas på en annan plats i ZIM-filen.",
+	"404-advice.p2": "Vänligen:",
+	"404-advice.p3": "Försök att använda sökfunktionen för att hitta det innehåll du vill ha",
+	"404-advice.p4": "Leta efter nyckelord eller titlar relaterade till den information du söker",
+	"404-advice.p5": "Den här metoden bör hjälpa dig att hitta önskat innehåll, även om den ursprungliga länken inte fungerar korrekt.",
 	"500-page-title": "Internt serverfel",
-	"500-page-heading": "Internt serverfel",
-	"500-page-text": "Ett internt serverfel uppstod. Vi ber om ursäkt för det :/",
+	"500-page-heading": "Hoppsan. Sidan fungerar inte.",
+	"500-page-text": "Den begärda sökvägen kan inte levereras korrekt:",
+	"500-img-text": "Sidan fungerar ej",
+	"external-link-detected": "Extern länk upptäckt",
+	"caution-warning": "Varning!",
+	"external-link-intro": "Du är på väg att lämna Kiwix ZIM-läsare för att gå online till",
+	"external-link-advice.p1": "Länken du försöker komma åt är inte en del av ditt offlinepaket och kräver en internetanslutning.",
+	"external-link-advice.p2": "Om du kan gå online kan du försöka öppna länken.",
+	"external-link-advice.p3": "Du kan annars återgå till ditt ZIM-innehåll offline genom att använda webbläsarens bakåtknapp.",
 	"fulltext-search-unavailable": "Fulltextsökning är inte tillgänglig",
 	"no-search-results": "Sökmaskinen för fulltext är inte tillgänglig för detta innehåll.",
 	"search-results-page-title": "Sök: {{SEARCH_PATTERN}}",
@@ -35,9 +53,9 @@
 	"search-result-book-info": "från {{BOOK_TITLE}}",
 	"word-count": "{{COUNT}} ord",
 	"library-button-text": "Gå till hemsidan",
-	"home-button-text": "Gå till huvudsidan för \"{{BOOK_TITLE}}\"",
+	"home-button-text": "Gå till huvudsidan för '{{{BOOK_TITLE}}}'",
 	"random-page-button-text": "Gå till en slumpmässigt utvald sida",
-	"searchbox-tooltip": "Sök efter \"{{BOOK_TITLE}}\"",
+	"searchbox-tooltip": "Sök '{{{BOOK_TITLE}}}'",
 	"confusion-of-tongues": "Två eller fler böcker på olika språk skulle delta i sökningen, vilket kan ge förvirrande resultat.",
 	"welcome-page-overzealous-filter": "Inga resultat. Vill du <a href=\"{{URL}}\">återställa filtret</a>?",
 	"powered-by-kiwix-html": "Drivs av&nbsp;<a href=\"https://kiwix.org\">Kiwix</a>",
@@ -72,5 +90,6 @@
 	"book-category.wikiversity": "Wikiversity",
 	"book-category.wikivoyage": "Wikivoyage",
 	"book-category.wiktionary": "Wiktionary",
-	"book-category.other": "Övriga"
+	"book-category.other": "Övriga",
+	"text-loading-content": "Laddar innehåll"
 }

static/skin/i18n/sw.json

@@ -7,6 +7,7 @@
 			"Wangombe"
 		]
 	},
+	"name": "Kiswahili",
 	"suggest-full-text-search": "ina '{{{SEARCH_TERMS}}}}'...",
 	"no-such-book": "Hakuna kitabu kama hiki: {{BOOK_NAME}}",
 	"too-many-books": "Vitabu vingi mno vimeombwa ({{NB_BOOKS}}) ambapo kikomo ni {{LIMIT}}",

static/skin/i18n/te.json

@@ -6,6 +6,7 @@
 			"V Bhavya"
 		]
 	},
+	"name": "ఇంగ్లీషు",
 	"suggest-full-text-search": "'{{{SEARCH_TERMS}}}'ని కలిగి ఉంది...",
 	"no-such-book": "అలాంటి పుస్తకం లేదు: {{BOOK_NAME}}",
 	"too-many-books": "పరిమితి {{LIMIT}} ఉన్న చాలా పుస్తకాలు అభ్యర్థించబడ్డాయి ({{NB_BOOKS}})",

static/skin/i18n/test.json

@@ -4,6 +4,7 @@
 			"Kareyac"
 		]
 	},
+	"name": "Fake language for i18n testing"
 	, "suggest-full-text-search": "[I18N TESTING] cOnTaInInG '{{{SEARCH_TERMS}}}'..."
 	, "no-such-book": "[I18N TESTING] No such book: {{BOOK_NAME}}. Sorry."
 	, "url-not-found": "[I18N TESTING] URL not found: {{url}}"

static/skin/i18n/tr.json

@@ -2,9 +2,11 @@
 	"@metadata": {
 		"authors": [
 			"Hedda",
-			"Rofiatmustapha12"
+			"Rofiatmustapha12",
+			"SaldırganSincap"
 		]
 	},
+	"name": "Türkçe",
 	"suggest-full-text-search": "'{{{SEARCH_TERMS}}}' içeriyor...",
 	"no-such-book": "Böyle bir kitap yok: {{BOOK_NAME}}",
 	"too-many-books": "Sınır {{LIMIT}} olduğunda çok fazla ({{NB_BOOKS}}) kitap istendi",
@@ -22,8 +24,8 @@
 	"404-page-title": "içerik bulunamadı",
 	"404-page-heading": "Bulunamadı",
 	"500-page-title": "İç Sunucu Hatası",
-	"500-page-heading": "İç Sunucu Hatası",
-	"500-page-text": "Dahili bir sunucu hatası oluştu. Bunun için üzgünüz :/",
+	"500-page-heading": "Üzgünüz. Sayfa çalışmıyor.",
+	"500-page-text": "İstenen yol düzgün bir şekilde teslim edilemiyor:",
 	"fulltext-search-unavailable": "Tam metin araması kullanılamıyor",
 	"no-search-results": "Tam metin arama motoru bu içerik için kullanılamaz.",
 	"search-results-page-title": "Arama: {{SEARCH_PATTERN}}",
@@ -32,9 +34,9 @@
 	"search-result-book-info": "{{BOOK_TITLE}} adlı kitaptan",
 	"word-count": "{{COUNT}} kelime",
 	"library-button-text": "Karşılama sayfasına git",
-	"home-button-text": "'{{BOOK_TITLE}}' anasayfasına gidin",
+	"home-button-text": "'{{{BOOK_TITLE}}}' ana sayfasına git",
 	"random-page-button-text": "Rastgele seçilen bir sayfaya git",
-	"searchbox-tooltip": "'{{BOOK_TITLE}}' ara",
+	"searchbox-tooltip": "'{{{BOOK_TITLE}}}' ara",
 	"confusion-of-tongues": "Aramaya farklı dillerde iki veya daha fazla kitap katılacak ve bu da kafa karıştırıcı sonuçlara yol açabilecektir.",
 	"welcome-page-overzealous-filter": "Sonuç yok. <a href=\"{{URL}}\">Filtreyi sıfırlamak</a> ister misiniz?",
 	"powered-by-kiwix-html": "<a href=\"https://kiwix.org\">Kiwix</a> tarafından desteklenmektedir",
@@ -44,16 +46,16 @@
 	"count-of-matching-books": "{{COUNT}} kitap",
 	"download": "İndir",
 	"direct-download-link-text": "Doğrudan",
-	"direct-download-alt-text": "direkt indirme",
-	"hash-download-link-text": "Sha256 haşesi",
-	"hash-download-alt-text": "csv indir",
+	"direct-download-alt-text": "Doğrudan HTTP(S) üzerinden indir",
+	"hash-download-link-text": "SHA-256 sağlama toplamı",
+	"hash-download-alt-text": "SHA-256 dosya toplam kontrolünü görüntüle",
 	"magnet-link-text": "Mıknatıs bağlantısı",
-	"magnet-alt-text": "mıknatısı indir",
-	"torrent-download-link-text": "Hedef dosya",
-	"torrent-download-alt-text": "torrenti indir",
+	"magnet-alt-text": "Mıknatıs bağlantısıyla indir",
+	"torrent-download-link-text": "BitTorrent",
+	"torrent-download-alt-text": "BitTorrent üzerinden indir",
 	"library-opds-feed-all-entries": "Kütüphane OPDS Akışı - Tüm girişler",
-	"filter-by-tag": "\"{{TAG}}\" etiketine göre filtrele",
-	"stop-filtering-by-tag": "\"{{TAG}}\" etiketine göre filtrelemeyi durdur",
+	"filter-by-tag": "\"{{{TAG}}}\" etiketine göre filtrele",
+	"stop-filtering-by-tag": "\"{{{TAG}}}\" etiketine göre filtrelemeyi durdur",
 	"library-opds-feed-parameterised": "Kütüphane OPDS Özet Akışı - {{#LANG}}\nLanguage: {{LANG}} {{/LANG}}{{#CATEGORY}}\nCategory: {{CATEGORY}} {{/CATEGORY}} ile eşleşen girişler {{#TAG}}\nTag: {{TAG}} {{/TAG}}{{#Q}}\nQuery: {{Q}} {{/Q}}",
 	"welcome-to-kiwix-server": "Kiwix Sunucusuna Hoş Geldiniz",
 	"download-links-heading": "<b><i>{{BOOK_TITLE}}</i></b> için indirme bağlantıları",

static/skin/i18n/zh-hans.json

@@ -1,6 +1,7 @@
 {
 	"@metadata": {
 		"authors": [
+			"Cyanjiang",
 			"GuoPC",
 			"IceButBin",
 			"Kichin",
@@ -12,6 +13,7 @@
 			"沈澄心"
 		]
 	},
+	"name": "简体中文",
 	"suggest-full-text-search": "正在查找「{{{SEARCH_TERMS}}}」…",
 	"no-such-book": "没有名为“{{BOOK_NAME}}”的图书",
 	"too-many-books": "请求的图书过多 ({{NB_BOOKS}})，上限为 {{LIMIT}}",
@@ -28,9 +30,25 @@
 	"400-page-heading": "无效请求",
 	"404-page-title": "未找到内容",
 	"404-page-heading": "未找到",
+	"new-404-page-title": "找不到页面",
+	"new-404-page-heading": "哎呀。页面未找到。",
+	"404-img-text": "未找到！",
+	"path-was-not-found": "未找到请求的路径：",
+	"404-advice.p1": "您正在寻找的内容可能仍然可用，但它可能位于 ZIM 文件中的不同位置。",
+	"404-advice.p2": "请：",
+	"404-advice.p3": "尝试使用搜索功能来查找您想要的内容",
+	"404-advice.p4": "查找与你正在寻找的信息相关的关键字或标题",
+	"404-advice.p5": "即使原始链接无法正常工作，这种方法也应该可以帮助您找到所需的内容。",
 	"500-page-title": "内部服务器错误",
-	"500-page-heading": "内部服务器错误",
-	"500-page-text": "内部服务器出现错误。真的十分抱歉 (⁠;⁠ŏ⁠﹏⁠ŏ~⁠)",
+	"500-page-heading": "哎呀。页面无法正常工作。",
+	"500-page-text": "请求的路径无法正确传递：",
+	"500-img-text": "页面无法正常工作",
+	"external-link-detected": "检测到外部链接",
+	"caution-warning": "警告！",
+	"external-link-intro": "你即将离开Kiwix的ZIM阅读器并打开网页",
+	"external-link-advice.p1": "你试图访问的链接不在你的离线包中，需要联网才能访问。",
+	"external-link-advice.p2": "如果您可以上网，您可以尝试打开该链接。",
+	"external-link-advice.p3": "您也可以使用浏览器的后退按钮返回 ZIM 的离线内容。",
 	"fulltext-search-unavailable": "全文搜索不可用",
 	"no-search-results": "全文搜索引擎不适用于该内容。",
 	"search-results-page-title": "搜索：{{SEARCH_PATTERN}}",

static/skin/i18n/zh-hant.json

@@ -6,6 +6,7 @@
 			"Winston Sung"
 		]
 	},
+	"name": "繁體中文",
 	"suggest-full-text-search": "正在包含「{{{SEARCH_TERMS}}}」…",
 	"no-such-book": "沒有這樣的書籍：{{BOOK_NAME}}",
 	"too-many-books": "請求太多個書籍（{{NB_BOOKS}}），上限是 {{LIMIT}} 個",

static/skin/viewer.js

@@ -271,10 +271,12 @@ function translateErrorPageIfNeeded() {
 let iframeLocationHref = null;
 
 function handle_content_url_change() {
-  if ( iframeLocationHref == contentIframe.contentWindow.location.href )
+  const iframeLocation = contentIframe.contentWindow.location;
+
+  if ( iframeLocationHref == iframeLocation.href ||
+       !iframeLocation.pathname.startsWith(root + '/content/') )
     return;
 
-  const iframeLocation = contentIframe.contentWindow.location;
   iframeLocationHref = iframeLocation.href;
   console.log('handle_content_url_change: ' + iframeLocation.href);
   document.title = contentIframe.contentDocument.title;
@@ -431,8 +433,6 @@ function setup_chaperon_mode() {
   }
 }
 
-let viewerSetupComplete = false;
-
 function on_content_load() {
   const loader = document.getElementById("kiwix__loader");
 
@@ -588,6 +588,7 @@ function setupViewer() {
 
   const kiwixToolBarWrapper = document.getElementById('kiwixtoolbarwrapper');
   if ( ! viewerSettings.toolbarEnabled ) {
+    finishViewerSetup();
     return;
   }
 
@@ -636,10 +637,13 @@ function updateUIText() {
 function finishViewerSetupOnceTranslationsAreLoaded()
 {
   updateUIText();
+  finishViewerSetup();
+}
+
+function finishViewerSetup()
+{
   handle_location_hash_change();
 
   window.onhashchange = handle_location_hash_change;
   window.onpopstate = handle_history_state_change;
-
-  viewerSetupComplete = true;
 }

static/templates/search_result.html

@@ -117,7 +117,7 @@
               {{title}}
             </a>
             {{#snippet}}
-              <cite>{{>snippet}}...</cite>
+              <cite>{{{snippet}}}...</cite>
             {{/snippet}}
             {{#bookInfo}}
               <div class="book-title">{{{bookInfo}}}</div>

static/templates/search_result.xml

@@ -21,7 +21,7 @@
       <title>{{title}}</title>
       <link>{{absolutePath}}</link>
       {{#snippet}}
-        <description>{{>snippet}}...</description>
+        <description>{{{snippet}}}...</description>
       {{/snippet}}
       {{#bookTitle}}
         <book>

test/server.cpp

@@ -77,7 +77,7 @@ const ResourceCollection resources200Compressible{
   { DYNAMIC_CONTENT, "/ROOT%23%3F/skin/taskbar.css" },
   { STATIC_CONTENT,  "/ROOT%23%3F/skin/taskbar.css?cacheid=42e90cb9" },
   { DYNAMIC_CONTENT, "/ROOT%23%3F/skin/viewer.js" },
-  { STATIC_CONTENT,  "/ROOT%23%3F/skin/viewer.js?cacheid=3208c3ed" },
+  { STATIC_CONTENT,  "/ROOT%23%3F/skin/viewer.js?cacheid=00e0fdf3" },
   { DYNAMIC_CONTENT, "/ROOT%23%3F/skin/fonts/Poppins.ttf" },
   { STATIC_CONTENT,  "/ROOT%23%3F/skin/fonts/Poppins.ttf?cacheid=af705837" },
   { DYNAMIC_CONTENT, "/ROOT%23%3F/skin/fonts/Roboto.ttf" },
@@ -338,7 +338,7 @@ R"EXPECTEDRESULT(    <link type="text/css" href="./skin/kiwix.css?cacheid=b4e29e
     <script type="text/javascript" src="./skin/polyfills.js?cacheid=a0e0343d"></script>
     <script type="module" src="./skin/i18n.js?cacheid=e9a10ac1" defer></script>
     <script type="text/javascript" src="./skin/languages.js?cacheid=08955948" defer></script>
-    <script type="text/javascript" src="./skin/viewer.js?cacheid=3208c3ed" defer></script>
+    <script type="text/javascript" src="./skin/viewer.js?cacheid=00e0fdf3" defer></script>
     <script type="text/javascript" src="./skin/autoComplete/autoComplete.min.js?cacheid=1191aaaf"></script>
       const blankPageUrl = root + "/skin/blank.html?cacheid=6b1fa032";
           <label for="kiwix_button_show_toggle"><img src="./skin/caret.png?cacheid=22b942b4" alt=""></label>

test/spelling_correction.cpp

@@ -173,8 +173,7 @@ void testSpellingCorrections(const kiwix::SpellingsDB& spellingsDB)
   EXPECT_SPELLING_CORRECTION("Loremipsum", 1, ({"Lorem ipsum"}));
 
   // Only one spelling correction can be requested
-  // EXPECT_SPELLING_CORRECTION("Kung",  2, ({"King", "Kong"}));
-  EXPECT_THROW(spellingsDB.getSpellingCorrections("Kung", 2), std::runtime_error);
+  EXPECT_SPELLING_CORRECTION("Kung",  2, ({"King", "Kong"}));
 }
 
 using StrCollection = std::vector<std::string>;
@@ -190,21 +189,21 @@ StrCollection directoryEntries(std::filesystem::path dirPath)
 
 TEST_F(SpellingCorrectionTest, allInOne)
 {
-  const auto tmpDirModTime0 = std::filesystem::last_write_time(tmpDirPath);
+  //const auto tmpDirModTime0 = std::filesystem::last_write_time(tmpDirPath);
   ASSERT_TRUE(directoryEntries(tmpDirPath).empty());
   {
     const kiwix::SpellingsDB spellingsDB(*archive, tmpDirPath);
     testSpellingCorrections(spellingsDB);
   }
 
-  const auto tmpDirModTime1 = std::filesystem::last_write_time(tmpDirPath);
+  //const auto tmpDirModTime1 = std::filesystem::last_write_time(tmpDirPath);
 
-  const auto spellingsDbPath = tmpDirPath / "554c9707-897e-097a-53ba-1b1306d8bb88.spellingsdb.v0.1";
+  const auto spellingsDbPath = tmpDirPath / "554c9707-897e-097a-53ba-1b1306d8bb88.spellingsdb.v0.2";
 
   const StrCollection EXPECTED_DIR_CONTENT{ spellingsDbPath.string() };
   ASSERT_EQ(directoryEntries(tmpDirPath), EXPECTED_DIR_CONTENT);
-  ASSERT_LT(tmpDirModTime0, tmpDirModTime1);
-  const auto fileModTime = std::filesystem::last_write_time(spellingsDbPath);
+  //ASSERT_LT(tmpDirModTime0, tmpDirModTime1);
+  //const auto fileModTime = std::filesystem::last_write_time(spellingsDbPath);
 
   {
     const kiwix::SpellingsDB spellingsDB(*archive, tmpDirPath);
@@ -212,6 +211,6 @@ TEST_F(SpellingCorrectionTest, allInOne)
   }
 
   ASSERT_EQ(directoryEntries(tmpDirPath), EXPECTED_DIR_CONTENT );
-  ASSERT_EQ(tmpDirModTime1, std::filesystem::last_write_time(tmpDirPath));
-  ASSERT_EQ(fileModTime,    std::filesystem::last_write_time(spellingsDbPath));
+  //ASSERT_EQ(tmpDirModTime1, std::filesystem::last_write_time(tmpDirPath));
+  //ASSERT_EQ(fileModTime,    std::filesystem::last_write_time(spellingsDbPath));
 }