Merge branch 'develop' into dev-ks/moderation

# Conflicts:
#	lang/de.json
#	lang/en.json

Author: MrKrisKrisu

app/Http/Controllers/API/v1/StationController.php

@@ -96,7 +96,7 @@ public function update(Request $request, int $id): StationResource {
                                             'longitude'     => ['nullable', 'numeric', 'between:-180,180'],
                                             'time_offset'   => ['nullable', 'numeric'],
                                         ]);
-        
+
         if (array_key_exists('time_offset', $request->json()->all()) && $request->json('time_offset') === null) {
             $validated['time_offset'] = null;
         }
@@ -145,4 +145,37 @@ public function index(Request $request): JsonResponse {
         return $this->sendResponse($stations);
     }
 
+
+    /**
+     * @OA\Get(
+     *      path="/stations/{id}",
+     *      operationId="showStation",
+     *      tags={"Checkin"},
+     *      summary="Show station",
+     *      description="This request returns a single station object",
+     *      @OA\Parameter(
+     *          name="id",
+     *          in="path",
+     *          description="station id",
+     *          example="1337"
+     *      ),
+     *      @OA\Response(
+     *          response=200,
+     *          description="successful operation",
+     *          @OA\JsonContent(
+     *              @OA\Property(property="data", type="object", ref="#/components/schemas/StationResource")
+     *          )
+     *      ),
+     *      @OA\Response(response=401, description="Unauthorized"),
+     *      @OA\Response(response=503, description="There has been an error with our data provider"),
+     *      security={
+     *          {"passport": {"create-statuses"}}, {"token": {}}
+     *      }
+     *     )
+     */
+    public function show(int $id): JsonResponse {
+        $station = Station::findOrFail($id);
+
+        return $this->sendResponse(new StationResource($station));
+    }
 }

app/Http/Controllers/Backend/Transport/TrainCheckinController.php

@@ -275,7 +275,7 @@ public static function refreshDistanceAndPoints(Status $status, bool $resetPolyl
         $oldDistance = $checkin->distance;
 
         if ($distance === 0 || ($oldDistance !== 0 && $distance / $oldDistance >= 1.15)) {
-            Log::warning(sprintf(
+            Log::debug(sprintf(
                              'Distance deviation for status #%d is greater than 15 percent. Original: %d, new: %d',
                              $status->id,
                              $oldDistance,

lang/de.json

@@ -468,13 +468,13 @@
   "transport_types.businessPlural": "Geschäftliche Reisen",
   "transport_types.express": "Fernverkehr",
   "transport_types.taxi": "Taxi",
-  "transport_types.national": "Fernverkehr (IC, EC, ...)",
-  "transport_types.nationalExpress": "Fernverkehr (ICE, ...)",
-  "transport_types.ferry": "Fähre",
+  "transport_types.national": "Intercity- und Eurocityzüge",
+  "transport_types.nationalExpress": "Hochgeschwindigkeitszüge",
+  "transport_types.regionalExp": "Interregio- und Schnellzüge",
+  "transport_types.ferry": "Schiffe",
   "transport_types.private": "Private Reise",
   "transport_types.privatePlural": "Private Reisen",
-  "transport_types.regional": "Regional",
-  "transport_types.regionalExp": "Regionalexpress",
+  "transport_types.regional": "Regionalzug",
   "transport_types.suburban": "S-Bahn",
   "transport_types.subway": "U-Bahn",
   "transport_types.tram": "Tram",
@@ -744,7 +744,8 @@
   "missing-journey": "Ist deine Fahrt nicht dabei?",
   "create-journey": "Fahrt erstellen",
   "trip_creation.no-valid-times": "Die Zeiten der Stationen sind nicht in einer zeitlich korrekten Reihenfolge.",
-  "trip_creation.title": "Reise manuell erstellen",
+  "trip_creation.title": "Reise manuell erstellen","trip_creation.form.trip_data": "Fahrtinformationen",
+  "trip_creation.form.map": "Karte",
   "trip_creation.form.origin": "Abfahrtsbahnhof",
   "trip_creation.form.destination": "Zielbahnhof",
   "trip_creation.form.add_stopover": "Zwischenhalt hinzufügen",

lang/de_by.json

@@ -435,12 +435,12 @@
   "transport_types.business": "Business trip",
   "transport_types.businessPlural": "Business trips",
   "transport_types.express": "Express",
-  "transport_types.national": "Express (IC, EC, ...)",
-  "transport_types.nationalExpress": "Express (ICE, ...)",
+  "transport_types.national": "Intercity and Eurocity trains",
+  "transport_types.nationalExpress": "High speed trains",
   "transport_types.ferry": "Ferry",
   "transport_types.private": "Private trip",
   "transport_types.privatePlural": "Private trips",
-  "transport_types.regional": "Local",
+  "transport_types.regional": "Regional",
   "transport_types.suburban": "Suburban",
   "transport_types.subway": "Subway",
   "transport_types.tram": "Tram",
@@ -516,7 +516,7 @@
   "menu.show-more": "Show more",
   "description.profile": ":username has already traveled :kmAmount kilometers in :hourAmount hours on public transportation.",
   "date-format": "YYYY-MM-DD",
-  "transport_types.regionalExp": "Regional Express",
+  "transport_types.regionalExp": "Interregio and Express trains",
   "go-to-settings": "Go to settings",
   "subject": "Subject",
   "how-can-we-help": "How can we help?",
@@ -746,6 +746,8 @@
   "missing-journey": "Haven't found your journey?",
   "create-journey": "Create journey",
   "trip_creation.no-valid-times": "The times of the stations are not in the correct chronological order.",
+  "trip_creation.form.trip_data": "Journey information",
+  "trip_creation.form.map": "Journey information",
   "trip_creation.title": "Create trip manually",
   "trip_creation.form.origin": "Departure station",
   "trip_creation.form.destination": "Destination station",