diff --git a/components/layout/SideNav.js b/components/layout/SideNav.js index e521fe42..2b93c3f2 100644 --- a/components/layout/SideNav.js +++ b/components/layout/SideNav.js @@ -1,12 +1,18 @@ +import classNames from 'classnames'; import { Menu, Item } from 'react-basics'; +import { useRouter } from 'next/router'; import Link from 'next/link'; import styles from './SideNav.module.css'; export default function SideNav({ selectedKey, items, shallow, onSelect = () => {} }) { + const { asPath } = useRouter(); return ( {({ key, label, url }) => ( - + {label} diff --git a/components/layout/SideNav.module.css b/components/layout/SideNav.module.css index b664194d..5dbe4105 100644 --- a/components/layout/SideNav.module.css +++ b/components/layout/SideNav.module.css @@ -13,3 +13,7 @@ padding: 0; border-radius: var(--border-radius); } + +.selected { + font-weight: 700; +} diff --git a/components/messages.js b/components/messages.js index 9de5f52b..3cdac3be 100644 --- a/components/messages.js +++ b/components/messages.js @@ -10,7 +10,7 @@ export const labels = defineMessages({ leave: { id: 'label.leave', defaultMessage: 'Leave' }, users: { id: 'label.users', defaultMessage: 'Users' }, createUser: { id: 'label.create-user', defaultMessage: 'Create user' }, - deleteUser: { id: 'label.delete-users', defaultMessage: 'Delete user' }, + deleteUser: { id: 'label.delete-user', defaultMessage: 'Delete user' }, username: { id: 'label.username', defaultMessage: 'Username' }, password: { id: 'label.password', defaultMessage: 'Password' }, role: { id: 'label.role', defaultMessage: 'Role' }, diff --git a/components/metrics/MetricsBar.js b/components/metrics/MetricsBar.js index 2b94d303..1f218ba8 100644 --- a/components/metrics/MetricsBar.js +++ b/components/metrics/MetricsBar.js @@ -16,11 +16,14 @@ export default function MetricsBar({ websiteId }) { const { startDate, endDate, modified } = dateRange; const [format, setFormat] = useState(true); const { - query: { url, referrer, os, browser, device, country }, + query: { url, referrer, os, browser, device, country, region, city }, } = usePageQuery(); const { data, error, isLoading, isFetched } = useQuery( - ['websites:stats', { websiteId, modified, url, referrer, os, browser, device, country }], + [ + 'websites:stats', + { websiteId, modified, url, referrer, os, browser, device, country, region, city }, + ], () => get(`/websites/${websiteId}/stats`, { startAt: +startDate, @@ -31,6 +34,8 @@ export default function MetricsBar({ websiteId }) { browser, device, country, + region, + city, }), ); diff --git a/components/pages/realtime/RealtimeLog.js b/components/pages/realtime/RealtimeLog.js index cec9d9c6..ed3b6a33 100644 --- a/components/pages/realtime/RealtimeLog.js +++ b/components/pages/realtime/RealtimeLog.js @@ -146,7 +146,7 @@ export default function RealtimeLog({ data, websiteDomain }) {
{logs?.length === 0 && } {logs?.length > 0 && ( - + {Row} )} diff --git a/components/pages/realtime/RealtimeLog.module.css b/components/pages/realtime/RealtimeLog.module.css index 7e54e34c..10ec7c36 100644 --- a/components/pages/realtime/RealtimeLog.module.css +++ b/components/pages/realtime/RealtimeLog.module.css @@ -9,15 +9,15 @@ align-items: center; justify-content: space-between; font-size: var(--font-size-md); - line-height: 40px; - font-weight: 600; + line-height: 50px; + font-weight: 700; } .row { display: flex; align-items: center; gap: 10px; - height: 40px; + height: 50px; border-bottom: 1px solid var(--base300); } @@ -49,6 +49,15 @@ overflow: hidden; } +.detail > span { + overflow: hidden; + text-overflow: ellipsis; + display: -webkit-box; + -webkit-line-clamp: 2; + line-clamp: 2; + -webkit-box-orient: vertical; +} + .row .link { color: var(--base900); text-decoration: none; diff --git a/db/mysql/migrations/01_init/migration.sql b/db/mysql/migrations/01_init/migration.sql index 8687dd41..bd332805 100644 --- a/db/mysql/migrations/01_init/migration.sql +++ b/db/mysql/migrations/01_init/migration.sql @@ -24,7 +24,7 @@ CREATE TABLE `session` ( `screen` VARCHAR(11) NULL, `language` VARCHAR(35) NULL, `country` CHAR(2) NULL, - `subdivision1` CHAR(3) NULL, + `subdivision1` CHAR(20) NULL, `subdivision2` VARCHAR(50) NULL, `city` VARCHAR(50) NULL, `created_at` TIMESTAMP(0) NULL DEFAULT CURRENT_TIMESTAMP(0), diff --git a/db/mysql/schema.prisma b/db/mysql/schema.prisma index af939c0c..7ae02080 100644 --- a/db/mysql/schema.prisma +++ b/db/mysql/schema.prisma @@ -33,7 +33,7 @@ model Session { screen String? @db.VarChar(11) language String? @db.VarChar(35) country String? @db.Char(2) - subdivision1 String? @db.Char(3) + subdivision1 String? @db.Char(20) subdivision2 String? @db.VarChar(50) city String? @db.VarChar(50) createdAt DateTime? @default(now()) @map("created_at") @db.Timestamp(0) diff --git a/db/postgresql/migrations/01_init/migration.sql b/db/postgresql/migrations/01_init/migration.sql index 81eed876..13074327 100644 --- a/db/postgresql/migrations/01_init/migration.sql +++ b/db/postgresql/migrations/01_init/migration.sql @@ -25,7 +25,7 @@ CREATE TABLE "session" ( "screen" VARCHAR(11), "language" VARCHAR(35), "country" CHAR(2), - "subdivision1" CHAR(3), + "subdivision1" VARCHAR(20), "subdivision2" VARCHAR(50), "city" VARCHAR(50), "created_at" TIMESTAMPTZ(6) DEFAULT CURRENT_TIMESTAMP, @@ -196,4 +196,4 @@ CREATE INDEX "team_website_team_id_idx" ON "team_website"("team_id"); CREATE INDEX "team_website_website_id_idx" ON "team_website"("website_id"); -- AddSystemUser -INSERT INTO "user" (user_id, username, role, password) VALUES ('41e2b680-648e-4b09-bcd7-3e2b10c06264' , 'admin', 'admin', '$2b$10$BUli0c.muyCW1ErNJc3jL.vFRFtFJWrT8/GcR4A.sUdCznaXiqFXa'); +INSERT INTO "user" (user_id, username, role, password) VALUES ('41e2b680-648e-4b09-bcd7-3e2b10c06264' , 'admin', 'admin', '$2b$10$BUli0c.muyCW1ErNJc3jL.vFRFtFJWrT8/GcR4A.sUdCznaXiqFXa'); \ No newline at end of file diff --git a/db/postgresql/schema.prisma b/db/postgresql/schema.prisma index 57f7a78f..245b2e7c 100644 --- a/db/postgresql/schema.prisma +++ b/db/postgresql/schema.prisma @@ -33,7 +33,7 @@ model Session { screen String? @db.VarChar(11) language String? @db.VarChar(35) country String? @db.Char(2) - subdivision1 String? @db.Char(3) + subdivision1 String? @db.VarChar(20) subdivision2 String? @db.VarChar(50) city String? @db.VarChar(50) createdAt DateTime? @default(now()) @map("created_at") @db.Timestamptz(6) diff --git a/docker-compose.yml b/docker-compose.yml index 84b45f27..bd63c68b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -13,7 +13,7 @@ services: - db restart: always db: - image: postgres:12-alpine + image: postgres:15-alpine environment: POSTGRES_DB: umami POSTGRES_USER: umami diff --git a/lang/ar-SA.json b/lang/ar-SA.json index a9f8e4fc..55bb7734 100644 --- a/lang/ar-SA.json +++ b/lang/ar-SA.json @@ -30,6 +30,7 @@ "label.default-date-range": "الفترة المخصصة الافتراضية", "label.delete": "حذف", "label.delete-team": "Delete team", + "label.delete-user": "Delete user", "label.delete-website": "حذف الموقع", "label.desktop": "كمبيوتر", "label.details": "Details", diff --git a/lang/be-BY.json b/lang/be-BY.json index 11eb8b54..b116ef41 100644 --- a/lang/be-BY.json +++ b/lang/be-BY.json @@ -30,6 +30,7 @@ "label.default-date-range": "Дыяпазон дат па змаўчанню", "label.delete": "Выдаліць", "label.delete-team": "Delete team", + "label.delete-user": "Delete user", "label.delete-website": "Выдаліць сайт", "label.desktop": "Настольны ПК", "label.details": "Details", diff --git a/lang/bn-BD.json b/lang/bn-BD.json index fd7dc111..ebf19e5c 100644 --- a/lang/bn-BD.json +++ b/lang/bn-BD.json @@ -30,6 +30,7 @@ "label.default-date-range": "ডিফল্ট তারিখের পরিসীমা", "label.delete": "মুছে ফেলুন", "label.delete-team": "Delete team", + "label.delete-user": "Delete user", "label.delete-website": "ওয়েবসাইট মুছুন", "label.desktop": "ডেস্কটপ", "label.details": "Details", diff --git a/lang/ca-ES.json b/lang/ca-ES.json index ae293a0c..a77606b6 100644 --- a/lang/ca-ES.json +++ b/lang/ca-ES.json @@ -30,6 +30,7 @@ "label.default-date-range": "Interval de dates per defecte", "label.delete": "Esborra", "label.delete-team": "Delete team", + "label.delete-user": "Delete user", "label.delete-website": "Esborra el lloc web", "label.desktop": "Escriptori", "label.details": "Details", diff --git a/lang/cs-CZ.json b/lang/cs-CZ.json index 63e53df5..a6884bdb 100644 --- a/lang/cs-CZ.json +++ b/lang/cs-CZ.json @@ -30,6 +30,7 @@ "label.default-date-range": "Výchozí období", "label.delete": "Smazat", "label.delete-team": "Delete team", + "label.delete-user": "Delete user", "label.delete-website": "Smazat web", "label.desktop": "Stolní počítač", "label.details": "Details", diff --git a/lang/da-DK.json b/lang/da-DK.json index ec2311eb..8c571207 100644 --- a/lang/da-DK.json +++ b/lang/da-DK.json @@ -30,6 +30,7 @@ "label.default-date-range": "Standard datointerval", "label.delete": "Slet", "label.delete-team": "Delete team", + "label.delete-user": "Delete user", "label.delete-website": "Slet hjemmeside", "label.desktop": "Desktop", "label.details": "Details", diff --git a/lang/de-CH.json b/lang/de-CH.json index 0492081e..f06f2b92 100644 --- a/lang/de-CH.json +++ b/lang/de-CH.json @@ -30,6 +30,7 @@ "label.default-date-range": "Vorigstellte Datumsbereich", "label.delete": "Lösche", "label.delete-team": "Delete team", + "label.delete-user": "Delete user", "label.delete-website": "Websiite lösche", "label.desktop": "Desktop", "label.details": "Details", diff --git a/lang/de-DE.json b/lang/de-DE.json index 7691f29b..4606ec35 100644 --- a/lang/de-DE.json +++ b/lang/de-DE.json @@ -30,6 +30,7 @@ "label.default-date-range": "Voreingestellter Datumsbereich", "label.delete": "Löschen", "label.delete-team": "Delete team", + "label.delete-user": "Delete user", "label.delete-website": "Webseite löschen", "label.desktop": "Desktop", "label.details": "Details", diff --git a/lang/el-GR.json b/lang/el-GR.json index 5d565a9c..fcb0dc22 100644 --- a/lang/el-GR.json +++ b/lang/el-GR.json @@ -30,6 +30,7 @@ "label.default-date-range": "Προεπιλεγμένο εύρος ημερομηνιών", "label.delete": "Διαγραφή", "label.delete-team": "Delete team", + "label.delete-user": "Delete user", "label.delete-website": "Διαγραφή ιστότοπου", "label.desktop": "Σταθερός υπολογιστής", "label.details": "Details", diff --git a/lang/en-GB.json b/lang/en-GB.json index 44b4e475..78bf9dc0 100644 --- a/lang/en-GB.json +++ b/lang/en-GB.json @@ -30,6 +30,7 @@ "label.default-date-range": "Default date range", "label.delete": "Delete", "label.delete-team": "Delete team", + "label.delete-user": "Delete user", "label.delete-website": "Delete website", "label.desktop": "Desktop", "label.details": "Details", diff --git a/lang/en-US.json b/lang/en-US.json index a601bf60..2d83113c 100644 --- a/lang/en-US.json +++ b/lang/en-US.json @@ -23,13 +23,14 @@ "label.create-user": "Create user", "label.created": "Created", "label.current-password": "Current password", - "label.custom-range": "Custom range", + "label.custom-range": "Custom-range", "label.dashboard": "Dashboard", "label.data": "Data", "label.date-range": "Date range", "label.default-date-range": "Default date range", "label.delete": "Delete", "label.delete-team": "Delete team", + "label.delete-user": "Delete user", "label.delete-website": "Delete website", "label.desktop": "Desktop", "label.details": "Details", @@ -75,7 +76,7 @@ "label.remove": "Remove", "label.required": "Required", "label.reset": "Reset", - "label.reset-website": "Reset statistics", + "label.reset-website": "Reset website", "label.role": "Role", "label.save": "Save", "label.screens": "Screens", @@ -115,30 +116,30 @@ "message.active-users": "{x} current {x, plural, one {visitor} other {visitors}}", "message.confirm-delete": "Are you sure you want to delete {target}?", "message.confirm-leave": "Are you sure you want to leave {target}?", - "message.confirm-reset": "Are you sure you want to reset {target}'s statistics?", + "message.confirm-reset": "Are you sure you want to reset {target}?", "message.delete-website": "To delete this website, type {confirmation} in the box below to confirm.", - "message.delete-website-warning": "All associated data will be deleted as well.", + "message.delete-website-warning": "All website data will be deleted.", "message.error": "Something went wrong.", "message.event-log": "{event} on {url}", "message.go-to-settings": "Go to settings", - "message.incorrect-username-password": "Incorrect username/password.", - "message.invalid-domain": "Invalid domain", + "message.incorrect-username-password": "Incorrect username and/or password.", + "message.invalid-domain": "Invalid domain. Do not include http/https.", "message.min-password-length": "Minimum length of {n} characters", "message.no-data-available": "No data available.", - "message.no-match-password": "Passwords don't match", + "message.no-match-password": "Passwords do not match.", "message.no-teams": "You have not created any teams.", "message.no-users": "There are no users.", - "message.page-not-found": "Page not found.", - "message.reset-website": "Reset statistics", - "message.reset-website-warning": "All statistics for this website will be deleted, but your tracking code will remain intact.", - "message.saved": "Saved successfully.", - "message.share-url": "This is the publicly shared URL for {target}.", + "message.page-not-found": "Page not found", + "message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.", + "message.reset-website-warning": "All statistics for this website will be deleted, but your settings will remain intact.", + "message.saved": "Saved.", + "message.share-url": "Your website stats are publically available at the following URL:", "message.team-already-member": "You are already a member of the team.", "message.team-not-found": "Team not found.", - "message.tracking-code": "Tracking code", + "message.tracking-code": "To track stats for this website, place the following code in the ... section of your HTML.", "message.user-deleted": "User deleted.", "message.visitor-log": "Visitor from {country} using {browser} on {os} {device}", "messages.no-team-websites": "This team does not have any websites.", - "messages.no-websites-configured": "You don't have any websites configured.", + "messages.no-websites-configured": "You do not have any websites configured.", "messages.team-websites-info": "Websites can be viewed by anyone on the team." } diff --git a/lang/es-MX.json b/lang/es-MX.json index e0ae880c..cca89d31 100644 --- a/lang/es-MX.json +++ b/lang/es-MX.json @@ -30,6 +30,7 @@ "label.default-date-range": "Intervalo por defecto", "label.delete": "Eliminar", "label.delete-team": "Delete team", + "label.delete-user": "Delete user", "label.delete-website": "Eliminar sitio", "label.desktop": "Escritorio", "label.details": "Details", diff --git a/lang/fa-IR.json b/lang/fa-IR.json index 60bfaf50..21cca80c 100644 --- a/lang/fa-IR.json +++ b/lang/fa-IR.json @@ -30,6 +30,7 @@ "label.default-date-range": "محدوده‌ی پیشفرض تاریخ", "label.delete": "حذف", "label.delete-team": "Delete team", + "label.delete-user": "Delete user", "label.delete-website": "حذف وب‌سایت", "label.desktop": "دسکتاپ", "label.details": "Details", diff --git a/lang/fi-FI.json b/lang/fi-FI.json index d4553fd8..4eb130bd 100644 --- a/lang/fi-FI.json +++ b/lang/fi-FI.json @@ -30,6 +30,7 @@ "label.default-date-range": "Oletusajanjakso", "label.delete": "Poista", "label.delete-team": "Delete team", + "label.delete-user": "Delete user", "label.delete-website": "Poista verkkosivu", "label.desktop": "Pöytäkone", "label.details": "Details", diff --git a/lang/fo-FO.json b/lang/fo-FO.json index 4b35c74e..0fe58961 100644 --- a/lang/fo-FO.json +++ b/lang/fo-FO.json @@ -30,6 +30,7 @@ "label.default-date-range": "Forsett dato", "label.delete": "Sletta", "label.delete-team": "Delete team", + "label.delete-user": "Delete user", "label.delete-website": "Sletta heimasíðu", "label.desktop": "Borðtelda", "label.details": "Details", diff --git a/lang/fr-FR.json b/lang/fr-FR.json index 64b2a2a5..8a8c4b21 100644 --- a/lang/fr-FR.json +++ b/lang/fr-FR.json @@ -30,6 +30,7 @@ "label.default-date-range": "Période par défaut", "label.delete": "Supprimer", "label.delete-team": "Delete team", + "label.delete-user": "Delete user", "label.delete-website": "Supprimer le site", "label.desktop": "Ordinateur", "label.details": "Details", diff --git a/lang/ga-ES.json b/lang/ga-ES.json index 378c6031..40363ce1 100644 --- a/lang/ga-ES.json +++ b/lang/ga-ES.json @@ -30,6 +30,7 @@ "label.default-date-range": "Rango temporal por defecto", "label.delete": "Eliminar", "label.delete-team": "Delete team", + "label.delete-user": "Delete user", "label.delete-website": "Eliminar sitio web", "label.desktop": "Escritorio", "label.details": "Details", diff --git a/lang/he-IL.json b/lang/he-IL.json index 2bd8f599..454d38ac 100644 --- a/lang/he-IL.json +++ b/lang/he-IL.json @@ -30,6 +30,7 @@ "label.default-date-range": "טווח תאריכים בברירת מחדל", "label.delete": "הסרה", "label.delete-team": "Delete team", + "label.delete-user": "Delete user", "label.delete-website": "הסרת אתר", "label.desktop": "דסקטופ", "label.details": "Details", diff --git a/lang/hi-IN.json b/lang/hi-IN.json index 2b7d21c7..b24ee4e6 100644 --- a/lang/hi-IN.json +++ b/lang/hi-IN.json @@ -30,6 +30,7 @@ "label.default-date-range": "डिफ़ॉल्ट तिथि सीमा", "label.delete": "खाता हटाएं", "label.delete-team": "Delete team", + "label.delete-user": "Delete user", "label.delete-website": "वेबसाइट हटाएं", "label.desktop": "डेस्कटॉप", "label.details": "Details", diff --git a/lang/hu-HU.json b/lang/hu-HU.json index bf19fd42..be0cc0ef 100644 --- a/lang/hu-HU.json +++ b/lang/hu-HU.json @@ -30,6 +30,7 @@ "label.default-date-range": "Alapértelmezett időintervallum", "label.delete": "Eltávolítás", "label.delete-team": "Delete team", + "label.delete-user": "Delete user", "label.delete-website": "Weboldal eltávolítása", "label.desktop": "Asztali számítógép", "label.details": "Details", diff --git a/lang/id-ID.json b/lang/id-ID.json index cda084d3..ddf1d526 100644 --- a/lang/id-ID.json +++ b/lang/id-ID.json @@ -30,6 +30,7 @@ "label.default-date-range": "Rentang tanggal bawaan", "label.delete": "Hapus", "label.delete-team": "Delete team", + "label.delete-user": "Delete user", "label.delete-website": "Hapus situs web", "label.desktop": "Desktop", "label.details": "Details", diff --git a/lang/it-IT.json b/lang/it-IT.json index b87b961f..a4984b90 100644 --- a/lang/it-IT.json +++ b/lang/it-IT.json @@ -30,6 +30,7 @@ "label.default-date-range": "Periodo standard", "label.delete": "Elimina", "label.delete-team": "Delete team", + "label.delete-user": "Delete user", "label.delete-website": "Elimina sito", "label.desktop": "Desktop", "label.details": "Details", diff --git a/lang/ja-JP.json b/lang/ja-JP.json index ff67be3c..88ea3c1c 100644 --- a/lang/ja-JP.json +++ b/lang/ja-JP.json @@ -30,6 +30,7 @@ "label.default-date-range": "最初に表示する期間", "label.delete": "削除", "label.delete-team": "Delete team", + "label.delete-user": "Delete user", "label.delete-website": "Webサイトの削除", "label.desktop": "デスクトップ", "label.details": "Details", diff --git a/lang/km-KH.json b/lang/km-KH.json index 6e19db70..b15c7dba 100644 --- a/lang/km-KH.json +++ b/lang/km-KH.json @@ -30,6 +30,7 @@ "label.default-date-range": "ចន្លោះកាលបរិច្ឆេទស្រាប់", "label.delete": "លុប", "label.delete-team": "Delete team", + "label.delete-user": "Delete user", "label.delete-website": "លុបគេហទំព័រ", "label.desktop": "កុំព្យូទ័រលើតុ", "label.details": "Details", diff --git a/lang/ko-KR.json b/lang/ko-KR.json index 8283dc9e..434b88ef 100644 --- a/lang/ko-KR.json +++ b/lang/ko-KR.json @@ -30,6 +30,7 @@ "label.default-date-range": "기본 날짜 범위", "label.delete": "삭제", "label.delete-team": "Delete team", + "label.delete-user": "Delete user", "label.delete-website": "웹사이트 삭제", "label.desktop": "데스크탑", "label.details": "Details", diff --git a/lang/lt-LT.json b/lang/lt-LT.json index df658b09..5faf73e8 100644 --- a/lang/lt-LT.json +++ b/lang/lt-LT.json @@ -30,6 +30,7 @@ "label.default-date-range": "Numatytasis laikotarpis", "label.delete": "Ištrinti", "label.delete-team": "Delete team", + "label.delete-user": "Delete user", "label.delete-website": "Ištrinti svetainę", "label.desktop": "Desktop", "label.details": "Details", diff --git a/lang/mn-MN.json b/lang/mn-MN.json index e8b69761..57adffe2 100644 --- a/lang/mn-MN.json +++ b/lang/mn-MN.json @@ -30,6 +30,7 @@ "label.default-date-range": "Өгөгдмөл хугацааны муж", "label.delete": "Устгах", "label.delete-team": "Delete team", + "label.delete-user": "Delete user", "label.delete-website": "Веб устгах", "label.desktop": "Суурин компьютер", "label.details": "Details", diff --git a/lang/ms-MY.json b/lang/ms-MY.json index 76cda201..c7866e01 100644 --- a/lang/ms-MY.json +++ b/lang/ms-MY.json @@ -30,6 +30,7 @@ "label.default-date-range": "Julat tarikh lalai", "label.delete": "Padam", "label.delete-team": "Delete team", + "label.delete-user": "Delete user", "label.delete-website": "Padam laman web", "label.desktop": "Desktop", "label.details": "Details", diff --git a/lang/nb-NO.json b/lang/nb-NO.json index bde63809..63e48f7c 100644 --- a/lang/nb-NO.json +++ b/lang/nb-NO.json @@ -30,6 +30,7 @@ "label.default-date-range": "Standard datoperiode", "label.delete": "Slett", "label.delete-team": "Delete team", + "label.delete-user": "Delete user", "label.delete-website": "Slett nettstedet", "label.desktop": "Stasjonær", "label.details": "Details", diff --git a/lang/nl-NL.json b/lang/nl-NL.json index f5aaa0b2..93df7898 100644 --- a/lang/nl-NL.json +++ b/lang/nl-NL.json @@ -30,6 +30,7 @@ "label.default-date-range": "Standaard bereik", "label.delete": "Verwijderen", "label.delete-team": "Delete team", + "label.delete-user": "Delete user", "label.delete-website": "Website verwijderen", "label.desktop": "Desktop", "label.details": "Details", diff --git a/lang/pl-PL.json b/lang/pl-PL.json index 7bad1366..4e3cbd6a 100644 --- a/lang/pl-PL.json +++ b/lang/pl-PL.json @@ -30,6 +30,7 @@ "label.default-date-range": "Domyślny zakres dat", "label.delete": "Usuń", "label.delete-team": "Delete team", + "label.delete-user": "Delete user", "label.delete-website": "Usuń witrynę", "label.desktop": "Komputer", "label.details": "Details", diff --git a/lang/pt-BR.json b/lang/pt-BR.json index d0474f2f..b11cb78b 100644 --- a/lang/pt-BR.json +++ b/lang/pt-BR.json @@ -30,6 +30,7 @@ "label.default-date-range": "Intervalo de datas predefinido", "label.delete": "Remover", "label.delete-team": "Delete team", + "label.delete-user": "Delete user", "label.delete-website": "Remover site", "label.desktop": "Computador", "label.details": "Details", diff --git a/lang/pt-PT.json b/lang/pt-PT.json index b25f28d4..09c9779c 100644 --- a/lang/pt-PT.json +++ b/lang/pt-PT.json @@ -30,6 +30,7 @@ "label.default-date-range": "Intervalo de datas predefinido", "label.delete": "Eliminar", "label.delete-team": "Delete team", + "label.delete-user": "Delete user", "label.delete-website": "Eliminar website", "label.desktop": "Desktop", "label.details": "Details", diff --git a/lang/ro-RO.json b/lang/ro-RO.json index 12c9da8f..c5f1a09f 100644 --- a/lang/ro-RO.json +++ b/lang/ro-RO.json @@ -30,6 +30,7 @@ "label.default-date-range": "Interval de date implicit", "label.delete": "Șterge", "label.delete-team": "Delete team", + "label.delete-user": "Delete user", "label.delete-website": "Ștergere site web", "label.desktop": "Desktop", "label.details": "Details", diff --git a/lang/ru-RU.json b/lang/ru-RU.json index 9a03e37a..7299dcac 100644 --- a/lang/ru-RU.json +++ b/lang/ru-RU.json @@ -30,6 +30,7 @@ "label.default-date-range": "Диапазон дат по-умолчанию", "label.delete": "Удалить", "label.delete-team": "Delete team", + "label.delete-user": "Delete user", "label.delete-website": "Удалить сайт", "label.desktop": "Настольный компьютер", "label.details": "Details", diff --git a/lang/sk-SK.json b/lang/sk-SK.json index dda7aee3..812a738e 100644 --- a/lang/sk-SK.json +++ b/lang/sk-SK.json @@ -30,6 +30,7 @@ "label.default-date-range": "Predvolené obdobie", "label.delete": "Zmazať", "label.delete-team": "Delete team", + "label.delete-user": "Delete user", "label.delete-website": "Zmazať web", "label.desktop": "Stolný počítač", "label.details": "Details", diff --git a/lang/sl-SI.json b/lang/sl-SI.json index c18dc6c8..d7f9bdb2 100644 --- a/lang/sl-SI.json +++ b/lang/sl-SI.json @@ -30,6 +30,7 @@ "label.default-date-range": "Privzeti časovni razpon", "label.delete": "Izbriši", "label.delete-team": "Delete team", + "label.delete-user": "Delete user", "label.delete-website": "Izbriši spletno mesto", "label.desktop": "Namizni računalnik", "label.details": "Details", diff --git a/lang/sv-SE.json b/lang/sv-SE.json index bef279f5..8e70b626 100644 --- a/lang/sv-SE.json +++ b/lang/sv-SE.json @@ -30,6 +30,7 @@ "label.default-date-range": "Standard datum-urval", "label.delete": "Radera", "label.delete-team": "Delete team", + "label.delete-user": "Delete user", "label.delete-website": "Radera webbsajt", "label.desktop": "Stationär", "label.details": "Details", diff --git a/lang/ta-IN.json b/lang/ta-IN.json index 27c5f7fc..ed16f9ec 100644 --- a/lang/ta-IN.json +++ b/lang/ta-IN.json @@ -30,6 +30,7 @@ "label.default-date-range": "இயல்புநிலை தேதி வரம்பு", "label.delete": "அழி", "label.delete-team": "Delete team", + "label.delete-user": "Delete user", "label.delete-website": "வலைத்தளத்தை நீக்கு", "label.desktop": "மேசை கணினி", "label.details": "Details", diff --git a/lang/th-TH.json b/lang/th-TH.json index d640256f..2e283653 100644 --- a/lang/th-TH.json +++ b/lang/th-TH.json @@ -30,6 +30,7 @@ "label.default-date-range": "ช่วงเวลา", "label.delete": "ลบ", "label.delete-team": "Delete team", + "label.delete-user": "Delete user", "label.delete-website": "ลบเว็บไซต์", "label.desktop": "เดสก์ท็อป", "label.details": "Details", diff --git a/lang/tr-TR.json b/lang/tr-TR.json index 1c950a44..e59ad7dd 100644 --- a/lang/tr-TR.json +++ b/lang/tr-TR.json @@ -30,6 +30,7 @@ "label.default-date-range": "Varsayılan tarih aralığı", "label.delete": "Sil", "label.delete-team": "Delete team", + "label.delete-user": "Delete user", "label.delete-website": "Web sitesini sil", "label.desktop": "Masaüstü", "label.details": "Details", diff --git a/lang/uk-UA.json b/lang/uk-UA.json index 6af6077d..de22de5d 100644 --- a/lang/uk-UA.json +++ b/lang/uk-UA.json @@ -30,6 +30,7 @@ "label.default-date-range": "Діапазон дат за замовчуванням", "label.delete": "Видалити", "label.delete-team": "Delete team", + "label.delete-user": "Delete user", "label.delete-website": "Видалити сайт", "label.desktop": "Настільний ПК", "label.details": "Details", diff --git a/lang/ur-PK.json b/lang/ur-PK.json index 9ac24ff6..39464637 100644 --- a/lang/ur-PK.json +++ b/lang/ur-PK.json @@ -30,6 +30,7 @@ "label.default-date-range": "پہلے سے طے شدہ تاریخ کی حد", "label.delete": "حذف کریں", "label.delete-team": "Delete team", + "label.delete-user": "Delete user", "label.delete-website": "ویب سائٹ مٹایں", "label.desktop": "ڈیسک ٹاپ", "label.details": "Details", diff --git a/lang/vi-VN.json b/lang/vi-VN.json index 53918d99..06f5425a 100644 --- a/lang/vi-VN.json +++ b/lang/vi-VN.json @@ -30,6 +30,7 @@ "label.default-date-range": "Khoảng thời gian mặc định", "label.delete": "Xoá", "label.delete-team": "Delete team", + "label.delete-user": "Delete user", "label.delete-website": "Xóa website", "label.desktop": "Máy bàn", "label.details": "Details", diff --git a/lang/zh-CN.json b/lang/zh-CN.json index 6d3cc9d6..140c9938 100644 --- a/lang/zh-CN.json +++ b/lang/zh-CN.json @@ -30,6 +30,7 @@ "label.default-date-range": "默认时间段", "label.delete": "删除", "label.delete-team": "Delete team", + "label.delete-user": "Delete user", "label.delete-website": "删除网站", "label.desktop": "桌面电脑", "label.details": "Details", diff --git a/lang/zh-TW.json b/lang/zh-TW.json index 51ae913b..30c63f2d 100644 --- a/lang/zh-TW.json +++ b/lang/zh-TW.json @@ -30,6 +30,7 @@ "label.default-date-range": "默認日期範圍", "label.delete": "刪除", "label.delete-team": "Delete team", + "label.delete-user": "Delete user", "label.delete-website": "刪除網站", "label.desktop": "桌機", "label.details": "Details", diff --git a/lib/lang.js b/lib/lang.js index 918f9783..0e294887 100644 --- a/lib/lang.js +++ b/lib/lang.js @@ -47,12 +47,11 @@ export const languages = { 'ar-SA': { label: 'العربية', dateLocale: arSA, dir: 'rtl' }, 'be-BY': { label: 'Беларуская', dateLocale: be }, 'bn-BD': { label: 'বাংলা', dateLocale: bn }, - 'zh-CN': { label: '中文', dateLocale: zhCN }, - 'zh-TW': { label: '中文(繁體)', dateLocale: zhTW }, 'ca-ES': { label: 'Català', dateLocale: ca }, 'cs-CZ': { label: 'Čeština', dateLocale: cs }, 'da-DK': { label: 'Dansk', dateLocale: da }, 'de-DE': { label: 'Deutsch', dateLocale: de }, + 'el-GR': { label: 'Ελληνικά', dateLocale: el }, 'en-US': { label: 'English (US)', dateLocale: enUS }, 'en-GB': { label: 'English (UK)', dateLocale: enGB }, 'es-MX': { label: 'Español', dateLocale: es }, @@ -60,23 +59,22 @@ export const languages = { 'fo-FO': { label: 'Føroyskt' }, 'fr-FR': { label: 'Français', dateLocale: fr }, 'ga-ES': { label: 'Galacian (Spain)', dateLocale: es }, - 'el-GR': { label: 'Ελληνικά', dateLocale: el }, 'he-IL': { label: 'עברית', dateLocale: he }, 'hi-IN': { label: 'हिन्दी', dateLocale: hi }, 'hu-HU': { label: 'Hungarian', dateLocale: hu }, - 'it-IT': { label: 'Italiano', dateLocale: it }, 'id-ID': { label: 'Bahasa Indonesia', dateLocale: id }, + 'it-IT': { label: 'Italiano', dateLocale: it }, 'ja-JP': { label: '日本語', dateLocale: ja }, 'km-KH': { label: 'ភាសាខ្មែរ', dateLocale: km }, 'ko-KR': { label: '한국어', dateLocale: ko }, 'lt-LT': { label: 'Lietuvių', dateLocale: lt }, - 'ms-MY': { label: 'Malay', dateLocale: ms }, 'mn-MN': { label: 'Монгол', dateLocale: mn }, + 'ms-MY': { label: 'Malay', dateLocale: ms }, 'nl-NL': { label: 'Nederlands', dateLocale: nl }, 'nb-NO': { label: 'Norsk Bokmål', dateLocale: nb }, 'pl-PL': { label: 'Polski', dateLocale: pl }, - 'pt-PT': { label: 'Português', dateLocale: pt }, 'pt-BR': { label: 'Português do Brasil', dateLocale: ptBR }, + 'pt-PT': { label: 'Português', dateLocale: pt }, 'ru-RU': { label: 'Русский', dateLocale: ru }, 'ro-RO': { label: 'Română', dateLocale: ro }, 'sk-SK': { label: 'Slovenčina', dateLocale: sk }, @@ -90,6 +88,8 @@ export const languages = { 'uk-UA': { label: 'українська', dateLocale: uk }, 'ur-PK': { label: 'Urdu (Pakistan)', dateLocale: uk, dir: 'rtl' }, 'vi-VN': { label: 'Tiếng Việt', dateLocale: vi }, + 'zh-CN': { label: '中文', dateLocale: zhCN }, + 'zh-TW': { label: '中文(繁體)', dateLocale: zhTW }, }; export function getDateLocale(locale) { diff --git a/lib/prisma.ts b/lib/prisma.ts index 9364e7bc..0a10d981 100644 --- a/lib/prisma.ts +++ b/lib/prisma.ts @@ -127,11 +127,11 @@ function parseFilters( params = [], sessionKey = 'session_id', ) { - const { os, browser, device, country, subdivision1, subdivision2, city } = filters; + const { os, browser, device, country, region, city } = filters; return { joinSession: - os || browser || device || country || subdivision1 || subdivision2 || city + os || browser || device || country || region || city ? `inner join session on website_event.${sessionKey} = session.${sessionKey}` : '', filterQuery: getFilterQuery(filters, params), diff --git a/lib/types.ts b/lib/types.ts index 5db5a586..37c1ffdc 100644 --- a/lib/types.ts +++ b/lib/types.ts @@ -82,8 +82,7 @@ export interface WebsiteMetricFilter { browser?: string; device?: string; country?: string; - subdivision1?: string; - subdivision2?: string; + region?: string; city?: string; } diff --git a/package.json b/package.json index d9cac6af..59fcc2e0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "umami", - "version": "2.0.0-beta.5", + "version": "2.0.0", "description": "A simple, fast, privacy-focused alternative to Google Analytics.", "author": "Mike Cao ", "license": "MIT", diff --git a/pages/api/websites/[id]/pageviews.ts b/pages/api/websites/[id]/pageviews.ts index c38b6c75..775a4d82 100644 --- a/pages/api/websites/[id]/pageviews.ts +++ b/pages/api/websites/[id]/pageviews.ts @@ -21,8 +21,7 @@ export interface WebsitePageviewRequestQuery { browser?: string; device?: string; country?: string; - subdivision1?: string; - subdivision2?: string; + region: string; city?: string; } @@ -46,8 +45,7 @@ export default async ( browser, device, country, - subdivision1, - subdivision2, + region, city, } = req.query; @@ -78,8 +76,7 @@ export default async ( browser, device, country, - subdivision1, - subdivision2, + region, city, }, }), @@ -96,8 +93,7 @@ export default async ( browser, device, country, - subdivision1, - subdivision2, + region, city, }, }), diff --git a/pages/api/websites/[id]/stats.ts b/pages/api/websites/[id]/stats.ts index f89ea5d1..1e2f2292 100644 --- a/pages/api/websites/[id]/stats.ts +++ b/pages/api/websites/[id]/stats.ts @@ -18,8 +18,7 @@ export interface WebsiteStatsRequestQuery { browser: string; device: string; country: string; - subdivision1: string; - subdivision2: string; + region: string; city: string; } @@ -43,8 +42,7 @@ export default async ( browser, device, country, - subdivision1, - subdivision2, + region, city, } = req.query; @@ -73,8 +71,7 @@ export default async ( browser, device, country, - subdivision1, - subdivision2, + region, city, }, }); @@ -91,8 +88,7 @@ export default async ( browser, device, country, - subdivision1, - subdivision2, + region, city, }, }); diff --git a/public/intl/messages/ar-SA.json b/public/intl/messages/ar-SA.json index 2d619f5b..d1f38c00 100644 --- a/public/intl/messages/ar-SA.json +++ b/public/intl/messages/ar-SA.json @@ -23,7 +23,7 @@ "value": "إضافة موقع" } ], - "label.administrator": [ + "label.admin": [ { "type": 0, "value": "مدير عام؟" @@ -83,6 +83,12 @@ "value": "تغيير كلمة المرور" } ], + "label.cities": [ + { + "type": 0, + "value": "Cities" + } + ], "label.clear-all": [ { "type": 0, @@ -179,6 +185,12 @@ "value": "Delete team" } ], + "label.delete-user": [ + { + "type": 0, + "value": "Delete user" + } + ], "label.delete-website": [ { "type": 0, @@ -445,6 +457,12 @@ "value": "Regenerate" } ], + "label.regions": [ + { + "type": 0, + "value": "Regions" + } + ], "label.remove": [ { "type": 0, @@ -643,6 +661,12 @@ "value": "Users" } ], + "label.view": [ + { + "type": 0, + "value": "View" + } + ], "label.view-details": [ { "type": 0, diff --git a/public/intl/messages/be-BY.json b/public/intl/messages/be-BY.json index b1678814..9df893f7 100644 --- a/public/intl/messages/be-BY.json +++ b/public/intl/messages/be-BY.json @@ -23,7 +23,7 @@ "value": "Дадаць сайт" } ], - "label.administrator": [ + "label.admin": [ { "type": 0, "value": "Адміністратар" @@ -83,6 +83,12 @@ "value": "Змяніць пароль" } ], + "label.cities": [ + { + "type": 0, + "value": "Cities" + } + ], "label.clear-all": [ { "type": 0, @@ -179,6 +185,12 @@ "value": "Delete team" } ], + "label.delete-user": [ + { + "type": 0, + "value": "Delete user" + } + ], "label.delete-website": [ { "type": 0, @@ -445,6 +457,12 @@ "value": "Regenerate" } ], + "label.regions": [ + { + "type": 0, + "value": "Regions" + } + ], "label.remove": [ { "type": 0, @@ -643,6 +661,12 @@ "value": "Users" } ], + "label.view": [ + { + "type": 0, + "value": "View" + } + ], "label.view-details": [ { "type": 0, diff --git a/public/intl/messages/bn-BD.json b/public/intl/messages/bn-BD.json index f0741ef2..c3b5a968 100644 --- a/public/intl/messages/bn-BD.json +++ b/public/intl/messages/bn-BD.json @@ -23,7 +23,7 @@ "value": "ওয়েবসাইট যুক্ত করুন" } ], - "label.administrator": [ + "label.admin": [ { "type": 0, "value": "অ্যাডমিন" @@ -83,6 +83,12 @@ "value": "পাসওয়ার্ড পরিবর্তন করুন" } ], + "label.cities": [ + { + "type": 0, + "value": "Cities" + } + ], "label.clear-all": [ { "type": 0, @@ -179,6 +185,12 @@ "value": "Delete team" } ], + "label.delete-user": [ + { + "type": 0, + "value": "Delete user" + } + ], "label.delete-website": [ { "type": 0, @@ -445,6 +457,12 @@ "value": "Regenerate" } ], + "label.regions": [ + { + "type": 0, + "value": "Regions" + } + ], "label.remove": [ { "type": 0, @@ -643,6 +661,12 @@ "value": "Users" } ], + "label.view": [ + { + "type": 0, + "value": "View" + } + ], "label.view-details": [ { "type": 0, diff --git a/public/intl/messages/ca-ES.json b/public/intl/messages/ca-ES.json index 0ac56523..69ae2b0b 100644 --- a/public/intl/messages/ca-ES.json +++ b/public/intl/messages/ca-ES.json @@ -23,7 +23,7 @@ "value": "Afegeix lloc web" } ], - "label.administrator": [ + "label.admin": [ { "type": 0, "value": "Administrador" @@ -83,6 +83,12 @@ "value": "Canvia la contrasenya" } ], + "label.cities": [ + { + "type": 0, + "value": "Cities" + } + ], "label.clear-all": [ { "type": 0, @@ -179,6 +185,12 @@ "value": "Delete team" } ], + "label.delete-user": [ + { + "type": 0, + "value": "Delete user" + } + ], "label.delete-website": [ { "type": 0, @@ -445,6 +457,12 @@ "value": "Regenerate" } ], + "label.regions": [ + { + "type": 0, + "value": "Regions" + } + ], "label.remove": [ { "type": 0, @@ -643,6 +661,12 @@ "value": "Users" } ], + "label.view": [ + { + "type": 0, + "value": "View" + } + ], "label.view-details": [ { "type": 0, diff --git a/public/intl/messages/cs-CZ.json b/public/intl/messages/cs-CZ.json index 86a5ac0e..8f63669e 100644 --- a/public/intl/messages/cs-CZ.json +++ b/public/intl/messages/cs-CZ.json @@ -23,7 +23,7 @@ "value": "Přidat web" } ], - "label.administrator": [ + "label.admin": [ { "type": 0, "value": "Administrátor" @@ -83,6 +83,12 @@ "value": "Změnit heslo" } ], + "label.cities": [ + { + "type": 0, + "value": "Cities" + } + ], "label.clear-all": [ { "type": 0, @@ -179,6 +185,12 @@ "value": "Delete team" } ], + "label.delete-user": [ + { + "type": 0, + "value": "Delete user" + } + ], "label.delete-website": [ { "type": 0, @@ -445,6 +457,12 @@ "value": "Regenerate" } ], + "label.regions": [ + { + "type": 0, + "value": "Regions" + } + ], "label.remove": [ { "type": 0, @@ -643,6 +661,12 @@ "value": "Users" } ], + "label.view": [ + { + "type": 0, + "value": "View" + } + ], "label.view-details": [ { "type": 0, diff --git a/public/intl/messages/da-DK.json b/public/intl/messages/da-DK.json index 6f7f1b65..fe33cd30 100644 --- a/public/intl/messages/da-DK.json +++ b/public/intl/messages/da-DK.json @@ -23,7 +23,7 @@ "value": "Tilføj hjemmeside" } ], - "label.administrator": [ + "label.admin": [ { "type": 0, "value": "Administrator" @@ -83,6 +83,12 @@ "value": "Skift adgangskode" } ], + "label.cities": [ + { + "type": 0, + "value": "Cities" + } + ], "label.clear-all": [ { "type": 0, @@ -179,6 +185,12 @@ "value": "Delete team" } ], + "label.delete-user": [ + { + "type": 0, + "value": "Delete user" + } + ], "label.delete-website": [ { "type": 0, @@ -445,6 +457,12 @@ "value": "Regenerate" } ], + "label.regions": [ + { + "type": 0, + "value": "Regions" + } + ], "label.remove": [ { "type": 0, @@ -643,6 +661,12 @@ "value": "Users" } ], + "label.view": [ + { + "type": 0, + "value": "View" + } + ], "label.view-details": [ { "type": 0, diff --git a/public/intl/messages/de-CH.json b/public/intl/messages/de-CH.json index 03569087..541e9e3c 100644 --- a/public/intl/messages/de-CH.json +++ b/public/intl/messages/de-CH.json @@ -23,7 +23,7 @@ "value": "Websiite hinzuefüege" } ], - "label.administrator": [ + "label.admin": [ { "type": 0, "value": "Administrator" @@ -83,6 +83,12 @@ "value": "Passwort ändere" } ], + "label.cities": [ + { + "type": 0, + "value": "Cities" + } + ], "label.clear-all": [ { "type": 0, @@ -179,6 +185,12 @@ "value": "Delete team" } ], + "label.delete-user": [ + { + "type": 0, + "value": "Delete user" + } + ], "label.delete-website": [ { "type": 0, @@ -445,6 +457,12 @@ "value": "Regenerate" } ], + "label.regions": [ + { + "type": 0, + "value": "Regions" + } + ], "label.remove": [ { "type": 0, @@ -643,6 +661,12 @@ "value": "Users" } ], + "label.view": [ + { + "type": 0, + "value": "View" + } + ], "label.view-details": [ { "type": 0, diff --git a/public/intl/messages/de-DE.json b/public/intl/messages/de-DE.json index 5f008531..f535d5f8 100644 --- a/public/intl/messages/de-DE.json +++ b/public/intl/messages/de-DE.json @@ -23,7 +23,7 @@ "value": "Webseite hinzufügen" } ], - "label.administrator": [ + "label.admin": [ { "type": 0, "value": "Administrator" @@ -83,6 +83,12 @@ "value": "Passwort ändern" } ], + "label.cities": [ + { + "type": 0, + "value": "Cities" + } + ], "label.clear-all": [ { "type": 0, @@ -179,6 +185,12 @@ "value": "Delete team" } ], + "label.delete-user": [ + { + "type": 0, + "value": "Delete user" + } + ], "label.delete-website": [ { "type": 0, @@ -445,6 +457,12 @@ "value": "Regenerate" } ], + "label.regions": [ + { + "type": 0, + "value": "Regions" + } + ], "label.remove": [ { "type": 0, @@ -643,6 +661,12 @@ "value": "Users" } ], + "label.view": [ + { + "type": 0, + "value": "View" + } + ], "label.view-details": [ { "type": 0, diff --git a/public/intl/messages/el-GR.json b/public/intl/messages/el-GR.json index 73164575..4ff0b2ef 100644 --- a/public/intl/messages/el-GR.json +++ b/public/intl/messages/el-GR.json @@ -23,7 +23,7 @@ "value": "Προσθήκη ιστότοπου" } ], - "label.administrator": [ + "label.admin": [ { "type": 0, "value": "Διαχειριστής" @@ -83,6 +83,12 @@ "value": "Αλλαγή κωδικού" } ], + "label.cities": [ + { + "type": 0, + "value": "Cities" + } + ], "label.clear-all": [ { "type": 0, @@ -179,6 +185,12 @@ "value": "Delete team" } ], + "label.delete-user": [ + { + "type": 0, + "value": "Delete user" + } + ], "label.delete-website": [ { "type": 0, @@ -445,6 +457,12 @@ "value": "Regenerate" } ], + "label.regions": [ + { + "type": 0, + "value": "Regions" + } + ], "label.remove": [ { "type": 0, @@ -643,6 +661,12 @@ "value": "Users" } ], + "label.view": [ + { + "type": 0, + "value": "View" + } + ], "label.view-details": [ { "type": 0, diff --git a/public/intl/messages/en-GB.json b/public/intl/messages/en-GB.json index d8ce582a..e7ce8a07 100644 --- a/public/intl/messages/en-GB.json +++ b/public/intl/messages/en-GB.json @@ -23,7 +23,7 @@ "value": "Add website" } ], - "label.administrator": [ + "label.admin": [ { "type": 0, "value": "Administrator" @@ -83,6 +83,12 @@ "value": "Change password" } ], + "label.cities": [ + { + "type": 0, + "value": "Cities" + } + ], "label.clear-all": [ { "type": 0, @@ -179,6 +185,12 @@ "value": "Delete team" } ], + "label.delete-user": [ + { + "type": 0, + "value": "Delete user" + } + ], "label.delete-website": [ { "type": 0, @@ -445,6 +457,12 @@ "value": "Regenerate" } ], + "label.regions": [ + { + "type": 0, + "value": "Regions" + } + ], "label.remove": [ { "type": 0, @@ -643,6 +661,12 @@ "value": "Users" } ], + "label.view": [ + { + "type": 0, + "value": "View" + } + ], "label.view-details": [ { "type": 0, diff --git a/public/intl/messages/en-US.json b/public/intl/messages/en-US.json index 5dc57b9e..a13b9e5e 100644 --- a/public/intl/messages/en-US.json +++ b/public/intl/messages/en-US.json @@ -23,7 +23,7 @@ "value": "Add website" } ], - "label.administrator": [ + "label.admin": [ { "type": 0, "value": "Administrator" @@ -83,6 +83,12 @@ "value": "Change password" } ], + "label.cities": [ + { + "type": 0, + "value": "Cities" + } + ], "label.clear-all": [ { "type": 0, @@ -140,7 +146,7 @@ "label.custom-range": [ { "type": 0, - "value": "Custom range" + "value": "Custom-range" } ], "label.dashboard": [ @@ -179,6 +185,12 @@ "value": "Delete team" } ], + "label.delete-user": [ + { + "type": 0, + "value": "Delete user" + } + ], "label.delete-website": [ { "type": 0, @@ -445,6 +457,12 @@ "value": "Regenerate" } ], + "label.regions": [ + { + "type": 0, + "value": "Regions" + } + ], "label.remove": [ { "type": 0, @@ -466,7 +484,7 @@ "label.reset-website": [ { "type": 0, - "value": "Reset statistics" + "value": "Reset website" } ], "label.role": [ @@ -643,6 +661,12 @@ "value": "Users" } ], + "label.view": [ + { + "type": 0, + "value": "View" + } + ], "label.view-details": [ { "type": 0, @@ -752,7 +776,7 @@ }, { "type": 0, - "value": "'s statistics?" + "value": "?" } ], "message.delete-website": [ @@ -772,7 +796,7 @@ "message.delete-website-warning": [ { "type": 0, - "value": "All associated data will be deleted as well." + "value": "All website data will be deleted." } ], "message.error": [ @@ -804,13 +828,13 @@ "message.incorrect-username-password": [ { "type": 0, - "value": "Incorrect username/password." + "value": "Incorrect username and/or password." } ], "message.invalid-domain": [ { "type": 0, - "value": "Invalid domain" + "value": "Invalid domain. Do not include http/https." } ], "message.min-password-length": [ @@ -836,7 +860,7 @@ "message.no-match-password": [ { "type": 0, - "value": "Passwords don't match" + "value": "Passwords do not match." } ], "message.no-teams": [ @@ -854,39 +878,39 @@ "message.page-not-found": [ { "type": 0, - "value": "Page not found." + "value": "Page not found" } ], "message.reset-website": [ { "type": 0, - "value": "Reset statistics" + "value": "To reset this website, type " + }, + { + "type": 1, + "value": "confirmation" + }, + { + "type": 0, + "value": " in the box below to confirm." } ], "message.reset-website-warning": [ { "type": 0, - "value": "All statistics for this website will be deleted, but your tracking code will remain intact." + "value": "All statistics for this website will be deleted, but your settings will remain intact." } ], "message.saved": [ { "type": 0, - "value": "Saved successfully." + "value": "Saved." } ], "message.share-url": [ { "type": 0, - "value": "This is the publicly shared URL for " - }, - { - "type": 1, - "value": "target" - }, - { - "type": 0, - "value": "." + "value": "Your website stats are publically available at the following URL:" } ], "message.team-already-member": [ @@ -904,7 +928,21 @@ "message.tracking-code": [ { "type": 0, - "value": "Tracking code" + "value": "To track stats for this website, place the following code in the " + }, + { + "children": [ + { + "type": 0, + "value": "..." + } + ], + "type": 8, + "value": "head" + }, + { + "type": 0, + "value": " section of your HTML." } ], "message.user-deleted": [ @@ -956,7 +994,7 @@ "messages.no-websites-configured": [ { "type": 0, - "value": "You don't have any websites configured." + "value": "You do not have any websites configured." } ], "messages.team-websites-info": [ diff --git a/public/intl/messages/es-MX.json b/public/intl/messages/es-MX.json index 7d2d9634..83892df3 100644 --- a/public/intl/messages/es-MX.json +++ b/public/intl/messages/es-MX.json @@ -23,7 +23,7 @@ "value": "Agregar sitio" } ], - "label.administrator": [ + "label.admin": [ { "type": 0, "value": "Administrador" @@ -83,6 +83,12 @@ "value": "Cambiar contraseña" } ], + "label.cities": [ + { + "type": 0, + "value": "Cities" + } + ], "label.clear-all": [ { "type": 0, @@ -179,6 +185,12 @@ "value": "Delete team" } ], + "label.delete-user": [ + { + "type": 0, + "value": "Delete user" + } + ], "label.delete-website": [ { "type": 0, @@ -445,6 +457,12 @@ "value": "Regenerate" } ], + "label.regions": [ + { + "type": 0, + "value": "Regions" + } + ], "label.remove": [ { "type": 0, @@ -643,6 +661,12 @@ "value": "Users" } ], + "label.view": [ + { + "type": 0, + "value": "View" + } + ], "label.view-details": [ { "type": 0, diff --git a/public/intl/messages/fa-IR.json b/public/intl/messages/fa-IR.json index 274aef1c..07d239a9 100644 --- a/public/intl/messages/fa-IR.json +++ b/public/intl/messages/fa-IR.json @@ -23,7 +23,7 @@ "value": "افزودن وب‌سایت" } ], - "label.administrator": [ + "label.admin": [ { "type": 0, "value": "مدیر" @@ -83,6 +83,12 @@ "value": "تغییر رمز" } ], + "label.cities": [ + { + "type": 0, + "value": "Cities" + } + ], "label.clear-all": [ { "type": 0, @@ -179,6 +185,12 @@ "value": "Delete team" } ], + "label.delete-user": [ + { + "type": 0, + "value": "Delete user" + } + ], "label.delete-website": [ { "type": 0, @@ -445,6 +457,12 @@ "value": "Regenerate" } ], + "label.regions": [ + { + "type": 0, + "value": "Regions" + } + ], "label.remove": [ { "type": 0, @@ -643,6 +661,12 @@ "value": "Users" } ], + "label.view": [ + { + "type": 0, + "value": "View" + } + ], "label.view-details": [ { "type": 0, diff --git a/public/intl/messages/fi-FI.json b/public/intl/messages/fi-FI.json index 2febf774..87c18a2b 100644 --- a/public/intl/messages/fi-FI.json +++ b/public/intl/messages/fi-FI.json @@ -23,7 +23,7 @@ "value": "Lisää verkkosivu" } ], - "label.administrator": [ + "label.admin": [ { "type": 0, "value": "Järjestelmänvalvoja" @@ -83,6 +83,12 @@ "value": "Vaihda salasana" } ], + "label.cities": [ + { + "type": 0, + "value": "Cities" + } + ], "label.clear-all": [ { "type": 0, @@ -179,6 +185,12 @@ "value": "Delete team" } ], + "label.delete-user": [ + { + "type": 0, + "value": "Delete user" + } + ], "label.delete-website": [ { "type": 0, @@ -445,6 +457,12 @@ "value": "Regenerate" } ], + "label.regions": [ + { + "type": 0, + "value": "Regions" + } + ], "label.remove": [ { "type": 0, @@ -643,6 +661,12 @@ "value": "Users" } ], + "label.view": [ + { + "type": 0, + "value": "View" + } + ], "label.view-details": [ { "type": 0, diff --git a/public/intl/messages/fo-FO.json b/public/intl/messages/fo-FO.json index 868e73db..77a7204c 100644 --- a/public/intl/messages/fo-FO.json +++ b/public/intl/messages/fo-FO.json @@ -23,7 +23,7 @@ "value": "Legg heimasíðu afturat" } ], - "label.administrator": [ + "label.admin": [ { "type": 0, "value": "Fyrisitari" @@ -83,6 +83,12 @@ "value": "Skift loyniorð" } ], + "label.cities": [ + { + "type": 0, + "value": "Cities" + } + ], "label.clear-all": [ { "type": 0, @@ -179,6 +185,12 @@ "value": "Delete team" } ], + "label.delete-user": [ + { + "type": 0, + "value": "Delete user" + } + ], "label.delete-website": [ { "type": 0, @@ -445,6 +457,12 @@ "value": "Regenerate" } ], + "label.regions": [ + { + "type": 0, + "value": "Regions" + } + ], "label.remove": [ { "type": 0, @@ -643,6 +661,12 @@ "value": "Users" } ], + "label.view": [ + { + "type": 0, + "value": "View" + } + ], "label.view-details": [ { "type": 0, diff --git a/public/intl/messages/fr-FR.json b/public/intl/messages/fr-FR.json index fa268508..5ffcf3da 100644 --- a/public/intl/messages/fr-FR.json +++ b/public/intl/messages/fr-FR.json @@ -23,7 +23,7 @@ "value": "Ajouter un site" } ], - "label.administrator": [ + "label.admin": [ { "type": 0, "value": "Administrateur" @@ -83,6 +83,12 @@ "value": "Changer le mot de passe" } ], + "label.cities": [ + { + "type": 0, + "value": "Cities" + } + ], "label.clear-all": [ { "type": 0, @@ -179,6 +185,12 @@ "value": "Delete team" } ], + "label.delete-user": [ + { + "type": 0, + "value": "Delete user" + } + ], "label.delete-website": [ { "type": 0, @@ -437,6 +449,12 @@ "value": "Regenerate" } ], + "label.regions": [ + { + "type": 0, + "value": "Regions" + } + ], "label.remove": [ { "type": 0, @@ -635,6 +653,12 @@ "value": "Users" } ], + "label.view": [ + { + "type": 0, + "value": "View" + } + ], "label.view-details": [ { "type": 0, diff --git a/public/intl/messages/ga-ES.json b/public/intl/messages/ga-ES.json index d4f6aa10..e98954ce 100644 --- a/public/intl/messages/ga-ES.json +++ b/public/intl/messages/ga-ES.json @@ -23,7 +23,7 @@ "value": "Engadir sitio web" } ], - "label.administrator": [ + "label.admin": [ { "type": 0, "value": "Administradora" @@ -83,6 +83,12 @@ "value": "Mudar contrasinal" } ], + "label.cities": [ + { + "type": 0, + "value": "Cities" + } + ], "label.clear-all": [ { "type": 0, @@ -179,6 +185,12 @@ "value": "Delete team" } ], + "label.delete-user": [ + { + "type": 0, + "value": "Delete user" + } + ], "label.delete-website": [ { "type": 0, @@ -445,6 +457,12 @@ "value": "Regenerate" } ], + "label.regions": [ + { + "type": 0, + "value": "Regions" + } + ], "label.remove": [ { "type": 0, @@ -643,6 +661,12 @@ "value": "Users" } ], + "label.view": [ + { + "type": 0, + "value": "View" + } + ], "label.view-details": [ { "type": 0, diff --git a/public/intl/messages/he-IL.json b/public/intl/messages/he-IL.json index 9f38d94a..0fc4cc30 100644 --- a/public/intl/messages/he-IL.json +++ b/public/intl/messages/he-IL.json @@ -23,7 +23,7 @@ "value": "הוספת אתר" } ], - "label.administrator": [ + "label.admin": [ { "type": 0, "value": "מנהל" @@ -83,6 +83,12 @@ "value": "שינוי סיסמה" } ], + "label.cities": [ + { + "type": 0, + "value": "Cities" + } + ], "label.clear-all": [ { "type": 0, @@ -179,6 +185,12 @@ "value": "Delete team" } ], + "label.delete-user": [ + { + "type": 0, + "value": "Delete user" + } + ], "label.delete-website": [ { "type": 0, @@ -437,6 +449,12 @@ "value": "Regenerate" } ], + "label.regions": [ + { + "type": 0, + "value": "Regions" + } + ], "label.remove": [ { "type": 0, @@ -635,6 +653,12 @@ "value": "Users" } ], + "label.view": [ + { + "type": 0, + "value": "View" + } + ], "label.view-details": [ { "type": 0, diff --git a/public/intl/messages/hi-IN.json b/public/intl/messages/hi-IN.json index 8329e4c0..f8b09d3d 100644 --- a/public/intl/messages/hi-IN.json +++ b/public/intl/messages/hi-IN.json @@ -23,7 +23,7 @@ "value": "वेबसाइट" } ], - "label.administrator": [ + "label.admin": [ { "type": 0, "value": "प्रशासक" @@ -83,6 +83,12 @@ "value": "पासवर्ड बदलें" } ], + "label.cities": [ + { + "type": 0, + "value": "Cities" + } + ], "label.clear-all": [ { "type": 0, @@ -179,6 +185,12 @@ "value": "Delete team" } ], + "label.delete-user": [ + { + "type": 0, + "value": "Delete user" + } + ], "label.delete-website": [ { "type": 0, @@ -445,6 +457,12 @@ "value": "Regenerate" } ], + "label.regions": [ + { + "type": 0, + "value": "Regions" + } + ], "label.remove": [ { "type": 0, @@ -643,6 +661,12 @@ "value": "Users" } ], + "label.view": [ + { + "type": 0, + "value": "View" + } + ], "label.view-details": [ { "type": 0, diff --git a/public/intl/messages/hu-HU.json b/public/intl/messages/hu-HU.json index ce08891e..aeb62332 100644 --- a/public/intl/messages/hu-HU.json +++ b/public/intl/messages/hu-HU.json @@ -23,7 +23,7 @@ "value": "Weboldal hozzáadása" } ], - "label.administrator": [ + "label.admin": [ { "type": 0, "value": "Adminisztrátor" @@ -83,6 +83,12 @@ "value": "Jelszó módosítása" } ], + "label.cities": [ + { + "type": 0, + "value": "Cities" + } + ], "label.clear-all": [ { "type": 0, @@ -179,6 +185,12 @@ "value": "Delete team" } ], + "label.delete-user": [ + { + "type": 0, + "value": "Delete user" + } + ], "label.delete-website": [ { "type": 0, @@ -445,6 +457,12 @@ "value": "Regenerate" } ], + "label.regions": [ + { + "type": 0, + "value": "Regions" + } + ], "label.remove": [ { "type": 0, @@ -643,6 +661,12 @@ "value": "Users" } ], + "label.view": [ + { + "type": 0, + "value": "View" + } + ], "label.view-details": [ { "type": 0, diff --git a/public/intl/messages/id-ID.json b/public/intl/messages/id-ID.json index 7792fe04..6d097917 100644 --- a/public/intl/messages/id-ID.json +++ b/public/intl/messages/id-ID.json @@ -23,7 +23,7 @@ "value": "Tambah situs web" } ], - "label.administrator": [ + "label.admin": [ { "type": 0, "value": "Pengelola" @@ -83,6 +83,12 @@ "value": "Ganti kata sandi" } ], + "label.cities": [ + { + "type": 0, + "value": "Cities" + } + ], "label.clear-all": [ { "type": 0, @@ -179,6 +185,12 @@ "value": "Delete team" } ], + "label.delete-user": [ + { + "type": 0, + "value": "Delete user" + } + ], "label.delete-website": [ { "type": 0, @@ -437,6 +449,12 @@ "value": "Regenerate" } ], + "label.regions": [ + { + "type": 0, + "value": "Regions" + } + ], "label.remove": [ { "type": 0, @@ -635,6 +653,12 @@ "value": "Users" } ], + "label.view": [ + { + "type": 0, + "value": "View" + } + ], "label.view-details": [ { "type": 0, diff --git a/public/intl/messages/it-IT.json b/public/intl/messages/it-IT.json index 1270d291..bf8b6b1f 100644 --- a/public/intl/messages/it-IT.json +++ b/public/intl/messages/it-IT.json @@ -23,7 +23,7 @@ "value": "Aggiungi sito" } ], - "label.administrator": [ + "label.admin": [ { "type": 0, "value": "Amministratore" @@ -83,6 +83,12 @@ "value": "Modifica password" } ], + "label.cities": [ + { + "type": 0, + "value": "Cities" + } + ], "label.clear-all": [ { "type": 0, @@ -179,6 +185,12 @@ "value": "Delete team" } ], + "label.delete-user": [ + { + "type": 0, + "value": "Delete user" + } + ], "label.delete-website": [ { "type": 0, @@ -445,6 +457,12 @@ "value": "Regenerate" } ], + "label.regions": [ + { + "type": 0, + "value": "Regions" + } + ], "label.remove": [ { "type": 0, @@ -643,6 +661,12 @@ "value": "Users" } ], + "label.view": [ + { + "type": 0, + "value": "View" + } + ], "label.view-details": [ { "type": 0, diff --git a/public/intl/messages/ja-JP.json b/public/intl/messages/ja-JP.json index 4a80a094..38b175ac 100644 --- a/public/intl/messages/ja-JP.json +++ b/public/intl/messages/ja-JP.json @@ -23,7 +23,7 @@ "value": "Webサイトの追加" } ], - "label.administrator": [ + "label.admin": [ { "type": 0, "value": "管理者" @@ -83,6 +83,12 @@ "value": "パスワード変更" } ], + "label.cities": [ + { + "type": 0, + "value": "Cities" + } + ], "label.clear-all": [ { "type": 0, @@ -179,6 +185,12 @@ "value": "Delete team" } ], + "label.delete-user": [ + { + "type": 0, + "value": "Delete user" + } + ], "label.delete-website": [ { "type": 0, @@ -449,6 +461,12 @@ "value": "Regenerate" } ], + "label.regions": [ + { + "type": 0, + "value": "Regions" + } + ], "label.remove": [ { "type": 0, @@ -647,6 +665,12 @@ "value": "Users" } ], + "label.view": [ + { + "type": 0, + "value": "View" + } + ], "label.view-details": [ { "type": 0, diff --git a/public/intl/messages/km-KH.json b/public/intl/messages/km-KH.json index fb992ad0..cec8c3b9 100644 --- a/public/intl/messages/km-KH.json +++ b/public/intl/messages/km-KH.json @@ -23,7 +23,7 @@ "value": "បន្ថែមគេហទំព័រ" } ], - "label.administrator": [ + "label.admin": [ { "type": 0, "value": "អ្នកគ្រប់គ្រង" @@ -83,6 +83,12 @@ "value": "ផ្លាស់ប្តូរពាក្យសម្ងាត់" } ], + "label.cities": [ + { + "type": 0, + "value": "Cities" + } + ], "label.clear-all": [ { "type": 0, @@ -179,6 +185,12 @@ "value": "Delete team" } ], + "label.delete-user": [ + { + "type": 0, + "value": "Delete user" + } + ], "label.delete-website": [ { "type": 0, @@ -437,6 +449,12 @@ "value": "Regenerate" } ], + "label.regions": [ + { + "type": 0, + "value": "Regions" + } + ], "label.remove": [ { "type": 0, @@ -635,6 +653,12 @@ "value": "Users" } ], + "label.view": [ + { + "type": 0, + "value": "View" + } + ], "label.view-details": [ { "type": 0, diff --git a/public/intl/messages/ko-KR.json b/public/intl/messages/ko-KR.json index 8675a947..014eda73 100644 --- a/public/intl/messages/ko-KR.json +++ b/public/intl/messages/ko-KR.json @@ -23,7 +23,7 @@ "value": "웹사이트 추가" } ], - "label.administrator": [ + "label.admin": [ { "type": 0, "value": "관리자" @@ -83,6 +83,12 @@ "value": "비밀번호 변경" } ], + "label.cities": [ + { + "type": 0, + "value": "Cities" + } + ], "label.clear-all": [ { "type": 0, @@ -179,6 +185,12 @@ "value": "Delete team" } ], + "label.delete-user": [ + { + "type": 0, + "value": "Delete user" + } + ], "label.delete-website": [ { "type": 0, @@ -449,6 +461,12 @@ "value": "Regenerate" } ], + "label.regions": [ + { + "type": 0, + "value": "Regions" + } + ], "label.remove": [ { "type": 0, @@ -647,6 +665,12 @@ "value": "Users" } ], + "label.view": [ + { + "type": 0, + "value": "View" + } + ], "label.view-details": [ { "type": 0, diff --git a/public/intl/messages/lt-LT.json b/public/intl/messages/lt-LT.json index 7380da26..1380efef 100644 --- a/public/intl/messages/lt-LT.json +++ b/public/intl/messages/lt-LT.json @@ -23,7 +23,7 @@ "value": "Pridėti svetainę" } ], - "label.administrator": [ + "label.admin": [ { "type": 0, "value": "Administratorius" @@ -83,6 +83,12 @@ "value": "Pakeisti slaptažodį" } ], + "label.cities": [ + { + "type": 0, + "value": "Cities" + } + ], "label.clear-all": [ { "type": 0, @@ -179,6 +185,12 @@ "value": "Delete team" } ], + "label.delete-user": [ + { + "type": 0, + "value": "Delete user" + } + ], "label.delete-website": [ { "type": 0, @@ -550,6 +562,12 @@ "value": "Regenerate" } ], + "label.regions": [ + { + "type": 0, + "value": "Regions" + } + ], "label.remove": [ { "type": 0, @@ -748,6 +766,12 @@ "value": "Users" } ], + "label.view": [ + { + "type": 0, + "value": "View" + } + ], "label.view-details": [ { "type": 0, diff --git a/public/intl/messages/mn-MN.json b/public/intl/messages/mn-MN.json index 40ef70a6..dc1b028b 100644 --- a/public/intl/messages/mn-MN.json +++ b/public/intl/messages/mn-MN.json @@ -23,7 +23,7 @@ "value": "Веб нэмэх" } ], - "label.administrator": [ + "label.admin": [ { "type": 0, "value": "Админ" @@ -83,6 +83,12 @@ "value": "Нууц үг солих" } ], + "label.cities": [ + { + "type": 0, + "value": "Cities" + } + ], "label.clear-all": [ { "type": 0, @@ -179,6 +185,12 @@ "value": "Delete team" } ], + "label.delete-user": [ + { + "type": 0, + "value": "Delete user" + } + ], "label.delete-website": [ { "type": 0, @@ -445,6 +457,12 @@ "value": "Regenerate" } ], + "label.regions": [ + { + "type": 0, + "value": "Regions" + } + ], "label.remove": [ { "type": 0, @@ -643,6 +661,12 @@ "value": "Users" } ], + "label.view": [ + { + "type": 0, + "value": "View" + } + ], "label.view-details": [ { "type": 0, diff --git a/public/intl/messages/ms-MY.json b/public/intl/messages/ms-MY.json index 9c7d0a63..7a7cf456 100644 --- a/public/intl/messages/ms-MY.json +++ b/public/intl/messages/ms-MY.json @@ -23,7 +23,7 @@ "value": "Tambah laman web" } ], - "label.administrator": [ + "label.admin": [ { "type": 0, "value": "Pentadbir" @@ -83,6 +83,12 @@ "value": "Tukar kata laluan" } ], + "label.cities": [ + { + "type": 0, + "value": "Cities" + } + ], "label.clear-all": [ { "type": 0, @@ -179,6 +185,12 @@ "value": "Delete team" } ], + "label.delete-user": [ + { + "type": 0, + "value": "Delete user" + } + ], "label.delete-website": [ { "type": 0, @@ -437,6 +449,12 @@ "value": "Regenerate" } ], + "label.regions": [ + { + "type": 0, + "value": "Regions" + } + ], "label.remove": [ { "type": 0, @@ -635,6 +653,12 @@ "value": "Users" } ], + "label.view": [ + { + "type": 0, + "value": "View" + } + ], "label.view-details": [ { "type": 0, diff --git a/public/intl/messages/nb-NO.json b/public/intl/messages/nb-NO.json index 9231507c..4a8569b2 100644 --- a/public/intl/messages/nb-NO.json +++ b/public/intl/messages/nb-NO.json @@ -23,7 +23,7 @@ "value": "Legg til nettsted" } ], - "label.administrator": [ + "label.admin": [ { "type": 0, "value": "Administrator" @@ -83,6 +83,12 @@ "value": "Bytt passord" } ], + "label.cities": [ + { + "type": 0, + "value": "Cities" + } + ], "label.clear-all": [ { "type": 0, @@ -179,6 +185,12 @@ "value": "Delete team" } ], + "label.delete-user": [ + { + "type": 0, + "value": "Delete user" + } + ], "label.delete-website": [ { "type": 0, @@ -445,6 +457,12 @@ "value": "Regenerate" } ], + "label.regions": [ + { + "type": 0, + "value": "Regions" + } + ], "label.remove": [ { "type": 0, @@ -643,6 +661,12 @@ "value": "Users" } ], + "label.view": [ + { + "type": 0, + "value": "View" + } + ], "label.view-details": [ { "type": 0, diff --git a/public/intl/messages/nl-NL.json b/public/intl/messages/nl-NL.json index a379e54e..f1ac9094 100644 --- a/public/intl/messages/nl-NL.json +++ b/public/intl/messages/nl-NL.json @@ -23,7 +23,7 @@ "value": "Website toevoegen" } ], - "label.administrator": [ + "label.admin": [ { "type": 0, "value": "Administrator" @@ -83,6 +83,12 @@ "value": "Wachtwoord wijzigen" } ], + "label.cities": [ + { + "type": 0, + "value": "Cities" + } + ], "label.clear-all": [ { "type": 0, @@ -179,6 +185,12 @@ "value": "Delete team" } ], + "label.delete-user": [ + { + "type": 0, + "value": "Delete user" + } + ], "label.delete-website": [ { "type": 0, @@ -445,6 +457,12 @@ "value": "Regenerate" } ], + "label.regions": [ + { + "type": 0, + "value": "Regions" + } + ], "label.remove": [ { "type": 0, @@ -643,6 +661,12 @@ "value": "Users" } ], + "label.view": [ + { + "type": 0, + "value": "View" + } + ], "label.view-details": [ { "type": 0, diff --git a/public/intl/messages/pl-PL.json b/public/intl/messages/pl-PL.json index 9d3fda61..f46b1b11 100644 --- a/public/intl/messages/pl-PL.json +++ b/public/intl/messages/pl-PL.json @@ -23,7 +23,7 @@ "value": "Dodaj witrynę" } ], - "label.administrator": [ + "label.admin": [ { "type": 0, "value": "Administrator" @@ -83,6 +83,12 @@ "value": "Zmień hasło" } ], + "label.cities": [ + { + "type": 0, + "value": "Cities" + } + ], "label.clear-all": [ { "type": 0, @@ -179,6 +185,12 @@ "value": "Delete team" } ], + "label.delete-user": [ + { + "type": 0, + "value": "Delete user" + } + ], "label.delete-website": [ { "type": 0, @@ -445,6 +457,12 @@ "value": "Regenerate" } ], + "label.regions": [ + { + "type": 0, + "value": "Regions" + } + ], "label.remove": [ { "type": 0, @@ -643,6 +661,12 @@ "value": "Users" } ], + "label.view": [ + { + "type": 0, + "value": "View" + } + ], "label.view-details": [ { "type": 0, diff --git a/public/intl/messages/pt-BR.json b/public/intl/messages/pt-BR.json index 5baffecb..facfd964 100644 --- a/public/intl/messages/pt-BR.json +++ b/public/intl/messages/pt-BR.json @@ -23,7 +23,7 @@ "value": "Adicionar site" } ], - "label.administrator": [ + "label.admin": [ { "type": 0, "value": "Administrador" @@ -83,6 +83,12 @@ "value": "Alterar a senha" } ], + "label.cities": [ + { + "type": 0, + "value": "Cities" + } + ], "label.clear-all": [ { "type": 0, @@ -179,6 +185,12 @@ "value": "Delete team" } ], + "label.delete-user": [ + { + "type": 0, + "value": "Delete user" + } + ], "label.delete-website": [ { "type": 0, @@ -445,6 +457,12 @@ "value": "Regenerate" } ], + "label.regions": [ + { + "type": 0, + "value": "Regions" + } + ], "label.remove": [ { "type": 0, @@ -643,6 +661,12 @@ "value": "Users" } ], + "label.view": [ + { + "type": 0, + "value": "View" + } + ], "label.view-details": [ { "type": 0, diff --git a/public/intl/messages/pt-PT.json b/public/intl/messages/pt-PT.json index 97d4fda1..c5fa8276 100644 --- a/public/intl/messages/pt-PT.json +++ b/public/intl/messages/pt-PT.json @@ -23,7 +23,7 @@ "value": "Adicionar website" } ], - "label.administrator": [ + "label.admin": [ { "type": 0, "value": "Administrador" @@ -83,6 +83,12 @@ "value": "Alterar senha" } ], + "label.cities": [ + { + "type": 0, + "value": "Cities" + } + ], "label.clear-all": [ { "type": 0, @@ -179,6 +185,12 @@ "value": "Delete team" } ], + "label.delete-user": [ + { + "type": 0, + "value": "Delete user" + } + ], "label.delete-website": [ { "type": 0, @@ -445,6 +457,12 @@ "value": "Regenerate" } ], + "label.regions": [ + { + "type": 0, + "value": "Regions" + } + ], "label.remove": [ { "type": 0, @@ -643,6 +661,12 @@ "value": "Users" } ], + "label.view": [ + { + "type": 0, + "value": "View" + } + ], "label.view-details": [ { "type": 0, diff --git a/public/intl/messages/ro-RO.json b/public/intl/messages/ro-RO.json index c2c8c40c..e6217555 100644 --- a/public/intl/messages/ro-RO.json +++ b/public/intl/messages/ro-RO.json @@ -23,7 +23,7 @@ "value": "Adăugare site web" } ], - "label.administrator": [ + "label.admin": [ { "type": 0, "value": "Administrator" @@ -83,6 +83,12 @@ "value": "Schimbare parolă" } ], + "label.cities": [ + { + "type": 0, + "value": "Cities" + } + ], "label.clear-all": [ { "type": 0, @@ -179,6 +185,12 @@ "value": "Delete team" } ], + "label.delete-user": [ + { + "type": 0, + "value": "Delete user" + } + ], "label.delete-website": [ { "type": 0, @@ -445,6 +457,12 @@ "value": "Regenerate" } ], + "label.regions": [ + { + "type": 0, + "value": "Regions" + } + ], "label.remove": [ { "type": 0, @@ -643,6 +661,12 @@ "value": "Users" } ], + "label.view": [ + { + "type": 0, + "value": "View" + } + ], "label.view-details": [ { "type": 0, diff --git a/public/intl/messages/ru-RU.json b/public/intl/messages/ru-RU.json index 7801542c..a08c5cd4 100644 --- a/public/intl/messages/ru-RU.json +++ b/public/intl/messages/ru-RU.json @@ -23,7 +23,7 @@ "value": "Добавить сайт" } ], - "label.administrator": [ + "label.admin": [ { "type": 0, "value": "Администратор" @@ -83,6 +83,12 @@ "value": "Изменить пароль" } ], + "label.cities": [ + { + "type": 0, + "value": "Cities" + } + ], "label.clear-all": [ { "type": 0, @@ -179,6 +185,12 @@ "value": "Delete team" } ], + "label.delete-user": [ + { + "type": 0, + "value": "Delete user" + } + ], "label.delete-website": [ { "type": 0, @@ -445,6 +457,12 @@ "value": "Regenerate" } ], + "label.regions": [ + { + "type": 0, + "value": "Regions" + } + ], "label.remove": [ { "type": 0, @@ -643,6 +661,12 @@ "value": "Users" } ], + "label.view": [ + { + "type": 0, + "value": "View" + } + ], "label.view-details": [ { "type": 0, diff --git a/public/intl/messages/sk-SK.json b/public/intl/messages/sk-SK.json index 290f8da7..efade18f 100644 --- a/public/intl/messages/sk-SK.json +++ b/public/intl/messages/sk-SK.json @@ -23,7 +23,7 @@ "value": "Pridať web" } ], - "label.administrator": [ + "label.admin": [ { "type": 0, "value": "Administrátor" @@ -83,6 +83,12 @@ "value": "Zmeniť heslo" } ], + "label.cities": [ + { + "type": 0, + "value": "Cities" + } + ], "label.clear-all": [ { "type": 0, @@ -179,6 +185,12 @@ "value": "Delete team" } ], + "label.delete-user": [ + { + "type": 0, + "value": "Delete user" + } + ], "label.delete-website": [ { "type": 0, @@ -445,6 +457,12 @@ "value": "Regenerate" } ], + "label.regions": [ + { + "type": 0, + "value": "Regions" + } + ], "label.remove": [ { "type": 0, @@ -643,6 +661,12 @@ "value": "Users" } ], + "label.view": [ + { + "type": 0, + "value": "View" + } + ], "label.view-details": [ { "type": 0, diff --git a/public/intl/messages/sl-SI.json b/public/intl/messages/sl-SI.json index 3545f4dd..c22dde97 100644 --- a/public/intl/messages/sl-SI.json +++ b/public/intl/messages/sl-SI.json @@ -23,7 +23,7 @@ "value": "Dodaj spletno mesto" } ], - "label.administrator": [ + "label.admin": [ { "type": 0, "value": "Administrator" @@ -83,6 +83,12 @@ "value": "Zamenjaj geslo" } ], + "label.cities": [ + { + "type": 0, + "value": "Cities" + } + ], "label.clear-all": [ { "type": 0, @@ -179,6 +185,12 @@ "value": "Delete team" } ], + "label.delete-user": [ + { + "type": 0, + "value": "Delete user" + } + ], "label.delete-website": [ { "type": 0, @@ -445,6 +457,12 @@ "value": "Regenerate" } ], + "label.regions": [ + { + "type": 0, + "value": "Regions" + } + ], "label.remove": [ { "type": 0, @@ -643,6 +661,12 @@ "value": "Users" } ], + "label.view": [ + { + "type": 0, + "value": "View" + } + ], "label.view-details": [ { "type": 0, diff --git a/public/intl/messages/sv-SE.json b/public/intl/messages/sv-SE.json index 2545b4bd..cac8ad44 100644 --- a/public/intl/messages/sv-SE.json +++ b/public/intl/messages/sv-SE.json @@ -23,7 +23,7 @@ "value": "Lägg till webbsajt" } ], - "label.administrator": [ + "label.admin": [ { "type": 0, "value": "Administratör" @@ -83,6 +83,12 @@ "value": "Byt lösenord" } ], + "label.cities": [ + { + "type": 0, + "value": "Cities" + } + ], "label.clear-all": [ { "type": 0, @@ -179,6 +185,12 @@ "value": "Delete team" } ], + "label.delete-user": [ + { + "type": 0, + "value": "Delete user" + } + ], "label.delete-website": [ { "type": 0, @@ -445,6 +457,12 @@ "value": "Regenerate" } ], + "label.regions": [ + { + "type": 0, + "value": "Regions" + } + ], "label.remove": [ { "type": 0, @@ -643,6 +661,12 @@ "value": "Users" } ], + "label.view": [ + { + "type": 0, + "value": "View" + } + ], "label.view-details": [ { "type": 0, diff --git a/public/intl/messages/ta-IN.json b/public/intl/messages/ta-IN.json index 693e14b7..97da5605 100644 --- a/public/intl/messages/ta-IN.json +++ b/public/intl/messages/ta-IN.json @@ -23,7 +23,7 @@ "value": "வலைத்தளத்தைச் சேர்க்க" } ], - "label.administrator": [ + "label.admin": [ { "type": 0, "value": "நிர்வாகியைச் சேர்க்க" @@ -83,6 +83,12 @@ "value": "கடவுச்சொல்லை மாற்று" } ], + "label.cities": [ + { + "type": 0, + "value": "Cities" + } + ], "label.clear-all": [ { "type": 0, @@ -179,6 +185,12 @@ "value": "Delete team" } ], + "label.delete-user": [ + { + "type": 0, + "value": "Delete user" + } + ], "label.delete-website": [ { "type": 0, @@ -445,6 +457,12 @@ "value": "Regenerate" } ], + "label.regions": [ + { + "type": 0, + "value": "Regions" + } + ], "label.remove": [ { "type": 0, @@ -643,6 +661,12 @@ "value": "Users" } ], + "label.view": [ + { + "type": 0, + "value": "View" + } + ], "label.view-details": [ { "type": 0, diff --git a/public/intl/messages/th-TH.json b/public/intl/messages/th-TH.json index 32fbd215..cac1b1c8 100644 --- a/public/intl/messages/th-TH.json +++ b/public/intl/messages/th-TH.json @@ -23,7 +23,7 @@ "value": "เพิ่มเว็บไซต์" } ], - "label.administrator": [ + "label.admin": [ { "type": 0, "value": "ผู้ดูแลระบบ" @@ -83,6 +83,12 @@ "value": "เปลี่ยนรหัสผ่าน" } ], + "label.cities": [ + { + "type": 0, + "value": "Cities" + } + ], "label.clear-all": [ { "type": 0, @@ -179,6 +185,12 @@ "value": "Delete team" } ], + "label.delete-user": [ + { + "type": 0, + "value": "Delete user" + } + ], "label.delete-website": [ { "type": 0, @@ -437,6 +449,12 @@ "value": "Regenerate" } ], + "label.regions": [ + { + "type": 0, + "value": "Regions" + } + ], "label.remove": [ { "type": 0, @@ -635,6 +653,12 @@ "value": "Users" } ], + "label.view": [ + { + "type": 0, + "value": "View" + } + ], "label.view-details": [ { "type": 0, diff --git a/public/intl/messages/tr-TR.json b/public/intl/messages/tr-TR.json index 1824564a..5724addc 100644 --- a/public/intl/messages/tr-TR.json +++ b/public/intl/messages/tr-TR.json @@ -23,7 +23,7 @@ "value": "Web sitesi ekle" } ], - "label.administrator": [ + "label.admin": [ { "type": 0, "value": "Yönetici" @@ -83,6 +83,12 @@ "value": "Şifre değiştir" } ], + "label.cities": [ + { + "type": 0, + "value": "Cities" + } + ], "label.clear-all": [ { "type": 0, @@ -179,6 +185,12 @@ "value": "Delete team" } ], + "label.delete-user": [ + { + "type": 0, + "value": "Delete user" + } + ], "label.delete-website": [ { "type": 0, @@ -445,6 +457,12 @@ "value": "Regenerate" } ], + "label.regions": [ + { + "type": 0, + "value": "Regions" + } + ], "label.remove": [ { "type": 0, @@ -643,6 +661,12 @@ "value": "Users" } ], + "label.view": [ + { + "type": 0, + "value": "View" + } + ], "label.view-details": [ { "type": 0, diff --git a/public/intl/messages/uk-UA.json b/public/intl/messages/uk-UA.json index a40e1b63..6bf4d12e 100644 --- a/public/intl/messages/uk-UA.json +++ b/public/intl/messages/uk-UA.json @@ -23,7 +23,7 @@ "value": "Додати сайт" } ], - "label.administrator": [ + "label.admin": [ { "type": 0, "value": "Адміністратор" @@ -83,6 +83,12 @@ "value": "Змінити пароль" } ], + "label.cities": [ + { + "type": 0, + "value": "Cities" + } + ], "label.clear-all": [ { "type": 0, @@ -179,6 +185,12 @@ "value": "Delete team" } ], + "label.delete-user": [ + { + "type": 0, + "value": "Delete user" + } + ], "label.delete-website": [ { "type": 0, @@ -445,6 +457,12 @@ "value": "Regenerate" } ], + "label.regions": [ + { + "type": 0, + "value": "Regions" + } + ], "label.remove": [ { "type": 0, @@ -643,6 +661,12 @@ "value": "Users" } ], + "label.view": [ + { + "type": 0, + "value": "View" + } + ], "label.view-details": [ { "type": 0, diff --git a/public/intl/messages/ur-PK.json b/public/intl/messages/ur-PK.json index 1cf2d1c7..748771c3 100644 --- a/public/intl/messages/ur-PK.json +++ b/public/intl/messages/ur-PK.json @@ -23,7 +23,7 @@ "value": "ویب سائٹ کا اضافہ کریں" } ], - "label.administrator": [ + "label.admin": [ { "type": 0, "value": "منتظم" @@ -83,6 +83,12 @@ "value": "پاس ورڈ تبدیل کریں" } ], + "label.cities": [ + { + "type": 0, + "value": "Cities" + } + ], "label.clear-all": [ { "type": 0, @@ -179,6 +185,12 @@ "value": "Delete team" } ], + "label.delete-user": [ + { + "type": 0, + "value": "Delete user" + } + ], "label.delete-website": [ { "type": 0, @@ -445,6 +457,12 @@ "value": "Regenerate" } ], + "label.regions": [ + { + "type": 0, + "value": "Regions" + } + ], "label.remove": [ { "type": 0, @@ -643,6 +661,12 @@ "value": "Users" } ], + "label.view": [ + { + "type": 0, + "value": "View" + } + ], "label.view-details": [ { "type": 0, diff --git a/public/intl/messages/vi-VN.json b/public/intl/messages/vi-VN.json index a0ae0105..a411732a 100644 --- a/public/intl/messages/vi-VN.json +++ b/public/intl/messages/vi-VN.json @@ -23,7 +23,7 @@ "value": "Thêm website" } ], - "label.administrator": [ + "label.admin": [ { "type": 0, "value": "Quản trị" @@ -83,6 +83,12 @@ "value": "Đổi mật khẩu" } ], + "label.cities": [ + { + "type": 0, + "value": "Cities" + } + ], "label.clear-all": [ { "type": 0, @@ -179,6 +185,12 @@ "value": "Delete team" } ], + "label.delete-user": [ + { + "type": 0, + "value": "Delete user" + } + ], "label.delete-website": [ { "type": 0, @@ -437,6 +449,12 @@ "value": "Regenerate" } ], + "label.regions": [ + { + "type": 0, + "value": "Regions" + } + ], "label.remove": [ { "type": 0, @@ -635,6 +653,12 @@ "value": "Users" } ], + "label.view": [ + { + "type": 0, + "value": "View" + } + ], "label.view-details": [ { "type": 0, diff --git a/public/intl/messages/zh-CN.json b/public/intl/messages/zh-CN.json index e3359012..92cd9354 100644 --- a/public/intl/messages/zh-CN.json +++ b/public/intl/messages/zh-CN.json @@ -23,7 +23,7 @@ "value": "添加网站" } ], - "label.administrator": [ + "label.admin": [ { "type": 0, "value": "管理员" @@ -83,6 +83,12 @@ "value": "更新密码" } ], + "label.cities": [ + { + "type": 0, + "value": "Cities" + } + ], "label.clear-all": [ { "type": 0, @@ -179,6 +185,12 @@ "value": "Delete team" } ], + "label.delete-user": [ + { + "type": 0, + "value": "Delete user" + } + ], "label.delete-website": [ { "type": 0, @@ -449,6 +461,12 @@ "value": "Regenerate" } ], + "label.regions": [ + { + "type": 0, + "value": "Regions" + } + ], "label.remove": [ { "type": 0, @@ -647,6 +665,12 @@ "value": "Users" } ], + "label.view": [ + { + "type": 0, + "value": "View" + } + ], "label.view-details": [ { "type": 0, diff --git a/public/intl/messages/zh-TW.json b/public/intl/messages/zh-TW.json index 2aa9efc6..6be672c6 100644 --- a/public/intl/messages/zh-TW.json +++ b/public/intl/messages/zh-TW.json @@ -23,7 +23,7 @@ "value": "增加網站" } ], - "label.administrator": [ + "label.admin": [ { "type": 0, "value": "管理員" @@ -83,6 +83,12 @@ "value": "更新密碼" } ], + "label.cities": [ + { + "type": 0, + "value": "Cities" + } + ], "label.clear-all": [ { "type": 0, @@ -179,6 +185,12 @@ "value": "Delete team" } ], + "label.delete-user": [ + { + "type": 0, + "value": "Delete user" + } + ], "label.delete-website": [ { "type": 0, @@ -445,6 +457,12 @@ "value": "Regenerate" } ], + "label.regions": [ + { + "type": 0, + "value": "Regions" + } + ], "label.remove": [ { "type": 0, @@ -643,6 +661,12 @@ "value": "Users" } ], + "label.view": [ + { + "type": 0, + "value": "View" + } + ], "label.view-details": [ { "type": 0, diff --git a/scripts/check-db.js b/scripts/check-db.js index 192536fe..f4913e5d 100644 --- a/scripts/check-db.js +++ b/scripts/check-db.js @@ -68,10 +68,10 @@ async function checkV1Tables() { try { await prisma.$queryRaw`select * from account limit 1`; - console.log('Umami v1 tables detected. To upgrade from v1 to v2 run'); - console.log('npx @umami/migrate-v1-v2'); - - process.exit(0); + error( + 'Umami v1 tables detected. For how to upgrade from v1 to v2 go to https://umami.is/docs/migrate-v1-v2.', + ); + process.exit(1); } catch (e) { // Ignore } diff --git a/scripts/merge-messages.js b/scripts/merge-messages.js index 4cdd201c..85e0b3b5 100644 --- a/scripts/merge-messages.js +++ b/scripts/merge-messages.js @@ -16,7 +16,11 @@ files.forEach(file => { const merged = keys.reduce((obj, key) => { const message = lang[key]; - obj[key] = message || messages[key].defaultMessage; + if (file === 'en-US.json') { + obj[key] = messages[key].defaultMessage; + } else { + obj[key] = message || messages[key].defaultMessage; + } if (!message) { console.log(`* Added key ${key}`);