Skip to content

Commit

Permalink
chore: rename i18n key Game_End to Game_Ended
Browse files Browse the repository at this point in the history
  • Loading branch information
GZTimeWalker committed Apr 29, 2024
1 parent 92999d3 commit 9dace0b
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion cliff.toml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ commit_parsers = [
{ message = "^feat|Feat", group = "<!-- 0 -->⛰️ Features" },
{ message = "^fix", group = "<!-- 1 -->🐛 Bug Fixes" },
{ message = "^style", group = "<!-- 2 -->🎨 Styling" },
{ message = "^chore\\(release\\): prepare for", skip = true },
{ message = "^chore\\(release\\):", skip = true },
{ message = "^chore\\(deps\\)|deps", skip = true },
{ message = "^chore\\(pr\\)", skip = true },
{ message = "^chore\\(pull\\)", skip = true },
Expand Down
4 changes: 2 additions & 2 deletions src/GZCTF/Controllers/GameController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ public async Task<IActionResult> JoinGame(int id, [FromBody] GameJoinModel model
StatusCodes.Status404NotFound));

if (!game.PracticeMode && game.EndTimeUtc < DateTimeOffset.UtcNow)
return BadRequest(new RequestResponse(localizer[nameof(Resources.Program.Game_End)]));
return BadRequest(new RequestResponse(localizer[nameof(Resources.Program.Game_Ended)], ErrorCodes.GameEnded));

if (!string.IsNullOrEmpty(game.InviteCode) && game.InviteCode != model.InviteCode)
return BadRequest(new RequestResponse(localizer[nameof(Resources.Program.Game_InvalidInvitationCode)]));
Expand Down Expand Up @@ -1170,7 +1170,7 @@ public async Task<IActionResult> SubmitWriteup([FromRoute] int id, IFormFile fil

if (denyAfterEnded && !res.Game.PracticeMode && res.Game.EndTimeUtc < DateTimeOffset.UtcNow)
return res.WithResult(
BadRequest(new RequestResponse(localizer[nameof(Resources.Program.Game_End)], ErrorCodes.GameEnded)));
BadRequest(new RequestResponse(localizer[nameof(Resources.Program.Game_Ended)], ErrorCodes.GameEnded)));

if (challengeId <= 0)
return res;
Expand Down
2 changes: 1 addition & 1 deletion src/GZCTF/Resources/Program.en-US.resx
Original file line number Diff line number Diff line change
Expand Up @@ -522,7 +522,7 @@
<data name="Game_DeadlineExpired" xml:space="preserve">
<value>Submission due date has passed</value>
</data>
<data name="Game_End" xml:space="preserve">
<data name="Game_Ended" xml:space="preserve">
<value>The game has ended</value>
</data>
<data name="Game_InOtherTeam" xml:space="preserve">
Expand Down
2 changes: 1 addition & 1 deletion src/GZCTF/Resources/Program.ja-JP.resx
Original file line number Diff line number Diff line change
Expand Up @@ -522,7 +522,7 @@
<data name="Game_DeadlineExpired" xml:space="preserve">
<value>提出期限が過ぎました</value>
</data>
<data name="Game_End" xml:space="preserve">
<data name="Game_Ended" xml:space="preserve">
<value>ゲームは終了しました</value>
</data>
<data name="Game_InOtherTeam" xml:space="preserve">
Expand Down
2 changes: 1 addition & 1 deletion src/GZCTF/Resources/Program.resx
Original file line number Diff line number Diff line change
Expand Up @@ -522,7 +522,7 @@
<data name="Game_DeadlineExpired" xml:space="preserve">
<value>提交截止时间已过</value>
</data>
<data name="Game_End" xml:space="preserve">
<data name="Game_Ended" xml:space="preserve">
<value>比赛已结束</value>
</data>
<data name="Game_InOtherTeam" xml:space="preserve">
Expand Down

0 comments on commit 9dace0b

Please sign in to comment.