Merge pull request #678 from kiwix/issue/676

Proper human friendly URLs for kiwix-serve
This commit is contained in:
Matthieu Gautier 2021-09-01 08:42:40 +02:00 committed by GitHub
commit a66618c690
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions

View File

@ -24,7 +24,8 @@ KiwixApp::KiwixApp(int& argc, char *argv[])
mp_downloader(nullptr), mp_downloader(nullptr),
mp_manager(nullptr), mp_manager(nullptr),
mp_mainWindow(nullptr), mp_mainWindow(nullptr),
m_server(&m_library.getKiwixLibrary()) m_nameMapper(m_library.getKiwixLibrary(), false),
m_server(&m_library.getKiwixLibrary(), &m_nameMapper)
{ {
try { try {
m_translation.setTranslation(QLocale()); m_translation.setTranslation(QLocale());

View File

@ -16,6 +16,7 @@
#include <QApplication> #include <QApplication>
#include <QErrorMessage> #include <QErrorMessage>
#include <QTranslator> #include <QTranslator>
#include <kiwix/name_mapper.h>
class KiwixApp : public QtSingleApplication class KiwixApp : public QtSingleApplication
@ -115,6 +116,7 @@ private:
TabBar* mp_tabWidget; TabBar* mp_tabWidget;
SideBarType m_currentSideType; SideBarType m_currentSideType;
QErrorMessage* mp_errorDialog; QErrorMessage* mp_errorDialog;
kiwix::HumanReadableNameMapper m_nameMapper;
kiwix::Server m_server; kiwix::Server m_server;
Translation m_translation; Translation m_translation;