diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte index 98f87c8..4b447d9 100644 --- a/src/routes/+page.svelte +++ b/src/routes/+page.svelte @@ -21,22 +21,44 @@ return `A ${v.name} ${v.type} photographed by ${v.imgCredit}.` } - function getPlural(type: string): string { - return `${type}(${type == "bus" ? "e" : ""}s)`; + function getPluralFragments(length: string | number, type: string): string[] { + let l: number = 0; + if (typeof(length) === "string") { + l = Number(length); + } else { + l = length; + } + if (l === 1.0) { + return ["", "is"]; + } else { + if (type == "bus") { + return ["es", "are"]; + } else { + return ["s", "are"]; + } + } } function calcToVehicles() { let vehicle = getVehicle(vehicleId); calcVal = ((lengthVal * 1000) / vehicle.length).toFixed(2); - outputText = `${lengthVal} metre(s) is equal to the length of ${calcVal} ${vehicle.name} ${getPlural(vehicle.type)}!` vehicleVal = Number(calcVal); + + let vehicleFragments = getPluralFragments(vehicleVal, vehicle.type); + let lengthFragments = getPluralFragments(lengthVal, ""); + + outputText = `${Number(lengthVal)} metre${lengthFragments[0]} is equal to the length of ${vehicleVal} ${vehicle.name} ${vehicle.type}${vehicleFragments[0]}!` } function calcToLength() { let vehicle = getVehicle(vehicleId); calcVal = (vehicleVal * (vehicle.length / 1000)).toFixed(2); - outputText = `${vehicleVal} ${vehicle.name} ${getPlural(vehicle.type)} is equal to the length of ${calcVal} metre(s)!` lengthVal = Number(calcVal); + + let vehicleFragments = getPluralFragments(vehicleVal, vehicle.type); + let lengthFragments = getPluralFragments(lengthVal, ""); + + outputText = `${Number(vehicleVal)} ${vehicle.name} ${vehicle.type}${vehicleFragments[0]} ${vehicleFragments[1]} ${lengthVal} metre${lengthFragments[0]} long!` } @@ -48,7 +70,6 @@

bsag conv

-
@@ -58,8 +79,14 @@
- - +
+ + +
+
+ + +
@@ -84,21 +111,106 @@

{outputText}

-

Unless credited to denizk0461 (me), all images courtesy of their respective photographers. Images and vehicle information sourced from wiki.bre-forum.de

+

Unless credited to denizk0461 (me), all images courtesy of their respective displayed photographers. Images and vehicle information sourced from wiki.bre-forum.de

\ No newline at end of file diff --git a/static/fonts/bai-jamjuree/bold-italic.ttf b/static/fonts/bai-jamjuree/bold-italic.ttf new file mode 100644 index 0000000..b045143 Binary files /dev/null and b/static/fonts/bai-jamjuree/bold-italic.ttf differ diff --git a/static/fonts/bai-jamjuree/bold.ttf b/static/fonts/bai-jamjuree/bold.ttf new file mode 100644 index 0000000..a26ee85 Binary files /dev/null and b/static/fonts/bai-jamjuree/bold.ttf differ diff --git a/static/fonts/bai-jamjuree/extralight-italic.ttf b/static/fonts/bai-jamjuree/extralight-italic.ttf new file mode 100644 index 0000000..7343540 Binary files /dev/null and b/static/fonts/bai-jamjuree/extralight-italic.ttf differ diff --git a/static/fonts/bai-jamjuree/extralight.ttf b/static/fonts/bai-jamjuree/extralight.ttf new file mode 100644 index 0000000..2f74e31 Binary files /dev/null and b/static/fonts/bai-jamjuree/extralight.ttf differ diff --git a/static/fonts/bai-jamjuree/italic.ttf b/static/fonts/bai-jamjuree/italic.ttf new file mode 100644 index 0000000..98a935e Binary files /dev/null and b/static/fonts/bai-jamjuree/italic.ttf differ diff --git a/static/fonts/bai-jamjuree/light-italic.ttf b/static/fonts/bai-jamjuree/light-italic.ttf new file mode 100644 index 0000000..341ed45 Binary files /dev/null and b/static/fonts/bai-jamjuree/light-italic.ttf differ diff --git a/static/fonts/bai-jamjuree/light.ttf b/static/fonts/bai-jamjuree/light.ttf new file mode 100644 index 0000000..273dde2 Binary files /dev/null and b/static/fonts/bai-jamjuree/light.ttf differ diff --git a/static/fonts/bai-jamjuree/medium-italic.ttf b/static/fonts/bai-jamjuree/medium-italic.ttf new file mode 100644 index 0000000..408e193 Binary files /dev/null and b/static/fonts/bai-jamjuree/medium-italic.ttf differ diff --git a/static/fonts/bai-jamjuree/medium.ttf b/static/fonts/bai-jamjuree/medium.ttf new file mode 100644 index 0000000..5a3b763 Binary files /dev/null and b/static/fonts/bai-jamjuree/medium.ttf differ diff --git a/static/fonts/bai-jamjuree/regular.ttf b/static/fonts/bai-jamjuree/regular.ttf new file mode 100644 index 0000000..f1f71b6 Binary files /dev/null and b/static/fonts/bai-jamjuree/regular.ttf differ diff --git a/static/fonts/bai-jamjuree/semibold-italic.ttf b/static/fonts/bai-jamjuree/semibold-italic.ttf new file mode 100644 index 0000000..053d279 Binary files /dev/null and b/static/fonts/bai-jamjuree/semibold-italic.ttf differ diff --git a/static/fonts/bai-jamjuree/semibold.ttf b/static/fonts/bai-jamjuree/semibold.ttf new file mode 100644 index 0000000..067aba5 Binary files /dev/null and b/static/fonts/bai-jamjuree/semibold.ttf differ