Skip to content

Commit 0dbba25

Browse files
authored
Merge branch 'master' into broadcast-players-improvements
2 parents d4778fe + e0f9b22 commit 0dbba25

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

109 files changed

+228
-396
lines changed

.github/workflows/assets.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
runs-on: ubuntu-latest
2727
steps:
2828
- name: Check out code
29-
uses: actions/checkout@v5
29+
uses: actions/checkout@v6
3030
with:
3131
submodules: recursive
3232
- name: Install pnpm
@@ -39,7 +39,7 @@ jobs:
3939
- name: Install pnpm dependencies
4040
run: pnpm install
4141
- name: Checkout ab (optional)
42-
uses: actions/checkout@v5
42+
uses: actions/checkout@v6
4343
with:
4444
repository: lichess-org/ab
4545
ssh-key: ${{ secrets.id_rsa_ab }}

.github/workflows/flair.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ jobs:
1414
validate-flair:
1515
runs-on: ubuntu-latest
1616
steps:
17-
- uses: actions/checkout@v5
17+
- uses: actions/checkout@v6
1818
- run: sudo apt-get update && sudo apt-get install -y imagemagick
1919
- run: ./bin/validate-flair public/flair/img/

.github/workflows/lint.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
- lint
2424
- check-format
2525
steps:
26-
- uses: actions/checkout@v5
26+
- uses: actions/checkout@v6
2727
- uses: pnpm/action-setup@v4
2828
- uses: actions/setup-node@v6
2929
with:
@@ -35,7 +35,7 @@ jobs:
3535
codeql:
3636
runs-on: ubuntu-latest
3737
steps:
38-
- uses: actions/checkout@v5
38+
- uses: actions/checkout@v6
3939
- uses: github/codeql-action/init@v4
4040
with:
4141
languages: javascript

.github/workflows/server.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
matrix:
3838
java-version: [21, 25]
3939
steps:
40-
- uses: actions/checkout@v5
40+
- uses: actions/checkout@v6
4141
- uses: actions/setup-java@v5
4242
with:
4343
distribution: temurin
@@ -61,7 +61,7 @@ jobs:
6161
format:
6262
runs-on: ubuntu-latest
6363
steps:
64-
- uses: actions/checkout@v5
64+
- uses: actions/checkout@v6
6565
- uses: actions/setup-java@v5
6666
with:
6767
distribution: temurin

.github/workflows/translations.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
translations:
1717
runs-on: ubuntu-latest
1818
steps:
19-
- uses: actions/checkout@v5
19+
- uses: actions/checkout@v6
2020
- name: Install xmllint
2121
run: sudo apt-get update && sudo apt-get install -y libxml2-utils
2222
- name: Validate translation files

modules/recap/src/main/ui/RecapUi.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,6 @@ final class RecapUi(helpers: Helpers):
2828
main(cls := "page-small box box-pad page")(
2929
h1(cls := "box__top")(s"Lichess Recap $year will be available soon."),
3030
div(
31-
p("Check back later!")
31+
p("Check back at the end of the year!")
3232
)
3333
)

modules/study/src/main/ui/ListUi.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ final class ListUi(helpers: Helpers, bits: StudyBits):
108108
bits.orderSelect(order, "search", url = o => routes.Study.search(text, 1, o.some)),
109109
bits.newForm()
110110
),
111-
paginate(pag, routes.Study.search(text, pag.currentPage, order.some))
111+
paginate(pag, routes.Study.search(text, 1, order.some))
112112
)
113113
)
114114

modules/user/src/main/ui/UserActionMenu.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ final class UserActionMenu(helpers: Helpers):
2525
.option(
2626
MenuItem(trans.site.editProfile.txt(), Icon.Gear, routes.Account.profile.url)
2727
),
28-
Some(
28+
(u.count.game > 0).option(
2929
MenuItem(trans.site.watch.txt(), Icon.AnalogTv, routes.User.tv(u.username).url)
3030
)
3131
).flatten ++

modules/web/src/main/ui/layout.scala

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,10 @@ final class layout(helpers: Helpers, assetHelper: lila.web.ui.AssetFullHelper)(
134134
def anonDasher(using ctx: Context) =
135135
val prefs = trans.preferences.preferences.txt()
136136
frag(
137-
a(href := s"${routes.Auth.login.url}?referrer=${ctx.req.path}", cls := "signin")(trans.site.signIn()),
137+
div(cls := "signin-or-signup")(
138+
a(href := s"${routes.Auth.login.url}?referrer=${ctx.req.path}", cls := "signin")(trans.site.signIn()),
139+
a(href := routes.Auth.signup, cls := "button signup")(trans.site.signUp())
140+
),
138141
div(cls := "dasher")(
139142
button(cls := "toggle anon link", title := prefs, aria.label := prefs, dataIcon := Icon.Gear),
140143
div(id := "dasher_app", cls := "dropdown")
@@ -333,7 +336,8 @@ final class layout(helpers: Helpers, assetHelper: lila.web.ui.AssetFullHelper)(
333336
ctx.me
334337
.map: me =>
335338
frag(allNotifications(challenges, notifications), dasher(me))
336-
.getOrElse { (!error).option(anonDasher) }
339+
.getOrElse:
340+
error.not.option(anonDasher)
337341
)
338342
)
339343

translation/dest/arena/fa-IR.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
</plurals>
4040
<string name="thisIsPrivate">این یک مسابقهٔ خصوصی است</string>
4141
<string name="shareUrl">این وب‌نشانی را برای پیوستن دیگران به اشتراک گذارید: %s</string>
42-
<string name="drawStreakStandard">ریسهٔ مساوی: وقتی بازیکنی در یک راوان، مساوی‌های پیاپی داشته باشد، فقط یکمین مساوی یا مساوی با بیش از %s حرکت در بازی‌های استاندارد، منجر به امتیاز می‌شود. «ریسهٔ مساوی» تنها با بُرد می‌شکند، نه باخت یا مساوی.</string>
42+
<string name="drawStreakStandard">ریسهٔ مساوی: وقتی بازیکنی در یک راوان، مساوی‌های پیاپی داشته باشد، فقط یکمین مساوی یا مساوی با بیش از %s حرکت در بازی‌های اِستانده، منجر به امتیاز می‌شود. «ریسهٔ مساوی» تنها با بُرد می‌شکند، نه باخت یا مساوی.</string>
4343
<string name="drawStreakVariants">حداقل حرکت برای بازی‌های مساوی‌شدهٔ امتیازدار، بر پایهٔ وَرتا، متفاوت است. جدول زیر، آستانهٔ هر وَرتا را می‌نمایاند.</string>
4444
<string name="variant">وَرتا</string>
4545
<string name="minimumGameLength">حداقل طول بازی</string>

0 commit comments

Comments
 (0)