Skip to content

Fix how dates are displayed in RTL languages #13461

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 27, 2023
Merged

Fix how dates are displayed in RTL languages #13461

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e126664
Fix how dates are displayed in RTL languages.
shermansiu Aug 25, 2023
c12998c
Add newline.
shermansiu Aug 25, 2023
c1f0115
Use existing RTL helper function.
shermansiu Aug 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions app/templating/DateHelper.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import play.api.i18n.Lang
import java.time.format.{ FormatStyle, DateTimeFormatter }
import java.time.{ Duration, LocalDate }

import lila.app.ui.ScalatagsTemplate.*
import lila.app.ui.ScalatagsTemplate.{*, given}
import lila.i18n.PeriodLocales

trait DateHelper:
Expand Down Expand Up @@ -49,11 +49,17 @@ trait DateHelper:
def showEnglishDate(instant: Instant): String = englishDateFormatter print instant
def showEnglishInstant(instant: Instant): String = englishDateTimeFormatter print instant

def semanticDate(instant: Instant)(using Lang): Tag =
timeTag(datetimeAttr := isoDateTime(instant))(showDate(instant))

def semanticDate(date: LocalDate)(using Lang): Tag =
timeTag(datetimeAttr := isoDateTime(date.atStartOfDay.instant))(showDate(date))
def semanticDate(instant: Instant)(using lang: Lang): Tag =
timeTag(
datetimeAttr := isoDateTime(instant),
dir := isRTL.option("rtl")
)(showDate(instant))

def semanticDate(date: LocalDate)(using lang: Lang): Tag =
timeTag(
datetimeAttr := isoDateTime(date.atStartOfDay.instant),
dir := isRTL.option("rtl")
)(showDate(date))

def showMinutes(minutes: Int)(using Lang): String =
showDuration(Duration.ofMinutes(minutes))
Expand Down