Skip to content

Update Chinese translation #2665

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
Merged
magicbug merged 2 commits into from
Nov 8, 2023
Merged

Update Chinese translation #2665

magicbug merged 2 commits into from
Nov 8, 2023

Conversation

@littlebear0729
Copy link
Contributor

@littlebear0729 littlebear0729 commented Nov 8, 2023

No description provided.

@HB9HIL
Copy link
Contributor

HB9HIL commented Nov 8, 2023

Hello

Yesterday there was another language PR merged.

Please pull the latest dev in your branch and solve the conflicts.

Thank you for your work!

@littlebear0729
Copy link
Contributor Author

littlebear0729 commented Nov 8, 2023 •
edited
Loading

Sorry for the inconvenience. I missed the dev branch and just did the work on master branch.
Now I've merge the dev branch. Should I change the pull-request to the dev branch or this pr is just fine?

@HB9HIL
Copy link
Contributor

HB9HIL commented Nov 8, 2023

No change it to dev branch please. We only merge PR's to dev branch

@littlebear0729 littlebear0729 changed the base branch from master to dev November 8, 2023 07:18
@littlebear0729
Copy link
Contributor Author

littlebear0729 commented Nov 8, 2023

Done. Cloudlog is really good to use, hope this project will be better!

This is Haonan(BI1NEI) from Beijing, China. 73!

@HB9HIL
Copy link
Contributor

HB9HIL commented Nov 8, 2023

Done. Cloudlog is really good to use, hope this project will be better!

This is Haonan(BI1NEI) from Beijing, China. 73!

Great work 👍

In dev branch there are much more language snippets to translate into chinese. Can you do that aswell? 😄

@littlebear0729
Copy link
Contributor Author

littlebear0729 commented Nov 8, 2023

Of course! I will do it when I have more spare times.

@HB9HIL
Copy link
Contributor

HB9HIL commented Nov 8, 2023

Of course! I will do it when I have more spare times.

Thank you very much! We continuously adding more multilanguage support to Cloudlog. 👍 We are working with dev branch 😄

HB9HIL
HB9HIL reviewed Nov 8, 2023
View reviewed changes
application/language/chinese_simplified/general_words_lang.php
$lang['gen_hamradio_mode'] = '模式';
$lang['gen_hamradio_dx'] = 'Dx';
$lang['gen_hamradio_mode'] = 'Mode';
$lang['gen_hamradio_dx'] = 'DX';
Copy link
Contributor

@HB9HIL HB9HIL Nov 8, 2023

Choose a reason for hiding this comment

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

Please check that. You removed "$lang['gen_hamradio_mode'] = 'Mode';"

Copy link
Contributor

@HB9HIL HB9HIL Nov 8, 2023

Choose a reason for hiding this comment

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

Did you pull the latest dev branch?

Copy link
Contributor Author

@littlebear0729 littlebear0729 Nov 8, 2023

Choose a reason for hiding this comment

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

Yes, line 119 and line 121 of the original file is duplicated with same key 'gen_hamradio_mode', this cause the string translation is overwritten.

Copy link
Contributor

@HB9HIL HB9HIL Nov 8, 2023

Choose a reason for hiding this comment

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

ahhh omg haha here in switzerland it's 8:42 am sorry my bad

HB9HIL
HB9HIL approved these changes Nov 8, 2023
View reviewed changes
Copy link
Contributor

@HB9HIL HB9HIL left a comment

Choose a reason for hiding this comment

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

approved :)

@magicbug magicbug merged commit 9e05cf4 into magicbug:dev Nov 8, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@HB9HIL HB9HIL HB9HIL approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@littlebear0729 @HB9HIL @magicbug