From 3aa1e9061a3adf1fe80d74a6d82ff143b679ba52 Mon Sep 17 00:00:00 2001
From: Kalle <38327916+Sendouc@users.noreply.github.com>
Date: Wed, 7 Sep 2022 10:59:12 +0300
Subject: [PATCH] This/Last/Next week to one translation string
Closes #923
---
app/routes/calendar/index.tsx | 3 +--
app/styles/calendar.css | 7 +++++++
public/locales/en/calendar.json | 7 +++----
3 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/app/routes/calendar/index.tsx b/app/routes/calendar/index.tsx
index e9cef1e68..8dadf56d3 100644
--- a/app/routes/calendar/index.tsx
+++ b/app/routes/calendar/index.tsx
@@ -243,9 +243,8 @@ function WeekLinkTitle({
if (relativeWeekIdentifier) {
return (
-
+
{relativeWeekIdentifier}
-
{t("week.week")}
);
}
diff --git a/app/styles/calendar.css b/app/styles/calendar.css
index 25950e962..e383de3f5 100644
--- a/app/styles/calendar.css
+++ b/app/styles/calendar.css
@@ -81,6 +81,13 @@
font-size: var(--fonts-xxs);
}
+.calendar__week__relative {
+ max-width: 3rem;
+ margin: 0 auto;
+ text-align: center;
+ white-space: pre-line;
+}
+
.calendar__week__dash {
line-height: 0.8;
}
diff --git a/public/locales/en/calendar.json b/public/locales/en/calendar.json
index fcf1ebc79..2c5456634 100644
--- a/public/locales/en/calendar.json
+++ b/public/locales/en/calendar.json
@@ -36,10 +36,9 @@
"forms.errors.duplicatePlayer": "Can't have the same player twice in the same team.",
"forms.errors.emptyTeam": "Each team must have at least one player.",
- "week.this": "This",
- "week.next": "Next",
- "week.last": "Last",
- "week.week": "Week",
+ "week.this": "This Week",
+ "week.next": "Next Week",
+ "week.last": "Last Week",
"tag.desc.BADGE": "Winner of this event gets a sendou.ink badge.",
"tag.desc.SPECIAL": "Ruleset that differ from the standard e.g. limited what weapons can be used.",