nas/wikipp
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fix default lang redirection

Browse source
This commit is contained in:
nas 2021-03-24 13:23:40 +01:00
commit a6bad544a8
4 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -101,7 +101,7 @@ target_link_libraries(wikipp ${BOOSTER} ${CPPCMS} ${CPPDB} ${DISCOUNT})
# Localization
set(LOCALES he ru pl)
set(LOCALES he ru pl fr)
set(MO_FILES)
set(UPDATE_PO_LIST)

2
src/master.cpp
View file

@ -120,7 +120,7 @@ master::master(wiki &_w) :
lname=p->first;
}
}
languages[lname]=settings().get<std::string>("wikipp.script") +"/"+ p->first.str();
languages[lname]=settings().get<std::string>("wikipp.script") +"/"+ settings().get<std::string>("wikipp.language_default");
}
media=settings().get<std::string>("wikipp.media");
syntax_highlighter=settings().get("wikipp.syntax_highlighter","");

6
src/wiki.cpp
View file

@ -24,6 +24,7 @@ wiki::wiki(cppcms::service &srv) :
for(cppcms::json::object::const_iterator p=langs.begin();p!=langs.end();++p) {
lang_map[p->first]=p->second.str();
}
this->language_default = settings().at("wikipp.language_default").str();
}
std::string wiki::root(std::string l)
@ -41,7 +42,8 @@ void wiki::main(std::string url)
if(booster::regex_match(url,res,lang_regex)) {
std::map<std::string,std::string>::const_iterator p = lang_map.find(std::string(res[1]));
if(p==lang_map.end()) {
page.redirect();
locale_name = this->language_default ;
page.redirect( this->language_default );
}
else {
locale_name = p->first;
@ -51,7 +53,7 @@ void wiki::main(std::string url)
}
}
else
page.redirect();
page.redirect( this->language_default );
}

3
src/wiki.h
View file

@ -31,7 +31,8 @@ public:
apps::options options;
apps::users users;
apps::index index;
std::string language_default;
std::string root(std::string locale_name="");
bool set_locale(std::string);
void run(std::string lang,std::string url);