Merge branch 'staging' into 'main'

Staging

See merge request PhilippHofer/rot!33

.gitlab-ci.yml

@@ -5,7 +5,7 @@ variables:
 
 before_script:
   - rustup target add $CARGO_TARGET
-  - apt-get update -qq && apt-get install -y -qq sshpass musl musl-tools sqlite3 curl gnupg && curl -sL https://deb.nodesource.com/setup_16.x | bash - && apt-get install -y nodejs
+  - apt-get update -qq && apt-get install -y -qq sshpass musl musl-tools sqlite3 curl gnupg && mkdir -p /etc/apt/keyrings | curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg && echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_16.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list && apt-get update && apt-get install nodejs -y && apt-get install npm -y
   - ./test_db.sh
 
 build:

frontend/main.ts

@@ -5,6 +5,8 @@ document.addEventListener('DOMContentLoaded', function() {
   initSearch();
   initSidebar();
   initToggle();
+
+  replaceStrings();
 });
 
 function initToggle() {
@@ -217,3 +219,10 @@ function initTripSidebar(triggerElement: HTMLElement) {
     }
   }
 }
+
+function replaceStrings() {
+  const weekdays = document.querySelectorAll('.weekday-js');
+  Array.prototype.forEach.call(weekdays, (weekday: HTMLElement) => {
+    weekday.innerHTML = weekday.innerHTML.replace('Freitag', 'Markttag');
+  });
+}

src/model/log.rs

@@ -1,4 +1,4 @@
-use chrono::{DateTime, Local, NaiveDateTime, Utc};
+use chrono::{DateTime, Local, NaiveDateTime, TimeZone, Utc};
 use serde::{Deserialize, Serialize};
 use sqlx::{FromRow, SqlitePool};
 
@@ -41,7 +41,7 @@ LIMIT 1000
 <description>An RSS feed with activities from app.rudernlinz.at</description>"#,
         );
         for log in Self::last(db).await {
-            let utc_time: DateTime<Utc> = DateTime::from_utc(log.created_at, Utc);
+            let utc_time: DateTime<Utc> = Utc::from_utc_datetime(&Utc, &log.created_at);
             let local_time = utc_time.with_timezone(&Local);
             ret.push_str("<item><title>");
             ret.push_str(&format!("({}) {}", local_time, log.msg));