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.

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

Bug/sppd 121/123/124/125/126/127/128/129/130 #133

Merged
merged 12 commits into from
Mar 21, 2020

Conversation

amDavid01
Copy link
Member

@amDavid01 amDavid01 commented Mar 19, 2020

#130 is fixed
#129 is fixed
#128 is fixed
#127 is fixed
#126 is fixed
#125 is fixed
#124 is fixed
#123 is fixed
#121 is fixed
README updated

Copy link
Member

@Dragon1320 Dragon1320 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Has this issue been fixed? #124

Also, fix all the other stuff and wait for Matt to review.

ui/src/views/Card.jsx Show resolved Hide resolved
.github/ISSUE_TEMPLATE/bug-report.md Show resolved Hide resolved
.github/ISSUE_TEMPLATE/feature-request.md Show resolved Hide resolved
.github/ISSUE_TEMPLATE/user-story.md Show resolved Hide resolved
README.md Show resolved Hide resolved
ui/src/views/Card.jsx Show resolved Hide resolved
@amDavid01
Copy link
Member Author

image
I didn't even touch the files inside .github

Copy link
Member

@MattheousDT MattheousDT left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you also please resolve the comments that Lukasz has added as it's hard to know if you have resolved the issues at a glance

@@ -41,7 +41,7 @@ export default {
Theme: "Theme",
adventure: "adventure",
fantasy: "fantasy",
general: "general",
general: "neutral",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can this variable name be changed and the translation changed on other languages

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#131
You still want me to change? Or can i just change it in the chinese ver

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also it would require to change LOTS of stuff around the code, unless you really want the variable name to be changed, i suggest we leave it like that.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just change the translation for the other versions

ui/src/views/Card.jsx Outdated Show resolved Hide resolved
…/128/129/130' into bug/SPPD-121/123/124/125/126/127/128/129/130
…/126/127/128/129/130' into bug/SPPD-121/123/124/125/126/127/128/129/130"

This reverts commit e0b11f8.
@@ -289,13 +209,18 @@ export default class Card extends Component {

if (alteredCard[bracketless] == null) {

<<<<<<< HEAD
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Resolve this merge conflict

Copy link
Member

@Dragon1320 Dragon1320 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You're still pushing the issue templates...
Don't mark the thing as resolved unless you've actually fixed it.

Also, where did you get the translations that you changed?
As an update, looking into the Chinese translation and the kanji, it seems wrong.

Copy link
Member

@Dragon1320 Dragon1320 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just fix the one thing and I think it's ok. Maybe something I missed so check with Matt.

README.md Outdated
@@ -114,6 +114,12 @@ Thanks for making out day easier by taking care of the 10s of thousands of lines

- [Umustalldie2](https://github.com/Umustalldie2)

**Website Maintenance**

Thanks for fixing the bugs that should never been there in the first time.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

grammar

Copy link
Member

@Dragon1320 Dragon1320 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks fine to me.

@Dragon1320 Dragon1320 merged commit 45deb2d into develop Mar 21, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
3 participants