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

two Chinese Sky Cultures #4234

Merged
merged 35 commits into from
Mar 23, 2025
Merged

two Chinese Sky Cultures #4234

merged 35 commits into from
Mar 23, 2025

Conversation

sushoff
Copy link
Contributor

@sushoff sushoff commented Mar 20, 2025

Historical Chinese Sky Culture(s)

Description

Initially, I had created the branch to upload (and edit) the 2000 year old Chenzhuo Sky Culture from China, so please add this as it is.

Then, some troubles came up with the Chinese "medieval" (can we please rename it "Song Dynasty" as the term "medieval" doesn't exist in Chinese history) and I reworked this with comments by mail from Sun Shuwei. However, as Ruslan also tried to fix these issues, Sun Shuwei may now have already accepted Ruslan's version. If so, Ruslan's version might be better than the one in this branch (even if my branch's date is younger).

How Has This Been Tested?

*downloaded and tested in weekly snapshot (only in windows, because the data addition should have the same effect, independente of platforms)

Test Configuration:

  • Operating system: win10
  • Graphics Card: Intel, Iris Xe Graphics, WDDN2.7

Checklist:

  • My code follows the code style of this project.
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas: N.A.
  • I have made corresponding changes to the documentation (header file): N.A.
  • I have updated the respective chapter in the Stellarium User Guide: N.A.
  • My changes generate no new warnings
  • I have added tests that prove my fix is effective or that my feature works : N.A.
  • New and existing unit tests pass locally with my changes
  • Any dependent changes have been merged and published in downstream modules : N.A.

sushoff and others added 30 commits March 9, 2025 10:13
Boshun's Three Schools SC
suggestion to give the B-epoch
updated "pronounce" variable in the remaining half - needs to be filled with characters
Also changed some header levels in the description to make it easier to
convert to the new format.
changed name
Also changed some header levels in the description to make it easier to
convert to the new format.
sushoff added 3 commits March 18, 2025 20:26
added the native characters as far as I was able to
Copy link

Great PR! Please pay attention to the following items before merging:

Files matching skycultures/**:

  • Did you remember to update skycultures/CMakeLists.txt file respectively to changes in sky cultures?
  • Did you remember to define classification parameter in sky cultures (see index.json file)?
  • Did you remember to define license parameter in sky cultures (see description.md file)?
  • Did you remember to define region parameter in sky culture (see index.json file)?

This is an automatically generated QA checklist based on modified files.

@alex-w
Copy link
Member

alex-w commented Mar 20, 2025

Please add rule for new SC in skycultures/CMakeLists.txt file too

"___:___ __ 12:15:48 -17:32:31 00:43:34 -80:33:39 28A 01A"
],
"common_names": {
"HIP 746": [{"english": "Wangiang/Wang Liang", "native": "王良"}],
Copy link
Member

Choose a reason for hiding this comment

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

The contents of "english" should be split into "english" and "pronounce".

Copy link
Contributor

Choose a reason for hiding this comment

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

Actually, it seems the first word is misspelled (is missing an "L").

Copy link
Contributor Author

Choose a reason for hiding this comment

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

interesting... yes, the "L" Is missing but well, both spellings are possible "Wangliang" and "Wang Liang" - AFAIK, that's a (name of a general - eponymous).

Copy link
Contributor Author

Choose a reason for hiding this comment

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

we can use it for both, "pronounce" and "english"

Copy link
Member

Choose a reason for hiding this comment

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

If you look at the whole series, one is always english, the other is always pronunciation. If anyone finds time, the list should be split, at the latest in 25.2.

@gzotti
Copy link
Member

gzotti commented Mar 20, 2025

There is still also #4196. Shall we put everything into 25.1 as intermediate result and you and @sunshuwei continue for 25.2?

@sushoff
Copy link
Contributor Author

sushoff commented Mar 20, 2025

There is still also #4196. Shall we put everything into 25.1 as intermediate result and you and @sunshuwei continue for 25.2?

no, I would really have Boshun Yang's SC published now (as we already postponed it in December, and before that his paper about this had been delayed for 2 years...). So, I would opt for including this data now and rework it for 25.2

@alex-w alex-w added data Missing/bad/outdated data, but no code error subsystem: skycultures The issue is related to skycultures of planetarium... labels Mar 20, 2025
@alex-w alex-w added this to the 25.1 milestone Mar 20, 2025
@gzotti
Copy link
Member

gzotti commented Mar 20, 2025

Isn't this what I suggested? Let me extend my suggestion:

put everything into 25.1 as intermediate result and you and @sunshuwei and Boshun Yang continue for 25.2?

I must leave it to experts on Chinese SCs to find the right numbers, names and flavours of Chinese SCs to present, write native names, pronunciation (pinyin) and translations, and interesting and engaging descriptions for our users. If any of you knows about IPA, name entries can take optional IPA tags as well, to be shown in 25.2.

@sushoff sushoff merged commit 2dd394f into master Mar 23, 2025
29 checks passed
@sushoff sushoff deleted the smh_Chenzhou branch March 23, 2025 00:51
@10110111
Copy link
Contributor

A few mistakes went unnoticed. First, DSO names are marked "english" but are actually Chinese. And second, the .po files should've been merged with the corresponding descriptions translation files, and not included in the SC directory. I'll handle the .po issue later, but the DSO names need to be fixed by the author.

@gzotti
Copy link
Member

gzotti commented Mar 23, 2025

Uh,. I just started to split the pronunciation/english entries. Probably this is useless now.

@sushoff
Copy link
Contributor Author

sushoff commented Mar 24, 2025

apologees, you're all way ahead of my timezone, that's why I thought, I should better make sure that this goes into this release

thank you @gzotti ... don't think, useless - can still be updated

@10110111 thank you, too. I wrote Boshun concerning the DSO names.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
data Missing/bad/outdated data, but no code error subsystem: skycultures The issue is related to skycultures of planetarium...
Development

Successfully merging this pull request may close these issues.

4 participants