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 'master' into master
Mike Caoba99db6a3ea5
diff --cc lib/lang.jsindex 9ab141087,78786d6a0..e4a444280--- a/lib/lang.js+++ b/lib/lang.js@@@ -1,29 -1,29 +1,33 @@@import enMessages from 'lang-compiled/en.json';import nlMessages from 'lang-compiled/nl-NL.json';import zhCNMessages from 'lang-compiled/zh-CN.json';+ import trTRMessages from 'lang-compiled/tr-TR.json';+import ruRUMessages from 'lang-compiled/ru-RU.json';import { format } from 'date-fns';- import { enUS, nl, zhCN, ru } from 'date-fns/locale';-import { enUS, nl, zhCN, tr } from 'date-fns/locale';++import { enUS, nl, zhCN, tr, ru } from 'date-fns/locale';export const messages = {en: enMessages,'nl-NL': nlMessages,'zh-CN': zhCNMessages,+ 'ru-RU': ruRUMessages,+ 'tr-TR': trTRMessages,};export const dateLocales = {en: enUS,'nl-NL': nl,'zh-CN': zhCN,+ 'ru-RU': ru,+ 'tr-TR': tr,};export const menuOptions = [{ label: 'English', value: 'en', display: 'EN' },{ label: 'Nederlands', value: 'nl-NL', display: 'NL' },{ label: '中文 (Chinese Simplified)', value: 'zh-CN', display: '中文' },+ { label: 'Русский', value: 'ru-RU', display: 'РУ' },+ { label: 'Turkish', value: 'tr-TR', display: 'TR' },];export function dateFormat(date, str, locale) {