Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added defaultFallbackLanguage config parameter [Close#916] #1279

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Added defaultFallbackLanguage config parameter [Close#916] #1279

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions src/core/fetch/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ export function fetchMixin(proto) {
return path404;
};

proto._loadSideAndNav = function(path, qs, loadSidebar, cb) {
proto._loadSideAndNav = function (path, qs, loadSidebar, cb) {
return () => {
if (!loadSidebar) {
return cb();
Expand All @@ -101,7 +101,7 @@ export function fetchMixin(proto) {
};
};

proto._fetch = function(cb = noop) {
proto._fetch = function (cb = noop) {
const { path, query } = this.route;
const qs = stringifyQuery(query, ['id']);
const { loadNavbar, requestHeaders, loadSidebar } = this.config;
Expand Down Expand Up @@ -139,7 +139,7 @@ export function fetchMixin(proto) {
);
};

proto._fetchCover = function() {
proto._fetchCover = function () {
const { coverpage, requestHeaders } = this.config;
const query = this.route.query;
const root = getParentPath(this.route.path);
Expand Down Expand Up @@ -175,7 +175,7 @@ export function fetchMixin(proto) {
}
};

proto.$fetch = function(
proto.$fetch = function (
cb = noop,
$resetEvents = this.$resetEvents.bind(this)
) {
Expand All @@ -196,8 +196,8 @@ export function fetchMixin(proto) {
}
};

proto._fetchFallbackPage = function(path, qs, cb = noop) {
const { requestHeaders, fallbackLanguages, loadSidebar } = this.config;
proto._fetchFallbackPage = function (path, qs, cb = noop) {
const { requestHeaders, defaultFallbackLanguage, fallbackLanguages, loadSidebar } = this.config;

if (!fallbackLanguages) {
return false;
Expand All @@ -209,7 +209,8 @@ export function fetchMixin(proto) {
return false;
}

const newPath = path.replace(new RegExp(`^/${local}`), '');
const defaultLanguage = defaultFallbackLanguage ? defaultFallbackLanguage : '';
const newPath = path.replace(new RegExp(`^/${local}`), defaultLanguage);
const req = request(newPath + qs, true, requestHeaders);

req.then(
Expand All @@ -233,7 +234,7 @@ export function fetchMixin(proto) {
* @returns {Boolean} True if the requested page is not found
* @private
*/
proto._fetch404 = function(path, qs, cb = noop) {
proto._fetch404 = function (path, qs, cb = noop) {
const { loadSidebar, requestHeaders, notFoundPage } = this.config;

const fnLoadSideAndNav = this._loadSideAndNav(path, qs, loadSidebar, cb);
Expand Down