m/umami
1
0
Fork 0
mirror of https://github.com/kremalicious/umami.git synced 2024-11-15 17:55:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1324 from umami-software/dev

Browse Source 
v1.35.0
This commit is contained in:
Mike Cao 2022-07-21 21:35:42 -07:00 committed by GitHub
commit afc2b85e75
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
45 changed files with 57 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lang/fr-FR.json
View File

@ -37,7 +37,7 @@
"label.more": "Plus",
"label.name": "Nom",
"label.new-password": "Nouveau mot de passe",
"label.none": "None",
"label.none": "Aucun·e",
"label.owner": "Propriétaire",
"label.password": "Mot de passe",
"label.passwords-dont-match": "Les mots de passe ne correspondent pas",
@ -104,7 +104,7 @@
"metrics.page-views": "Pages vues",
"metrics.pages": "Pages",
"metrics.referrers": "Sources",
"metrics.screens": "Screens",
"metrics.screens": "Tailles d'écran",
"metrics.unique-visitors": "Visiteurs uniques",
"metrics.views": "Vues",
"metrics.visitors": "Visiteurs"

6
lang/nl-NL.json
View File

@ -37,7 +37,7 @@
"label.more": "Toon meer",
"label.name": "Naam",
"label.new-password": "Nieuw wachtwoord",
"label.none": "None",
"label.none": "Geen",
"label.owner": "Eigenaar",
"label.password": "Wachtwoord",
"label.passwords-dont-match": "Wachtwoorden komen niet overeen",
@ -79,7 +79,7 @@
"message.no-websites-configured": "Je hebt geen websites ingesteld.",
"message.page-not-found": "Pagina niet gevonden.",
"message.powered-by": "mogelijk gemaakt door {name}",
"message.reset-warning": "All statistics for this website will be deleted, but your tracking code will remain intact.",
"message.reset-warning": "Alle bijhorende statistieken van deze website worden verwijderd, maar jouw volgcode blijft gelden.",
"message.save-success": "Opslaan succesvol.",
"message.share-url": "Met deze URL kan {target} openbaar gedeeld worden.",
"message.toggle-charts": "Grafieken tonen/verbergen",
@ -104,7 +104,7 @@
"metrics.page-views": "Paginaweergaven",
"metrics.pages": "Pagina's",
"metrics.referrers": "Verwijzers",
"metrics.screens": "Screens",
"metrics.screens": "Schermen",
"metrics.unique-visitors": "Unieke bezoekers",
"metrics.views": "Weergaven",
"metrics.visitors": "Bezoekers"

16
lib/queries.js
View File

@ -14,24 +14,12 @@ export function getDatabase() {
return type;
}
export function getDateStringQuery(data, unit) {
const db = getDatabase();
if (db === POSTGRESQL) {
return `to_char(${data}, '${POSTGRESQL_DATE_FORMATS[unit]}')`;
}
if (db === MYSQL) {
return `DATE_FORMAT(${data}, '${MYSQL_DATE_FORMATS[unit]}')`;
}
}
export function getDateQuery(field, unit, timezone) {
const db = getDatabase();
if (db === POSTGRESQL) {
if (timezone) {
return `date_trunc('${unit}', ${field} at time zone '${timezone}')`;
return `to_char(date_trunc('${unit}', ${field} at time zone '${timezone}'), '${POSTGRESQL_DATE_FORMATS[unit]}')`;
}
return `date_trunc('${unit}', ${field})`;
}
@ -40,7 +28,7 @@ export function getDateQuery(field, unit, timezone) {
if (timezone) {
const tz = moment.tz(timezone).format('Z');
return `convert_tz(${field},'+00:00','${tz}')`;
return `date_format(convert_tz(${field},'+00:00','${tz}'), '${MYSQL_DATE_FORMATS[unit]}')`;
}
return `${field}`;

2
public/intl/messages/ar-SA.json
View File

@ -734,7 +734,7 @@
"metrics.filter.combined": [
{
"type": 0,
"value": "Combined"
"value": "مجمعة"
}
],
"metrics.filter.raw": [

2
public/intl/messages/ca-ES.json
View File

@ -734,7 +734,7 @@
"metrics.filter.combined": [
{
"type": 0,
"value": "Combined"
"value": "Combinat"
}
],
"metrics.filter.raw": [

2
public/intl/messages/cs-CZ.json
View File

@ -734,7 +734,7 @@
"metrics.filter.combined": [
{
"type": 0,
"value": "Combined"
"value": "Kombinace"
}
],
"metrics.filter.raw": [

2
public/intl/messages/da-DK.json
View File

@ -734,7 +734,7 @@
"metrics.filter.combined": [
{
"type": 0,
"value": "Combined"
"value": "Kombineret"
}
],
"metrics.filter.raw": [

2
public/intl/messages/de-DE.json
View File

@ -734,7 +734,7 @@
"metrics.filter.combined": [
{
"type": 0,
"value": "Combined"
"value": "Kombiniert"
}
],
"metrics.filter.raw": [

2
public/intl/messages/el-GR.json
View File

@ -734,7 +734,7 @@
"metrics.filter.combined": [
{
"type": 0,
"value": "Combined"
"value": "Σε συνδυασμό"
}
],
"metrics.filter.raw": [

2
public/intl/messages/es-MX.json
View File

@ -734,7 +734,7 @@
"metrics.filter.combined": [
{
"type": 0,
"value": "Combined"
"value": "Combinado"
}
],
"metrics.filter.raw": [

2
public/intl/messages/fa-IR.json
View File

@ -718,7 +718,7 @@
"metrics.filter.combined": [
{
"type": 0,
"value": "Combined"
"value": "ترکیب شده"
}
],
"metrics.filter.raw": [

2
public/intl/messages/fi-FI.json
View File

@ -734,7 +734,7 @@
"metrics.filter.combined": [
{
"type": 0,
"value": "Combined"
"value": "Yhdistetty"
}
],
"metrics.filter.raw": [

2
public/intl/messages/fo-FO.json
View File

@ -734,7 +734,7 @@
"metrics.filter.combined": [
{
"type": 0,
"value": "Combined"
"value": "Samansett"
}
],
"metrics.filter.raw": [

6
public/intl/messages/fr-FR.json
View File

@ -242,7 +242,7 @@
"label.none": [
{
"type": 0,
"value": "None"
"value": "Aucun·e"
}
],
"label.owner": [
@ -730,7 +730,7 @@
"metrics.filter.combined": [
{
"type": 0,
"value": "Combined"
"value": "Combiné"
}
],
"metrics.filter.raw": [
@ -772,7 +772,7 @@
"metrics.screens": [
{
"type": 0,
"value": "Screens"
"value": "Tailles d'écran"
}
],
"metrics.unique-visitors": [

2
public/intl/messages/ga-ES.json
View File

@ -734,7 +734,7 @@
"metrics.filter.combined": [
{
"type": 0,
"value": "Combined"
"value": "Combinado"
}
],
"metrics.filter.raw": [

2
public/intl/messages/he-IL.json
View File

@ -714,7 +714,7 @@
"metrics.filter.combined": [
{
"type": 0,
"value": "Combined"
"value": "משותף"
}
],
"metrics.filter.raw": [

2
public/intl/messages/hi-IN.json
View File

@ -722,7 +722,7 @@
"metrics.filter.combined": [
{
"type": 0,
"value": "Combined"
"value": "संयुक्त"
}
],
"metrics.filter.raw": [

2
public/intl/messages/hu-HU.json
View File

@ -734,7 +734,7 @@
"metrics.filter.combined": [
{
"type": 0,
"value": "Combined"
"value": "Összevont"
}
],
"metrics.filter.raw": [

2
public/intl/messages/id-ID.json
View File

@ -702,7 +702,7 @@
"metrics.filter.combined": [
{
"type": 0,
"value": "Combined"
"value": "Gabungan"
}
],
"metrics.filter.raw": [

2
public/intl/messages/it-IT.json
View File

@ -738,7 +738,7 @@
"metrics.filter.combined": [
{
"type": 0,
"value": "Combined"
"value": "Aggregati"
}
],
"metrics.filter.raw": [

2
public/intl/messages/ja-JP.json
View File

@ -706,7 +706,7 @@
"metrics.filter.combined": [
{
"type": 0,
"value": "Combined"
"value": "パスまで"
}
],
"metrics.filter.raw": [

2
public/intl/messages/ko-KR.json
View File

@ -706,7 +706,7 @@
"metrics.filter.combined": [
{
"type": 0,
"value": "Combined"
"value": "합쳐서 보기"
}
],
"metrics.filter.raw": [

2
public/intl/messages/lt-LT.json
View File

@ -859,7 +859,7 @@
"metrics.filter.combined": [
{
"type": 0,
"value": "Combined"
"value": "Kombinuoti"
}
],
"metrics.filter.raw": [

2
public/intl/messages/mn-MN.json
View File

@ -734,7 +734,7 @@
"metrics.filter.combined": [
{
"type": 0,
"value": "Combined"
"value": "Нэгтгэсэн"
}
],
"metrics.filter.raw": [

2
public/intl/messages/ms-MY.json
View File

@ -726,7 +726,7 @@
"metrics.filter.combined": [
{
"type": 0,
"value": "Combined"
"value": "Digabungkan"
}
],
"metrics.filter.raw": [

2
public/intl/messages/nb-NO.json
View File

@ -738,7 +738,7 @@
"metrics.filter.combined": [
{
"type": 0,
"value": "Combined"
"value": "Kombinert"
}
],
"metrics.filter.raw": [

8
public/intl/messages/nl-NL.json
View File

@ -250,7 +250,7 @@
"label.none": [
{
"type": 0,
"value": "None"
"value": "Geen"
}
],
"label.owner": [
@ -586,7 +586,7 @@
"message.reset-warning": [
{
"type": 0,
"value": "All statistics for this website will be deleted, but your tracking code will remain intact."
"value": "Alle bijhorende statistieken van deze website worden verwijderd, maar jouw volgcode blijft gelden."
}
],
"message.save-success": [
@ -734,7 +734,7 @@
"metrics.filter.combined": [
{
"type": 0,
"value": "Combined"
"value": "Gecombineerd"
}
],
"metrics.filter.raw": [
@ -776,7 +776,7 @@
"metrics.screens": [
{
"type": 0,
"value": "Screens"
"value": "Schermen"
}
],
"metrics.unique-visitors": [

2
public/intl/messages/pl-PL.json
View File

@ -734,7 +734,7 @@
"metrics.filter.combined": [
{
"type": 0,
"value": "Combined"
"value": "Połączone"
}
],
"metrics.filter.raw": [

2
public/intl/messages/pt-BR.json
View File

@ -738,7 +738,7 @@
"metrics.filter.combined": [
{
"type": 0,
"value": "Combined"
"value": "Combinado"
}
],
"metrics.filter.raw": [

2
public/intl/messages/pt-PT.json
View File

@ -738,7 +738,7 @@
"metrics.filter.combined": [
{
"type": 0,
"value": "Combined"
"value": "Combinado"
}
],
"metrics.filter.raw": [

2
public/intl/messages/ro-RO.json
View File

@ -734,7 +734,7 @@
"metrics.filter.combined": [
{
"type": 0,
"value": "Combined"
"value": "Combinat"
}
],
"metrics.filter.raw": [

2
public/intl/messages/ru-RU.json
View File

@ -706,7 +706,7 @@
"metrics.filter.combined": [
{
"type": 0,
"value": "Combined"
"value": "Объединенные"
}
],
"metrics.filter.raw": [

2
public/intl/messages/sk-SK.json
View File

@ -734,7 +734,7 @@
"metrics.filter.combined": [
{
"type": 0,
"value": "Combined"
"value": "Kombinácie"
}
],
"metrics.filter.raw": [

2
public/intl/messages/sl-SI.json
View File

@ -734,7 +734,7 @@
"metrics.filter.combined": [
{
"type": 0,
"value": "Combined"
"value": "Skupno"
}
],
"metrics.filter.raw": [

2
public/intl/messages/sv-SE.json
View File

@ -738,7 +738,7 @@
"metrics.filter.combined": [
{
"type": 0,
"value": "Combined"
"value": "Kombinerade"
}
],
"metrics.filter.raw": [

2
public/intl/messages/ta-IN.json
View File

@ -726,7 +726,7 @@
"metrics.filter.combined": [
{
"type": 0,
"value": "Combined"
"value": "ஒருங்கிணைந்த"
}
],
"metrics.filter.raw": [

2
public/intl/messages/tr-TR.json
View File

@ -698,7 +698,7 @@
"metrics.filter.combined": [
{
"type": 0,
"value": "Combined"
"value": "Birleşik"
}
],
"metrics.filter.raw": [

2
public/intl/messages/uk-UA.json
View File

@ -710,7 +710,7 @@
"metrics.filter.combined": [
{
"type": 0,
"value": "Combined"
"value": "Об'єднані"
}
],
"metrics.filter.raw": [

2
public/intl/messages/ur-PK.json
View File

@ -734,7 +734,7 @@
"metrics.filter.combined": [
{
"type": 0,
"value": "Combined"
"value": "مشترکہ"
}
],
"metrics.filter.raw": [

2
public/intl/messages/vi-VN.json
View File

@ -718,7 +718,7 @@
"metrics.filter.combined": [
{
"type": 0,
"value": "Combined"
"value": "Kết hợp"
}
],
"metrics.filter.raw": [

2
public/intl/messages/zh-CN.json
View File

@ -722,7 +722,7 @@
"metrics.filter.combined": [
{
"type": 0,
"value": "Combined"
"value": "总和"
}
],
"metrics.filter.raw": [

2
public/intl/messages/zh-TW.json
View File

@ -718,7 +718,7 @@
"metrics.filter.combined": [
{
"type": 0,
"value": "Combined"
"value": "總和"
}
],
"metrics.filter.raw": [

4
queries/analytics/event/getEventMetrics.js
View File

@ -1,4 +1,4 @@
import { getDateQuery, getDateStringQuery, getFilterQuery, rawQuery } from 'lib/queries';
import { getDateQuery, getFilterQuery, rawQuery } from 'lib/queries';
export function getEventMetrics(
website_id,
@ -14,7 +14,7 @@ export function getEventMetrics(
`
select
event_value x,
${getDateStringQuery(getDateQuery('created_at', unit, timezone), unit)} t,
${getDateQuery('created_at', unit, timezone)} t,
count(*) y
from event
where website_id=$1

4
queries/analytics/pageview/getPageviewStats.js
View File

@ -1,4 +1,4 @@
import { parseFilters, rawQuery, getDateQuery, getDateStringQuery } from 'lib/queries';
import { parseFilters, rawQuery, getDateQuery } from 'lib/queries';
export function getPageviewStats(
website_id,
@ -20,7 +20,7 @@ export function getPageviewStats(
return rawQuery(
`
select
${getDateStringQuery('g.t', unit)} as t,
g.t as t,
g.y as y
from
(select ${getDateQuery('pageview.created_at', unit, timezone)} t,

2
rollup.tracker.config.js
View File

@ -1,3 +1,4 @@
import 'dotenv/config';
import buble from '@rollup/plugin-buble';
import replace from '@rollup/plugin-replace';
import { terser } from 'rollup-plugin-terser';
@ -12,6 +13,7 @@ export default {
replace({
'/api/collect': process.env.COLLECT_API_ENDPOINT || '/api/collect',
delimiters: ['', ''],
preventAssignment: true,
}),
buble({ objectAssign: true }),
terser({ compress: { evaluate: false } }),