-
Notifications
You must be signed in to change notification settings - Fork 0
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.
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
Add localization #20
Open
kolexxx
wants to merge
4
commits into
main
Choose a base branch
from
localization
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Add localization #20
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
{ | ||
"Bystander": "Scallywag", | ||
"Bystander.Help.1": "Thar be a butcher on the loose. Don't get scuttled!", | ||
"Bystander.Help.2": "Thar be a butcher on the loose. Find 'n scuttle 'im!", | ||
"Bystander.Weapon": "wit' a secret weapon", | ||
"Bystander.Win": "The Scallywags win!", | ||
"Murderer": "Butcher", | ||
"Murderer.Help": "Scuttle everyone 'n don't get caught.", | ||
"Murderer.Win": "The Butcher wins!", | ||
"Revolver": "Flintlock pistol", | ||
"Knife": "Cutlass", | ||
"Scoreboard.Players": "Pirates", | ||
"Scoreboard.Name": "Name", | ||
"Scoreboard.Clues": "Booty", | ||
"Scoreboard.Ping": "Ping", | ||
"MapVote.Title": "Map vote", | ||
"MapVote.Subtitle": "Choose yer next map" | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
{ | ||
"Bystander": "Bystander", | ||
"Bystander.Help.1": "There is a murderer on the loose. Don't get killed!", | ||
"Bystander.Help.2": "There is a murderer on the loose. Find and kill him!", | ||
"Bystander.Weapon": "with a secret weapon", | ||
"Bystander.Win": "The Bystanders win!", | ||
"Murderer": "Murderer", | ||
"Murderer.Help": "Kill everyone and don't get caught.", | ||
"Murderer.Win": "The Murderer wins!", | ||
"Revolver": "Revolver", | ||
"Knife": "Knife", | ||
"Scoreboard.Players": "Players", | ||
"Scoreboard.Name": "Name", | ||
"Scoreboard.Clues": "Clues", | ||
"Scoreboard.Ping": "Ping", | ||
"MapVote.Title": "Map vote", | ||
"MapVote.Subtitle": "Choose your next map" | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
code/UI/Game/MapSelect/MapSelect.scss → code/UI/Game/MapVote/MapVote.scss
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
MapSelect | ||
MapVote | ||
{ | ||
pointer-events: all; | ||
transition: all 0.15s ease-out; | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -17,7 +17,7 @@ | |
<text class="name" style="color: @player.Color.Hex" [email protected] /> | ||
@if (player.Role != Role.None) | ||
{ | ||
<div><text class="role" style="color: @player.Role.GetColor().Hex" text=@player.Role.GetTitle() /></div> | ||
<label class="role" style="color: @player.Role.GetColor().Hex">#@player.Role.GetTitle()</label> | ||
} | ||
</div> | ||
<div> | ||
|
@@ -38,6 +38,7 @@ | |
protected override int BuildHash() | ||
{ | ||
var player = Hud.DisplayedPlayer; | ||
return HashCode.Combine(player.IsAlive(), player.Color.GetHashCode(), player.Role.GetHashCode(), player.Clues); | ||
|
||
return HashCode.Combine(player.IsAlive(), player.Color, player.Role, player.Clues); | ||
} | ||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Does
Label
fix the spacing that you get when inserting inbetween tags?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Facepunch/sbox-issues#2886
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
might be fine nvm, I'm assuming you checked.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I assume it's fixed. Either way I wanted to remove that annoying error with the
text
label.