Skip to content

Commit 25b9a63

Browse files
authored
Merge pull request #8034 from NoahTheDuke/nb/fix-other-i18n-issues
Fix other translation i18n issues
2 parents 973b487 + 6421c19 commit 25b9a63

File tree

14 files changed

+65
-67
lines changed

14 files changed

+65
-67
lines changed

project.clj

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,7 @@
6666
[time-literals "0.1.5"]
6767
[metosin/reitit "0.7.2"]
6868
[org.flatland/ordered "1.15.12"]
69-
[io.github.noahtheduke/fluent-clj "0.0.1"]
70-
[net.xyzsd.fluent/fluent-base "0.70"]
71-
[net.xyzsd.fluent/fluent-functions-cldr "0.70"]]
69+
[io.github.noahtheduke/fluent-clj "0.0.2"]]
7270

7371
:test-selectors {:default (fn [m] (not (:kaocha/pending m)))}
7472

resources/public/i18n/en.ftl

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -409,7 +409,7 @@ game_agenda-count-with-req = {$agenda-point ->
409409
410410
game_approach-ice = Approach ice
411411
412-
game_archives = Archives{"\u00A0"}({$faceup}{$facedown} ↓)
412+
game_archives = Archives ({$faceup}{$facedown} ↓)
413413
414414
game_attempt-reconnect = Attempt reconnect
415415
@@ -1434,11 +1434,11 @@ stats_damage-done = Damage Done
14341434
14351435
stats_download = Download replay
14361436
1437-
stats_ended = Ended
1437+
stats_ended = Ended: {$ended}
14381438
14391439
stats_events-played = Events Played
14401440
1441-
stats_format = Format
1441+
stats_format = Format: {$format}
14421442
14431443
stats_game-stats = Game Stats
14441444
@@ -1449,7 +1449,7 @@ stats_game-title = {$title} ({$cnt ->
14491449
14501450
stats_launch = Launch Replay
14511451
1452-
stats_lobby = Lobby
1452+
stats_lobby = Lobby: {$lobby}
14531453
14541454
stats_log-count = {$cnt ->
14551455
[one] {$cnt} Log
@@ -1507,8 +1507,8 @@ stats_view-games = Return to stats screen
15071507
15081508
stats_view-log = View log
15091509
1510-
stats_win-method = Win method
1510+
stats_win-method = Win method: {$reason}
15111511
1512-
stats_winner = Winner
1512+
stats_winner = Winner: {$winner}
15131513
15141514
stats_won = Won: {$won} ({NUMBER($percent, style: "percent")})

resources/public/i18n/fr.ftl

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ game_agenda-count-with-req = {$agenda-point ->
249249
250250
game_approach-ice = Approcher la glace
251251
252-
game_archives = Archives{"\u00A0"}({$faceup}{$facedown} ↓)
252+
game_archives = Archives ({$faceup}{$facedown} ↓)
253253
254254
game_auto-pass = Activer le passage automatique
255255
@@ -769,9 +769,9 @@ stats_damage-done = Dégâts infligés
769769
770770
stats_download = Télécharger le replay
771771
772-
stats_ended = Terminée
772+
stats_ended = Terminée: {$ended}
773773
774-
stats_format = Format
774+
stats_format = Format: {$format}
775775
776776
stats_game-stats = Statistiques de jeu
777777
@@ -782,7 +782,7 @@ stats_game-title = {$title} ({$cnt ->
782782
783783
stats_launch = Démarrer le replay
784784
785-
stats_lobby = Hall
785+
stats_lobby = Hall: {$lobby}
786786
787787
stats_log-count = {$cnt ->
788788
[one] {$cnt} Journal
@@ -820,8 +820,8 @@ stats_view-games = Retourner aux statistiques
820820
821821
stats_view-log = Voir le journal
822822
823-
stats_win-method = Type de victoire
823+
stats_win-method = Type de victoire: {$reason}
824824
825-
stats_winner = Vainqueur
825+
stats_winner = Vainqueur: {$winner}
826826
827827
stats_won = Gagnées: {$won} ({NUMBER($percent, style: "percent")})

resources/public/i18n/ja.ftl

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ game_agenda-count = {$agenda-point} 計画点
184184
185185
game_approach-ice = アイスにアプローチ
186186
187-
game_archives = アーカイブ{"\u00A0"}({$faceup}{$facedown} ↓)
187+
game_archives = アーカイブ ({$faceup}{$facedown} ↓)
188188
189189
game_auto-pass = 自動通過処理
190190
@@ -492,15 +492,15 @@ stats_credits-spent = 消費したクレジット
492492
493493
stats_damage-done = 与えたダメージ
494494
495-
stats_ended = 終了
495+
stats_ended = 終了: {$ended}
496496
497-
stats_format = フォーマット
497+
stats_format = フォーマット: {$format}
498498
499499
stats_game-stats = 対戦統計
500500
501501
stats_game-title = {$title} (ターン数 {$cnt})
502502
503-
stats_lobby = ロビー
503+
stats_lobby = ロビー: {$lobby}
504504
505505
stats_log-count = ログ数 {$cnt}
506506
@@ -524,8 +524,8 @@ stats_view-games = 統計画面に戻る
524524
525525
stats_view-log = ログを見る
526526
527-
stats_win-method = 勝利方法
527+
stats_win-method = 勝利方法: {$reason}
528528
529-
stats_winner = 勝者
529+
stats_winner = 勝者: {$winner}
530530
531531
stats_won = 勝利: {$won} ({NUMBER($percent, style: "percent")})

resources/public/i18n/ko.ftl

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ game_agenda-count = {$agenda-point} 아젠다 점수
228228
229229
game_approach-ice = 아이스 접근
230230
231-
game_archives = 기록보관소{"\u00A0"}({$faceup}{$facedown} ↓)
231+
game_archives = 기록보관소 ({$faceup}{$facedown} ↓)
232232
233233
game_auto-pass = 자동-통과 우선
234234
@@ -664,17 +664,17 @@ stats_damage-done = 입힌 피해
664664
665665
stats_download = 리플레이 다운로드
666666
667-
stats_ended = 종료됨
667+
stats_ended = 종료됨: {$ended}
668668
669-
stats_format = 포맷
669+
stats_format = 포맷: {$format}
670670
671671
stats_game-stats = 게임 기록
672672
673673
stats_game-title = {$title} ({$cnt} 차례)
674674
675675
stats_launch = 리플레이 실행
676676
677-
stats_lobby = 로비
677+
stats_lobby = 로비: {$lobby}
678678
679679
stats_log-count = {$cnt} 로그
680680
@@ -706,8 +706,8 @@ stats_view-games = 기록 화면으로 돌아가기
706706
707707
stats_view-log = 로그 보기
708708
709-
stats_win-method = 승리 방법
709+
stats_win-method = 승리 방법: {$reason}
710710
711-
stats_winner = 승자
711+
stats_winner = 승자: {$winner}
712712
713713
stats_won = 승리: {$won} ({NUMBER($percent, style: "percent")})

resources/public/i18n/la-pig.ftl

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ game_agenda-count-with-req = {$agenda-point ->
226226
227227
game_approach-ice = Approachyay iceyay
228228
229-
game_archives = Archivesyay{"\u00A0"}({$faceup}{$facedown} ↓)
229+
game_archives = Archivesyay ({$faceup}{$facedown} ↓)
230230
231231
game_auto-pass = Autoyay-asspay ioritypriay
232232
@@ -876,9 +876,9 @@ stats_damage-done = Amageday Oneday
876876
877877
stats_download = Ownloadday eplayray
878878
879-
stats_ended = Endedyay
879+
stats_ended = Endedyay: {$ended}
880880
881-
stats_format = Ormatfay
881+
stats_format = Ormatfay: {$format}
882882
883883
stats_game-stats = Amegay Atsstay
884884
@@ -889,7 +889,7 @@ stats_game-title = {$title} ({$cnt ->
889889
890890
stats_launch = Aunchlay Eplayray
891891
892-
stats_lobby = Obbylay
892+
stats_lobby = Obbylay: {$lobby}
893893
894894
stats_log-count = {$cnt ->
895895
[one] {$cnt} Oglay
@@ -929,8 +929,8 @@ stats_view-games = Eturnray otay atsstay eenscray
929929
930930
stats_view-log = Iewvay oglay
931931
932-
stats_win-method = Inway ethodmay
932+
stats_win-method = Inway ethodmay: {$reason}
933933
934-
stats_winner = Innerway
934+
stats_winner = Innerway: {$winner}
935935
936936
stats_won = Onway: {$won} ({NUMBER($percent, style: "percent")})

resources/public/i18n/pl.ftl

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ game_agenda-count = Punkty projektów: {$agenda-point}
232232
233233
game_approach-ice = Zbliżenie do lodu
234234
235-
game_archives = Archiwum{"\u00A0"}({$faceup}{$facedown} ↓)
235+
game_archives = Archiwum ({$faceup}{$facedown} ↓)
236236
237237
game_auto-pass = Priorytet auto-mijania
238238
@@ -710,17 +710,17 @@ stats_damage-done = Zadane obrażenia
710710
711711
stats_download = Pobierz powtórkę
712712
713-
stats_ended = Zakończono
713+
stats_ended = Zakończono: {$ended}
714714
715-
stats_format = Format
715+
stats_format = Format: {$format}
716716
717717
stats_game-stats = Statystyki gier
718718
719719
stats_game-title = {$title} (Tura: {$cnt})
720720
721721
stats_launch = Uruchom powtórkę
722722
723-
stats_lobby = Poczekalnia
723+
stats_lobby = Poczekalnia: {$lobby}
724724
725725
stats_log-count = Dzienniki: {$cnt}
726726
@@ -752,8 +752,8 @@ stats_view-games = Powrót do ekranu statystyk
752752
753753
stats_view-log = Obejrzyj dziennik
754754
755-
stats_win-method = Sposób wygranej
755+
stats_win-method = Sposób wygranej: {$reason}
756756
757-
stats_winner = Wygrana
757+
stats_winner = Wygrana: {$winner}
758758
759759
stats_won = Wygrano: {$won} ({NUMBER($percent, style: "percent")})

resources/public/i18n/pt.ftl

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ game_agenda-count-with-req = {$agenda-point ->
244244
245245
game_approach-ice = Aproximar do gelo
246246
247-
game_archives = Arquivos{"\u00A0"}({$faceup}{$facedown} ↓)
247+
game_archives = Arquivos ({$faceup}{$facedown} ↓)
248248
249249
game_auto-pass = Passar prioridade automaticamente
250250
@@ -755,9 +755,9 @@ stats_damage-done = Dano Causado
755755
756756
stats_download = Baixar replay
757757
758-
stats_ended = Terminadas
758+
stats_ended = Terminadas: {$ended}
759759
760-
stats_format = Formato
760+
stats_format = Formato: {$format}
761761
762762
stats_game-stats = Estatísticas de Jogo
763763
@@ -768,7 +768,7 @@ stats_game-title = {$title} ({$cnt ->
768768
769769
stats_launch = Carregar Replay
770770
771-
stats_lobby = Lobby
771+
stats_lobby = Lobby: {$lobby}
772772
773773
stats_log-count = {$cnt ->
774774
[one] {$cnt} Log
@@ -806,8 +806,8 @@ stats_view-games = Retornar para Estatísticas
806806
807807
stats_view-log = Visualizar log
808808
809-
stats_win-method = Método de vitórias
809+
stats_win-method = Método de vitórias: {$reason}
810810
811-
stats_winner = Vencedor
811+
stats_winner = Vencedor: {$winner}
812812
813813
stats_won = Vitórias: {$won} ({NUMBER($percent, style: "percent")})

resources/public/i18n/ru.ftl

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -408,7 +408,7 @@ game_agenda-count = {$cnt ->
408408
409409
game_approach-ice = Приближение ко льду
410410
411-
game_archives = Архивы{"\u00A0"}({$faceup}{$facedown} ↓)
411+
game_archives = Архивы ({$faceup}{$facedown} ↓)
412412
413413
game_attempt-reconnect = Переподключиться
414414
@@ -1414,11 +1414,11 @@ stats_damage-done = Нанесено урона
14141414
14151415
stats_download = Скачать запись
14161416
1417-
stats_ended = Закончено
1417+
stats_ended = Закончено: {$ended}
14181418
14191419
stats_events-played = Разыграно событий
14201420
1421-
stats_format = Формат
1421+
stats_format = Формат: {$format}
14221422
14231423
stats_game-stats = Игровая статистика
14241424
@@ -1431,7 +1431,7 @@ stats_game-title = {$title} ({$cnt ->
14311431
14321432
stats_launch = Запустить запись
14331433
1434-
stats_lobby = Лобби
1434+
stats_lobby = Лобби: {$lobby}
14351435
14361436
stats_log-count = {$cnt ->
14371437
*[one] {$cnt} журнал
@@ -1491,8 +1491,8 @@ stats_view-games = Вернуться к статистике
14911491
14921492
stats_view-log = Смотреть журнал
14931493
1494-
stats_win-method = Способ победы
1494+
stats_win-method = Способ победы: {$reason}
14951495
1496-
stats_winner = Победитель
1496+
stats_winner = Победитель: {$winner}
14971497
14981498
stats_won = Выиграно: {$won} ({NUMBER($percent, style: "percent")})

resources/public/i18n/zh-simp.ftl

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,7 @@ game_agenda-count = agenda-point 议案分数
392392
393393
game_approach-ice = 接驳防火墙
394394
395-
game_archives = 档案库{"\u00A0"}({$faceup}{$facedown} ↓)
395+
game_archives = 档案库 ({$faceup}{$facedown} ↓)
396396
397397
game_attempt-reconnect = 尝试重新连接
398398
@@ -1341,19 +1341,19 @@ stats_damage-done = 造成伤害量
13411341
13421342
stats_download = 下载录像
13431343
1344-
stats_ended = 结束时间
1344+
stats_ended = 结束时间: {$ended}
13451345
13461346
stats_events-played = 事件打出数量
13471347
1348-
stats_format = 赛制
1348+
stats_format = 赛制: {$format}
13491349
13501350
stats_game-stats = 胜负统计
13511351
13521352
stats_game-title = {$title} ({$cnt} 个回合)
13531353
13541354
stats_launch = 播放录像
13551355
1356-
stats_lobby = 大厅
1356+
stats_lobby = 大厅: {$lobby}
13571357
13581358
stats_log-count = {$cnt} 条记录
13591359
@@ -1403,8 +1403,8 @@ stats_view-games = 返回统计界面
14031403
14041404
stats_view-log = 查看记录
14051405
1406-
stats_win-method = 胜利方式
1406+
stats_win-method = 胜利方式: {$reason}
14071407
1408-
stats_winner = 胜者
1408+
stats_winner = 胜者: {$winner}
14091409
14101410
stats_won = 胜利: {$won} ({NUMBER($percent, style: "percent")})

0 commit comments

Comments
 (0)