Metastem/wikiless
1
0
Fork 0
mirror of https://github.com/Metastem/wikiless synced 2024-12-06 19:16:58 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(utils): load fr-specific style

Browse Source 
- #12
This commit is contained in:
Ming Di Leom
2021-12-14 11:05:28 +00:00
parent cea651e0c6
commit feb7e0f770
3 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/utils.js
+12 -11
View File
@@ -66,24 +66,25 @@ module.exports = function(redis) {
})
}
this.applyUserMods = (data, user_preferences) => {
this.applyUserMods = (data, theme, lang) => {
/**
* We have already processed the HTML, but we haven't applied the user's
* cookie specific modifications to it yet. Let's do it.
*/
if(user_preferences.theme === 'white') {
// load fr style, issue #12
const langSuffix = `_${lang}` ? lang === 'fr' : ''
if(theme === 'white') {
// if the user has chosen the white theme from the preferences
data = data.replace('</head>', `<link rel="stylesheet" href="/wikipedia_styles_light.css"></head>`)
}
if(user_preferences.theme === 'dark') {
data = data.replace('</head>', `<link rel="stylesheet" href="/wikipedia_styles_light${langSuffix}.css"></head>`)
} else if(theme === 'dark') {
// if the user has chosen the dark theme from the preferences
data = data.replace('</head>', `<link rel="stylesheet" href="/wikipedia_styles_light.css">
data = data.replace('</head>', `<link rel="stylesheet" href="/wikipedia_styles_light${langSuffix}.css">
<link rel="stylesheet" href="/wikipedia_styles_dark.css"></head>`)
}
if(user_preferences.theme !== 'dark' && user_preferences.theme !== 'white') {
} else {
// default, auto theme
data = data.replace('</head>', `<link rel="stylesheet" href="/styles.css"></head>`)
data = data.replace('</head>', `<link rel="stylesheet" href="/styles${langSuffix}.css"></head>`)
}
return data
@@ -391,11 +392,11 @@ module.exports = function(redis) {
}
if(result.processed === true) {
return res.send(applyUserMods(result.html, req.cookies))
return res.send(applyUserMods(result.html, req.cookies.theme, lang))
} else {
let process_html = await processHtml(result, url, params, lang, req.cookies)
if(process_html.success === true) {
return res.send(applyUserMods(process_html.html.toString(), req.cookies))
return res.send(applyUserMods(process_html.html.toString(), req.cookies.theme, lang))
} else {
return res.status(500).send(process_html.reason)
}
static/styles_fr.css
+2
View File
@@ -0,0 +1,2 @@
@import "wikipedia_styles_light_fr.css";
@import "wikipedia_styles_dark.css" (prefers-color-scheme: dark);
static/wikipedia_styles_light_fr.css
View File