Skip to content
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

Jump to bottom

Update prod again - a06 #28

Merged
merged 3 commits into from
Jun 14, 2023
Merged

Update prod again - a06 #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dab0a66
fix translation issue
ADBond Jun 14, 2023
1a90c74
new title image
ADBond Jun 14, 2023
a467194
Update changelog.md
ADBond Jun 14, 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
26 changes: 12 additions & 14 deletions calypso.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,20 +34,6 @@ function (dojo, declare) {
this.clubs = 3;
this.diamonds = 4;

// TODO: translation doesn't work here, so place in setup instead
this.suits_translate_lookup = {
1: _("Spades"),
2: _("Hearts"),
3: _("Clubs"),
4: _("Diamonds"),
}
this.suits_translate_lookup_sing = {
1: _("Spade"),
2: _("Heart"),
3: _("Club"),
4: _("Diamond"),
}

},

/*
Expand All @@ -70,6 +56,18 @@ function (dojo, declare) {
1: "cards.webp",
2: "cards_four.webp",
};
this.suits_translate_lookup = {
1: _("Spades"),
2: _("Hearts"),
3: _("Clubs"),
4: _("Diamonds"),
}
this.suits_translate_lookup_sing = {
1: _("Spade"),
2: _("Heart"),
3: _("Club"),
4: _("Diamond"),
}
for( let player_id in gamedatas.players )
{
let player = gamedatas.players[player_id];
Expand Down
9 changes: 8 additions & 1 deletion changelog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)

## [Unreleased]

## [alpha-v06] - 2023-06-14

### Fixed

- Sorted introduced translation error

## [alpha-v05] - 2023-06-14

### Changed
Expand Down Expand Up @@ -45,7 +51,8 @@ Online version working 2021-02-24.

- Working version of Calypso. Sorry this is as detailed as it will go up this point! Have a shufti at previous PRs and commit history if you really need more.

[unreleased]: https://github.com/ADBond/bga-calypso/compare/alpha-v05...HEAD
[unreleased]: https://github.com/ADBond/bga-calypso/compare/alpha-v06...HEAD
[alpha-v06]: https://github.com/ADBond/bga-calypso/compare/alpha-v05...alpha-v06
[alpha-v05]: https://github.com/ADBond/bga-calypso/compare/alpha-v04...alpha-v05
[alpha-v04]: https://github.com/ADBond/bga-calypso/compare/alpha-v03...alpha-v04
[alpha-v03]: https://github.com/ADBond/bga-calypso/compare/alpha-v02...alpha-v03
Expand Down
Binary file added misc/img_raw/title.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 0 additions & 1 deletion misc/todo_list
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
./calypso.js:37: // TODO: translation doesn't work here, so place in setup instead
./calypso_style.scss:58:/* TODO ?maybe rgba -> rgb (css) */