Umami is a privacy-first web and product analytics platform. Traffic, campaigns, behavior, conversions, and revenue in one place. No cookies, no surveillance, self-hosted or in the cloud.
TypeScript analyticsaudience-segmentationchartscohort-analysisgoogle-analyticsproduct-analyticsstatisticsuser-journeyweb-analytics
Merge branch 'dev' into add-arabic-lang
Mike Cao48e5977efa4f
diff --cc lib/lang.jsindex d25bdeb54,a6f54e569..6415ddae5--- a/lib/lang.js+++ b/lib/lang.js@@@ -29,8 -29,8 +30,9 @@@ importuk,zhCN,zhTW,+ ca,} from 'date-fns/locale';+import arSAMessages from 'lang-compiled/ar-SA.json';import enMessages from 'lang-compiled/en-US.json';import nlMessages from 'lang-compiled/nl-NL.json';import zhCNMessages from 'lang-compiled/zh-CN.json';@@@ -62,9 -62,9 +64,10 @@@ import heMessages from 'lang-compiled/himport 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,'en-US': enMessages,'nl-NL': nlMessages,'zh-CN': zhCNMessages,@@@ -96,12 -96,10 +99,13 @@@'it-IT': itMessages,'fa-IR': faIRMessages,'ms-MY': msMYMessages,+ 'ca-ES': caMessages,};+export const rtlLocales = ['ar-SA', 'fa-IR'];+export const dateLocales = {+ 'ar-SA': arSA,'en-US': enUS,'nl-NL': nl,'zh-CN': zhCN,@@@ -136,9 -135,9 +141,10 @@@};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' },diff --cc package.jsonindex f6f1214b1,45f62b95f..9333b8881--- a/package.json+++ b/package.json@@@ -119,14 -119,13 +119,14 @@@"postcss-flexbugs-fixes": "^5.0.2","postcss-import": "^13.0.0","postcss-preset-env": "^6.7.0",+ "postcss-rtlcss": "^3.3.2",- "prettier": "^2.2.1",+ "prettier": "^2.3.0","prettier-eslint": "^12.0.0",- "prisma": "2.21.2",- "rollup": "^2.45.2",+ "prisma": "2.23.0",+ "rollup": "^2.48.0","rollup-plugin-hashbang": "^2.2.2","rollup-plugin-terser": "^7.0.2",- "stylelint": "^13.13.0",+ "stylelint": "^13.13.1","stylelint-config-css-modules": "^2.2.0","stylelint-config-prettier": "^8.0.1","stylelint-config-recommended": "^5.0.0",