Skip to content

Commit

Permalink
Merge pull request #1765 from umami-software/app
Browse files Browse the repository at this point in the history
v1.40.0
  • Loading branch information
mikecao authored Jan 26, 2023
2 parents 1758ae7 + b3c4178 commit cc2be9f
Show file tree
Hide file tree
Showing 37 changed files with 2,333 additions and 238 deletions.
2 changes: 1 addition & 1 deletion components/common/Calendar.js
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ const DaySelector = ({ date, minDate, maxDate, locale, onSelect }) => {
}

const days = [];
for (let i = 0; i < 35; i++) {
for (let i = 0; i < 42; i++) {
days.push(addDays(startDay, i));
}

Expand Down
29 changes: 16 additions & 13 deletions components/layout/Header.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,21 +29,24 @@ export default function Header() {
<Icon icon={<Logo />} size="large" className={styles.logo} />
<Link href={isSharePage ? HOMEPAGE_URL : '/'}>umami</Link>
</div>
<HamburgerButton />

{user && (
<div className={styles.links}>
<Link href="/dashboard">
<FormattedMessage id="label.dashboard" defaultMessage="Dashboard" />
</Link>
<Link href="/realtime">
<FormattedMessage id="label.realtime" defaultMessage="Realtime" />
</Link>
{!process.env.isCloudMode && (
<Link href="/settings">
<FormattedMessage id="label.settings" defaultMessage="Settings" />
<>
<HamburgerButton />
<div className={styles.links}>
<Link href="/dashboard">
<FormattedMessage id="label.dashboard" defaultMessage="Dashboard" />
</Link>
<Link href="/realtime">
<FormattedMessage id="label.realtime" defaultMessage="Realtime" />
</Link>
)}
</div>
{!process.env.isCloudMode && (
<Link href="/settings">
<FormattedMessage id="label.settings" defaultMessage="Settings" />
</Link>
)}
</div>
</>
)}
<div className={styles.buttons}>
<ThemeButton />
Expand Down
3 changes: 2 additions & 1 deletion db/mysql/migrations/02_add_event_data/migration.sql
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,8 @@ CREATE PROCEDURE `UmamiRenameIndexIfExists`(
INFORMATION_SCHEMA.STATISTICS
WHERE
TABLE_NAME = @tableName
AND INDEX_NAME = @currentIndexName;
AND INDEX_NAME = @currentIndexName
AND TABLE_SCHEMA = database();

SET @query = CONCAT(
'ALTER TABLE `', @tableName, '` RENAME INDEX `', @currentIndexName, '` TO `', @newIndexName, '`;'
Expand Down
120 changes: 120 additions & 0 deletions lang/am-ET.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,120 @@
{
"label.accounts": "Accounts",
"label.add-account": "Add account",
"label.add-column": "Add column",
"label.add-filter": "Add filter",
"label.add-website": "Add website",
"label.administrator": "Administrator",
"label.all": "All",
"label.all-time": "All time",
"label.all-websites": "All websites",
"label.back": "Back",
"label.cancel": "Cancel",
"label.change-password": "Change password",
"label.confirm-password": "Confirm password",
"label.copy-to-clipboard": "Copy to clipboard",
"label.current-password": "Current password",
"label.custom-range": "Custom range",
"label.dashboard": "Dashboard",
"label.date-range": "Date range",
"label.default-date-range": "Default date range",
"label.delete": "Delete",
"label.delete-account": "Delete account",
"label.delete-website": "Delete website",
"label.dismiss": "Dismiss",
"label.domain": "Domain",
"label.edit": "Edit",
"label.edit-account": "Edit account",
"label.edit-website": "Edit website",
"label.enable-share-url": "Enable share URL",
"label.event-data": "Event Data",
"label.field-name": "Field Name",
"label.invalid": "Invalid",
"label.invalid-domain": "Invalid domain",
"label.language": "Language",
"label.last-days": "Last {x} days",
"label.last-hours": "Last {x} hours",
"label.logged-in-as": "Logged in as {username}",
"label.login": "Login",
"label.logout": "Logout",
"label.more": "More",
"label.name": "Name",
"label.new-password": "New password",
"label.none": "None",
"label.owner": "Owner",
"label.password": "Password",
"label.passwords-dont-match": "Passwords don't match",
"label.profile": "Profile",
"label.realtime": "Realtime",
"label.realtime-logs": "Realtime logs",
"label.refresh": "Refresh",
"label.required": "Required",
"label.reset": "Reset",
"label.reset-website": "Reset statistics",
"label.save": "Save",
"label.search": "Search",
"label.settings": "Settings",
"label.share-url": "Share URL",
"label.single-day": "Single day",
"label.theme": "Theme",
"label.this-month": "This month",
"label.this-week": "This week",
"label.this-year": "This year",
"label.timezone": "Timezone",
"label.today": "Today",
"label.tracking-code": "Tracking code",
"label.type": "Type",
"label.unknown": "Unknown",
"label.username": "Username",
"label.value": "Value",
"label.view-details": "View details",
"label.websites": "Websites",
"label.yesterday": "Yesterday",
"message.active-users": "{x} current {x, plural, one {visitor} other {visitors}}",
"message.confirm-delete": "Are you sure you want to delete {target}?",
"message.confirm-reset": "Are you sure you want to reset {target}'s statistics?",
"message.copied": "Copied!",
"message.delete-warning": "All associated data will be deleted as well.",
"message.edit-dashboard": "Edit dashboard",
"message.failure": "Something went wrong.",
"message.get-share-url": "Get share URL",
"message.get-tracking-code": "Get tracking code",
"message.go-to-settings": "Go to settings",
"message.incorrect-username-password": "Incorrect username/password.",
"message.log.visitor": "Visitor from {country} using {browser} on {os} {device}",
"message.new-version-available": "A new version of umami {version} is available!",
"message.no-data-available": "No data available.",
"message.no-websites-configured": "You don't have any websites configured.",
"message.page-not-found": "Page not found.",
"message.powered-by": "Powered by {name}",
"message.reset-warning": "All statistics for this website will be deleted, but your tracking code will remain intact.",
"message.save-success": "Saved successfully.",
"message.share-url": "This is the publicly shared URL for {target}.",
"message.toggle-charts": "Toggle charts",
"message.track-stats": "To track stats for {target}, place the following code in the {head} section of your website.",
"message.type-delete": "Type {delete} in the box below to confirm.",
"message.type-reset": "Type {reset} in the box below to confirm.",
"metrics.actions": "Actions",
"metrics.average-visit-time": "Average visit time",
"metrics.bounce-rate": "Bounce rate",
"metrics.browsers": "Browsers",
"metrics.countries": "Countries",
"metrics.device.desktop": "Desktop",
"metrics.device.laptop": "Laptop",
"metrics.device.mobile": "Mobile",
"metrics.device.tablet": "Tablet",
"metrics.devices": "Devices",
"metrics.events": "Events",
"metrics.filter.combined": "Combined",
"metrics.filter.raw": "Raw",
"metrics.languages": "Languages",
"metrics.operating-systems": "Operating systems",
"metrics.page-views": "Page views",
"metrics.pages": "Pages",
"metrics.query-parameters": "Query parameters",
"metrics.referrers": "Referrers",
"metrics.screens": "Screens",
"metrics.unique-visitors": "Unique visitors",
"metrics.views": "Views",
"metrics.visitors": "Visitors"
}
42 changes: 21 additions & 21 deletions lang/hr-HR.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
"label.add-website": "Dodaj web stranicu",
"label.administrator": "Administrator",
"label.all": "Sve",
"label.all-time": "Svo vrijeme" ,
"label.all-time": "Svo vrijeme",
"label.all-websites": "Sve web stranice",
"label.back": "Natrag ",
"label.back": "Natrag ",
"label.cancel": "Odustani",
"label.change-password": "Promijeni lozinku",
"label.confirm-password": "Potvrdi lozinku",
Expand All @@ -21,15 +21,15 @@
"label.delete": "Obriši",
"label.delete-account": "Obriši račun",
"label.delete-website": "Obriši web stranicu",
"label.dismiss": "Odbaci",
"label.dismiss": "Odbaci",
"label.domain": "Domena",
"label.edit": "Uredi",
"label.edit-account": "Uredi račun",
"label.edit-website": "Uredi web stranicu",
"label.enable-share-url": "Omogući dijeljenje URL-a",
"label.enable-share-url": "Omogući dijeljenje poveznice",
"label.event-data": "Podaci događaja",
"label.field-name": "Naziv polja",
"label.invalid": "Nesipravno",
"label.invalid": "Neispravno",
"label.invalid-domain": "Neispravna domena",
"label.language": "Jezik",
"label.last-days": "Zadnjih {x} dana",
Expand All @@ -40,21 +40,21 @@
"label.more": "Više",
"label.name": "Ime",
"label.new-password": "Nova lozinka",
"label.none": "Ništa",
"label.none": "Ništa",
"label.owner": "Vlasnik",
"label.password": "Lozinka",
"label.passwords-dont-match": "Lozinka nije točna",
"label.passwords-dont-match": "Lozinke se ne podudaraju",
"label.profile": "Profil",
"label.realtime": "Stvarno vrijeme",
"label.realtime-logs":"Trenutni zapisi",
"label.realtime-logs": "Trenutni zapisi",
"label.refresh": "Osvježi",
"label.required": "Potrebna",
"label.required": "Potrebna",
"label.reset": "Resetirati",
"label.reset-website": "Resetirati web stranicu",
"label.reset-website": "Resetirati web stranicu",
"label.save": "Spremi",
"label.search": "Pretraži",
"label.settings": "Postavke",
"label.share-url": "Podijeli URL",
"label.share-url": "Podijeli poveznicu",
"label.single-day": "Jedan dan",
"label.theme": "Tema",
"label.this-month": "Ovaj mjesec",
Expand All @@ -70,49 +70,49 @@
"label.view-details": "Pogledaj detalje",
"label.websites": "Web stranice",
"label.yesterday": "Jučer",
"message.active-users": "{x} Trenutno {x, plural, one {visitor} other {visitors}}",
"message.active-users": "{x} Trenutno {x, plural, one {posjetitelj} other {posjetitelja}}",
"message.confirm-delete": "Jeste li sigurni da želite obrisati {target}?",
"message.confirm-reset": "Jeste li sigurni da želite resetirati {target}'s statistiku?",
"message.copied": "Kopirano!",
"message.delete-warning": "Izbrisat će se svi povezani podaci.",
"message.delete-warning": "Izbrisat će se svi povezani podaci.",
"message.edit-dashboard": "Uredi nadzornu ploču",
"message.failure": "Nešto je pošlo po zlu.",
"message.get-share-url": "Dohvati URL za dijeljenje",
"message.get-tracking-code": "Dohvati kod za praćenje",
"message.get-share-url": "Dohvati poveznicu za dijeljenje",
"message.get-tracking-code": "Dohvati kod za praćenje",
"message.go-to-settings": "Idi u postavke",
"message.incorrect-username-password": "Neispravno korisničke ime/lozinka.",
"message.log.visitor": "Posjetitelj iz {country} koristi {browser} na {os} {device}",
"message.new-version-available": "Nova verzija umami {version} je dostupna!",
"message.no-data-available": "Nema dostupnih podataka.",
"message.no-websites-configured": "Nemate konfiguriranu nijednu web stranicu.",
"message.page-not-found": "Stranica nije pronađena.",
"message.powered-by": "Powered by {name}",
"message.powered-by": "Pokreće {name}",
"message.reset-warning": "Sve statistike za ovu web stranicu bit će izbrisane, ali će vaš kod za praćenje ostati netaknut.",
"message.save-success": "Uspješno spremljeno.",
"message.share-url": "Ovo je javno dijeljeni URL za {target}.",
"message.share-url": "Ovo je javno dijeljena poveznica za {target}.",
"message.toggle-charts": "Uključi/isključi grafikone",
"message.track-stats": "Da biste pratili statistiku za {target}, postavite sljedeći kod u odjeljak {head} svoje web stranice.",
"message.type-delete": "Upišite {delete} u donji okvir za potvrdu.",
"message.type-reset": " Upišite {reset} u donji okvir za potvrdu. ",
"metrics.actions": "Akcije",
"metrics.average-visit-time": "Prosječno vrijeme posjeta",
"metrics.bounce-rate": "Stopa napuštanja stranice",
"metrics.bounce-rate": "Stopa napuštanja stranice",
"metrics.browsers": "Web preglednici",
"metrics.countries": "Zemlje",
"metrics.device.desktop": "Pc",
"metrics.device.desktop": "Pc",
"metrics.device.laptop": "Laptop",
"metrics.device.mobile": "Mobitel",
"metrics.device.tablet": "Tablet",
"metrics.devices": "Uređaji",
"metrics.events": "Događaji",
"metrics.filter.combined": "Kombinirano",
"metrics.filter.raw": "Neobrađeni podaci",
"metrics.filter.raw": "Neobrađeni podaci",
"metrics.languages": "Jezici",
"metrics.operating-systems": "Operativni sustavi",
"metrics.page-views": "Pregledi stranice",
"metrics.pages": "Stranice",
"metrics.query-parameters": "Parametri upita",
"metrics.referrers": "Upučivaći",
"metrics.referrers": "Upučivaći",
"metrics.screens": "Zasloni",
"metrics.unique-visitors": "Jedinstveni posjetitelji",
"metrics.views": "Pregledi",
Expand Down
1 change: 1 addition & 0 deletions lang/lt-LT.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@
"label.username": "Vartotojo vardas",
"label.view-details": "Peržiūrėti detaliau",
"label.websites": "Svetainės",
"label.yesterday": "Vakar",
"message.active-users": "{x, plural, =0 {# aktyvių vartotojų} zero {# aktyvių vartotojų} one {# aktyvus vartotojas} other {# aktyvūs vartotojai}}",
"message.confirm-delete": "Ar esate tikri, jog norite ištrinti svetainę {target}?",
"message.confirm-reset": "Are esate tikri, jog norite atstatyti svetainės {target} statistikos duomenis?",
Expand Down
Loading

1 comment on commit cc2be9f

@vercel
Copy link

@vercel vercel bot commented on cc2be9f Jan 26, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

umami – ./

umami-umami-software.vercel.app
umami-app.vercel.app
umami-git-master-umami-software.vercel.app

Please sign in to comment.