tabshift/payload
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

misc leftover locales

Browse Source
This commit is contained in:
James
2019-02-16 14:37:55 -05:00
parent 9545fe060d
commit 34adf49df9
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/modules/Localizer/index.js
View File

@@ -42,7 +42,7 @@ class Localizer extends Component {
const newParams = {
...this.props.searchParams,
locale: locale
locale
};
const search = qs.stringify(newParams);

2
src/components/utilities/SetLocale/index.js
View File

@@ -24,7 +24,7 @@ class SetLocale extends Component {
const { searchParams, config, setLocale } = this.props;
if (searchParams) {
if (searchParams.locales && config.localization.locales.indexOf(searchParams.locales) > -1) {
if (searchParams.locale && config.localization.locales.indexOf(searchParams.locale) > -1) {
setLocale(searchParams.locale);
} else if (!this.state.init) {
setLocale(config.localization.defaultLocale);

11
src/middleware/locale.js
View File

@@ -6,27 +6,28 @@ import languageParser from 'accept-language-parser';
* @param localization
* @returns {Function}
*/
export default function locale(localization) {
return function (req, res, next) {
let setLocale;
if (req.query.locale) {
setLocale = localization.languages.find(search => search === req.query.locale);
setLocale = localization.locales.find(search => search === req.query.locale);
if (setLocale) {
req.locale = setLocale;
}
if (req.query.locale === '*' || req.query.locale === 'all')
return next();
}
if (req.body.locale){
setLocale = localization.languages.find(search => search === req.body.locale);
if (req.body.locale) {
setLocale = localization.locales.find(search => search === req.body.locale);
if (setLocale) {
req.locale = setLocale;
}
}
if (!req.locale && req.headers['accept-language'])
req.locale = languageParser.pick(localization.languages, req.headers['accept-language']);
req.locale = languageParser.pick(localization.locales, req.headers['accept-language']);
if (!req.locale)
req.locale = localization.defaultLanguage;
req.locale = localization.defaultLocale;
next();
}