Merge branch 'dev' into add-arabic-lang
This commit is contained in:
@@ -3,7 +3,7 @@ import { removeTrailingSlash, removeWWW, getDomainName } from './url';
|
||||
|
||||
export const urlFilter = (data, { raw }) => {
|
||||
const isValidUrl = url => {
|
||||
return url !== '' && !url.startsWith('#');
|
||||
return url !== '' && url !== null && !url.startsWith('#');
|
||||
};
|
||||
|
||||
if (raw) {
|
||||
@@ -51,7 +51,7 @@ export const refFilter = (data, { domain, domainOnly, raw }) => {
|
||||
const links = {};
|
||||
|
||||
const isValidRef = ref => {
|
||||
return ref !== '' && !ref.startsWith('/') && !ref.startsWith('#');
|
||||
return ref !== '' && ref !== null && !ref.startsWith('/') && !ref.startsWith('#');
|
||||
};
|
||||
|
||||
if (raw) {
|
||||
|
||||
@@ -15,6 +15,7 @@ import {
|
||||
id,
|
||||
it,
|
||||
ja,
|
||||
mn,
|
||||
ms,
|
||||
nb,
|
||||
nl,
|
||||
@@ -29,6 +30,7 @@ import {
|
||||
uk,
|
||||
zhCN,
|
||||
zhTW,
|
||||
ca,
|
||||
} from 'date-fns/locale';
|
||||
import arSAMessages from 'lang-compiled/ar-SA.json';
|
||||
import enMessages from 'lang-compiled/en-US.json';
|
||||
@@ -62,6 +64,7 @@ import heMessages from 'lang-compiled/he-IL.json';
|
||||
import itMessages from 'lang-compiled/it-IT.json';
|
||||
import faIRMessages from 'lang-compiled/fa-IR.json';
|
||||
import msMYMessages from 'lang-compiled/ms-MY.json';
|
||||
import caMessages from 'lang-compiled/ca-ES.json';
|
||||
|
||||
export const messages = {
|
||||
'ar-SA': arSAMessages,
|
||||
@@ -96,6 +99,7 @@ export const messages = {
|
||||
'it-IT': itMessages,
|
||||
'fa-IR': faIRMessages,
|
||||
'ms-MY': msMYMessages,
|
||||
'ca-ES': caMessages,
|
||||
};
|
||||
|
||||
export const rtlLocales = ['ar-SA', 'fa-IR'];
|
||||
@@ -114,7 +118,7 @@ export const dateLocales = {
|
||||
'ja-JP': ja,
|
||||
'es-MX': es,
|
||||
'fr-FR': fr,
|
||||
'mn-MN': enUS,
|
||||
'mn-MN': mn,
|
||||
'el-GR': el,
|
||||
'fo-FO': da,
|
||||
'pt-PT': pt,
|
||||
@@ -133,12 +137,14 @@ export const dateLocales = {
|
||||
'it-IT': it,
|
||||
'fa-IR': faIR,
|
||||
'ms-MY': ms,
|
||||
'ca-ES': ca,
|
||||
};
|
||||
|
||||
export const menuOptions = [
|
||||
{ label: 'العربية', value: 'ar-SA', display: 'ar' },
|
||||
{ label: '中文', value: 'zh-CN', display: 'cn' },
|
||||
{ label: '中文(繁體)', value: 'zh-TW', display: 'tw' },
|
||||
{ label: 'Català', value: 'ca-ES', display: 'ca' },
|
||||
{ label: 'Čeština', value: 'cs-CZ', display: 'cs' },
|
||||
{ label: 'Dansk', value: 'da-DK', display: 'da' },
|
||||
{ label: 'Deutsch', value: 'de-DE', display: 'de' },
|
||||
|
||||
Reference in New Issue
Block a user