From b21225302b4069f8d2a686ae1afd4d00a882a273 Mon Sep 17 00:00:00 2001 From: tim-hub Date: Sun, 20 Sep 2020 11:06:40 +1200 Subject: [PATCH 1/5] switch to yarn to keep consistency (cherry picked from commit 5fd19dcb6e167603fd4f5dffe88b1b153060f453) --- Dockerfile | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 871b8a87..566d1d4a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,11 +5,13 @@ ARG DATABASE_TYPE ENV DATABASE_URL "postgresql://umami:umami@db:5432/umami" \ DATABASE_TYPE=$DATABASE_TYPE -COPY . /app WORKDIR /app - -RUN npm install && npm run build - EXPOSE 3000 -CMD ["npm", "start"] +COPY package.json yarn.lock /app/ +RUN yarn install --frozen-lockfile + +COPY . /app +RUN yarn build + +CMD ["yarn", "start"] From db49db0644028ecf7ed83fce589f0958eff242f0 Mon Sep 17 00:00:00 2001 From: Anders Date: Tue, 22 Sep 2020 07:28:31 +0200 Subject: [PATCH 2/5] Update da-DK.json --- lang/da-DK.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lang/da-DK.json b/lang/da-DK.json index 0061f7ff..c4940630 100644 --- a/lang/da-DK.json +++ b/lang/da-DK.json @@ -45,7 +45,7 @@ "label.unknown": "Ukendt", "label.username": "Brugernavn", "label.websites": "Hjemmesider", - "message.active-users": "{x} Nuværende brugere {x, plural, one {visitor} other {visitors}}", + "message.active-users": "{x} nuværende {x, plural, one {bruger} other {brugere}}", "message.confirm-delete": "Er du sikker på at du vil slette {target}?", "message.copied": "Kopieret!", "message.delete-warning": "Alle tilknyttede data slettes også.", @@ -58,7 +58,7 @@ "message.no-websites-configured": "Du har ikke konfigureret nogen websteder.", "message.page-not-found": "Side ikke fundet.", "message.powered-by": "Drevet af {name}", - "message.save-success": "Gemt.", + "message.save-success": "Gemt!", "message.share-url": "Dette er den offentligt delings-URL til {target}.", "message.track-stats": "For at spore statistik for {target} skal du placere følgende kode i {head} sektionen på dit websted.", "message.type-delete": "Skriv {delete} i boksen nedenfor, for at bekræfte.", From d660d9e7fd885a3135cc40f8fdbfc94596f1934c Mon Sep 17 00:00:00 2001 From: Bilguun Ochirbat Date: Tue, 22 Sep 2020 13:56:48 +0800 Subject: [PATCH 3/5] Updated Mongolian language --- lang/mn-MN.json | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/lang/mn-MN.json b/lang/mn-MN.json index 0dd543bf..367a08a0 100644 --- a/lang/mn-MN.json +++ b/lang/mn-MN.json @@ -5,15 +5,15 @@ "button.cancel": "Цуцлах", "button.change-password": "Нууц үг солих", "button.copy-to-clipboard": "Хуулах", - "button.date-range": "Date range", + "button.date-range": "Хугацааны мужид", "button.delete": "Устгах", "button.edit": "Засах", "button.login": "Нэвтрэх", "button.more": "Цааш", - "button.refresh": "Refresh", - "button.reset": "Reset", + "button.refresh": "Сэргээх", + "button.reset": "Хэвд нь оруулах", "button.save": "Хадгалах", - "button.single-day": "Single day", + "button.single-day": "Нэг өдөр", "button.view-details": "Дэлгэрүүлж харах", "label.accounts": "Хэрэглэгчид", "label.administrator": "Админ", @@ -21,7 +21,7 @@ "label.current-password": "Ашиглаж буй нууц үг", "label.custom-range": "Дурын хугацаа", "label.dashboard": "Хянах самбар", - "label.default-date-range": "Default date range", + "label.default-date-range": "Өгөгдмөл хугацааны муж", "label.domain": "Домэйн", "label.enable-share-url": "Хуваалцах холбоос идэвхжүүлэх", "label.invalid": "Буруу", @@ -40,9 +40,9 @@ "label.this-month": "Энэ сар", "label.this-week": "Энэ долоо хоног", "label.this-year": "Энэ жил", - "label.timezone": "Timezone", + "label.timezone": "Цагийн бүс", "label.today": "Өнөөдөр", - "label.unknown": "Unknown", + "label.unknown": "Тодорхойгүй", "label.username": "Хэрэглэгчийн нэр", "label.websites": "Вебүүд", "message.active-users": "одоо {x} {x, plural, one {зочин} other {зочин}} байна", @@ -67,10 +67,10 @@ "metrics.bounce-rate": "Нэг хуудас үзээд гарсан", "metrics.browsers": "Хөтөч", "metrics.countries": "Улс", - "metrics.device.desktop": "Desktop", - "metrics.device.laptop": "Laptop", - "metrics.device.mobile": "Mobile", - "metrics.device.tablet": "Tablet", + "metrics.device.desktop": "Суурин компьютер", + "metrics.device.laptop": "Зөөврийн компьютер", + "metrics.device.mobile": "Утас", + "metrics.device.tablet": "Таблет", "metrics.devices": "Төхөөрөмж", "metrics.events": "Үйлдэл", "metrics.filter.combined": "Нэгтгэсэн", From cbbb68098dddff904312d2872b892c7622fdac0c Mon Sep 17 00:00:00 2001 From: Bilguun Ochirbat Date: Tue, 22 Sep 2020 14:06:31 +0800 Subject: [PATCH 4/5] Changed button.reset --- lang/mn-MN.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lang/mn-MN.json b/lang/mn-MN.json index 367a08a0..377c81b1 100644 --- a/lang/mn-MN.json +++ b/lang/mn-MN.json @@ -11,7 +11,7 @@ "button.login": "Нэвтрэх", "button.more": "Цааш", "button.refresh": "Сэргээх", - "button.reset": "Хэвд нь оруулах", + "button.reset": "Хуучин хэвд нь оруулах", "button.save": "Хадгалах", "button.single-day": "Нэг өдөр", "button.view-details": "Дэлгэрүүлж харах", From aeff30ab87139c01e50aa3a70544c8a5d03cb740 Mon Sep 17 00:00:00 2001 From: Mike Cao Date: Tue, 22 Sep 2020 03:07:07 -0700 Subject: [PATCH 5/5] Bump version. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index bc78dc07..543e201b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "umami", - "version": "0.48.0", + "version": "0.49.0", "description": "A simple, fast, website analytics alternative to Google Analytics. ", "author": "Mike Cao ", "license": "MIT",