LailaTheElf/hedgedoc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #836 from SISheogorath/fix/i18n-files

Browse Source 
Fix i18n writing locale files in production
This commit is contained in:
Christoph (Sheogorath) Kern 2018-06-07 10:29:09 +02:00 committed by GitHub
commit 6f76e9940f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app.js
View File

@ -131,7 +131,8 @@ if (config.csp.enable) {
i18n.configure({ i18n.configure({
locales: ['en', 'zh', 'zh-CN', 'zh-TW', 'fr', 'de', 'ja', 'es', 'ca', 'el', 'pt', 'it', 'tr', 'ru', 'nl', 'hr', 'pl', 'uk', 'hi', 'sv', 'eo', 'da'], locales: ['en', 'zh', 'zh-CN', 'zh-TW', 'fr', 'de', 'ja', 'es', 'ca', 'el', 'pt', 'it', 'tr', 'ru', 'nl', 'hr', 'pl', 'uk', 'hi', 'sv', 'eo', 'da'],
cookie: 'locale', cookie: 'locale',
directory: path.join(__dirname, '/locales') directory: path.join(__dirname, '/locales'),
updateFiles: config.updateI18nFiles
}) })
app.use(cookieParser()) app.use(cookieParser())

3
lib/config/index.js
View File

@ -102,6 +102,9 @@ config.isSAMLEnable = config.saml.idpSsoUrl
config.isOAuth2Enable = config.oauth2.clientID && config.oauth2.clientSecret config.isOAuth2Enable = config.oauth2.clientID && config.oauth2.clientSecret
config.isPDFExportEnable = config.allowPDFExport config.isPDFExportEnable = config.allowPDFExport
// Only update i18n files in development setups
config.updateI18nFiles = (env === Environment.development)
// merge legacy values // merge legacy values
let keys = Object.keys(config) let keys = Object.keys(config)
const uppercase = /[A-Z]/ const uppercase = /[A-Z]/