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

Create Thai Language file #3028

Merged
merged 4 commits into from
Feb 7, 2023
Merged

Create Thai Language file #3028

merged 4 commits into from
Feb 7, 2023

Conversation

tomzt
Copy link
Contributor

@tomzt tomzt commented Feb 6, 2023

Create Thai Language file.
Translation from English to Thai.

Hello and thank you for wanting to contribute to the MagicMirror² project

Please make sure that you have followed these 4 rules before submitting your Pull Request:

  1. Base your pull requests against the develop branch.

  2. Include these infos in the description:

  • Does the pull request solve a related issue?
  • If so, can you reference the issue like this Fixes #<issue_number>?
  • What does the pull request accomplish? Use a list if needed.
  • If it includes major visual changes please add screenshots.
  1. Please run npm run lint:prettier before submitting so that
    style issues are fixed.

  2. Don't forget to add an entry about your changes to
    the CHANGELOG.md file.

Note: Sometimes the development moves very fast. It is highly
recommended that you update your branch of develop before creating a
pull request to send us your changes. This makes everyone's lives
easier (including yours) and helps us out on the development team.

Thanks again and have a nice day!

Create Thai Language file. 
Translation from English to Thai.
Copy link
Collaborator

@rejas rejas left a comment

Choose a reason for hiding this comment

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

please also rename the file to translations/th.json

"NNW": "น.ต.ต.น.",

"FEELS": "รู้สึกเหมือน {DEGREE}",
"PRECIP": "ความแม่นยำ",
Copy link
Collaborator

Choose a reason for hiding this comment

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

this just got changed and split into two keys:

"PRECIP_POP": "PoP",
"PRECIP_AMOUNT": "Precipitation amount",

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Add already

@rejas
Copy link
Collaborator

rejas commented Feb 6, 2023

thanks for your pullrequest. small changes necessary

please also add an entry to the CHANGELOG.md file

add "PRECIP_POP": "ความแม่นยำ",
	"PRECIP_AMOUNT": "ปริมาณน้ำฝน",
Copy link
Contributor Author

@tomzt tomzt left a comment

Choose a reason for hiding this comment

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

add it

"NNW": "น.ต.ต.น.",

"FEELS": "รู้สึกเหมือน {DEGREE}",
"PRECIP": "ความแม่นยำ",
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Add already

correct some word
rejas
rejas previously approved these changes Feb 7, 2023
@codecov-commenter
Copy link

codecov-commenter commented Feb 7, 2023

Codecov Report

Merging #3028 (be7b081) into master (2eaf9df) will increase coverage by 0.07%.
The diff coverage is n/a.

📣 This organization is not using Codecov’s GitHub App Integration. We recommend you install it so Codecov can continue to function properly for your repositories. Learn more

@@            Coverage Diff             @@
##           master    #3028      +/-   ##
==========================================
+ Coverage   21.69%   21.77%   +0.07%     
==========================================
  Files          52       52              
  Lines       11424    11424              
==========================================
+ Hits         2479     2488       +9     
+ Misses       8945     8936       -9     
Impacted Files Coverage Δ
modules/default/updatenotification/node_helper.js 80.00% <0.00%> (+12.85%) ⬆️

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

@rejas rejas merged commit f14e956 into MagicMirrorOrg:master Feb 7, 2023
rejas pushed a commit that referenced this pull request Feb 7, 2023
Create Thai Language file. 
Translation from English to Thai.

Co-authored-by: veeck <michael@veeck.de>
@rejas
Copy link
Collaborator

rejas commented Feb 7, 2023

Crap, I overlooked that it was based against master... Can we revert that on master @MichMich @khassel ?

@MichMich
Copy link
Collaborator

MichMich commented Feb 7, 2023

Not without creating an additional commit. :(

@rejas
Copy link
Collaborator

rejas commented Feb 7, 2023

So, we are probably stuck here (or we force-push the commit before from master)....

@MichMich
Copy link
Collaborator

MichMich commented Feb 7, 2023

Force push could lead to a lot of issues when others have already pulled. :(

@rejas
Copy link
Collaborator

rejas commented Feb 7, 2023

@MichMich
Copy link
Collaborator

MichMich commented Feb 7, 2023

It's already a protected branch. Maybe I'm missing something?
Screenshot 2023-02-07 at 09 57 43

@rejas
Copy link
Collaborator

rejas commented Feb 7, 2023

Seems like that usecase isnt possible with github outofthebox.
But this action could be something we add to our workflow: https://github.com/marketplace/actions/check-base-branch

@khassel
Copy link
Collaborator

khassel commented Feb 7, 2023

upsi, glad I'm not the famous one this time ;)

Did you overlook the wrong branch when merging in the WebUI (could happen to me too)?

But this action could be something we add to our workflow: https://github.com/marketplace/actions/check-base-branch

we should test this.

Related: To prevent pushing to the wrong repo (original instead own fork) I use a non existing push url (I would have already pushed without):

$ git remote -v
k13     git@github.com:khassel/MagicMirror.git (fetch)
k13     git@github.com:khassel/MagicMirror.git (push)
origin  git@github.com:MichMich/MagicMirror.git (fetch)
origin  fake@github.com (push)

@rejas
Copy link
Collaborator

rejas commented Feb 7, 2023

we should test this.

Already working on something: rejas#7

@rejas
Copy link
Collaborator

rejas commented Feb 7, 2023

Did you overlook the wrong branch when merging in the WebUI (could happen to me too)?

yes :-)

khassel pushed a commit that referenced this pull request Feb 16, 2023
"Inspired" by my mistake in
#3028 this PR will add a
worfklow check for the branch a PR is based against.

Open question is if this prevents @MichMich from preparing a release?

---------

Co-authored-by: veeck <michael@veeck.de>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants