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

Switch skycultures to the new format #3751

Open
wants to merge 25 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
c105f2a
Move common DSO and star names from modern_iau to a common dir
10110111 Mar 12, 2024
8766da9
Remove all old sky cultures
10110111 Jan 9, 2025
810fdc5
Rename stellarium-skycultures -> stellarium-sky
10110111 Jan 9, 2025
7d40ff7
Update stellarium-sky.pot
10110111 Jan 13, 2025
262e42c
Update stellarium-sky translations by the new .pot file
10110111 Jan 13, 2025
83f3a98
Add a script to import new-format sky cultures
10110111 May 17, 2024
3611d16
Import eligible cultures from stellarium-skycultures
10110111 Jan 13, 2025
bc41ab1
Pass StelSkyCulture instead of dir to SC parsers
10110111 May 2, 2024
5fe2ed9
Start adding support for new sky cultures format
10110111 May 2, 2024
1fbd42c
Implement reading asterisms in new format
10110111 May 7, 2024
66cad50
Implement reading constellations in new format
10110111 May 7, 2024
775e6bf
Fallback to global dictionary for constellations translation
10110111 Jan 25, 2024
c206a4b
Implement loading culture-specific DSO names
10110111 May 7, 2024
765a45c
Implement loading of Solar system names
10110111 May 7, 2024
7dad1b0
Implement loading culture-specific star names
10110111 May 7, 2024
5f08287
Add support for loading new sky culture format translators in StelLoc…
10110111 Jan 15, 2024
2ad1577
Translate sky culture description and name
10110111 Jun 11, 2024
7b89b83
Translate planet names
10110111 Jan 17, 2024
297be0d
Add support for Chinese translations of Chinese cultures
10110111 Mar 11, 2024
a2cdd36
Add a converter for sky cultures from old format to new
10110111 Mar 19, 2024
764a57c
Add a tool to generate pot files for sky cultures
10110111 Jan 15, 2025
5678b40
Update/create stellarium-skycultures{,-descriptions}.pot
10110111 Jan 15, 2025
078bae7
Restore deleted additional SC files
10110111 Jan 20, 2025
e0ad684
Update SC description po files by the new .pot
10110111 Jan 20, 2025
871db3c
Load default DSO names if none are specified in current SC
10110111 Jan 20, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
6 changes: 6 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -851,6 +851,12 @@ IF(ENABLE_XLSX)
ENDIF()
ENDIF()

CPMAddPackage(NAME md4c
URL https://github.com/mity/md4c/archive/refs/tags/release-0.4.8.tar.gz
URL_HASH SHA256=4a457df853425b6bb6e3457aa1d1a13bccec587a04c38c622b1013a0da41439f
EXCLUDE_FROM_ALL yes
OPTIONS "BUILD_MD2HTML_EXECUTABLE OFF")

########### Set some global variables ###########
IF(UNIX AND NOT WIN32)
IF(APPLE)
Expand Down
6 changes: 6 additions & 0 deletions data/gui/normalHtml.css
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,9 @@ table.layout, table.layout tr td, table.layout tr th {
padding: 0;
border-style: none;
}

.img_and_caption {
font-style: italic;
margin-right: 3%;
margin-left: 3%;
}
2 changes: 2 additions & 0 deletions po/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,9 @@ ENDMACRO(GETTEXT_CREATE_TRANSLATIONS )


ADD_SUBDIRECTORY(stellarium)
ADD_SUBDIRECTORY(stellarium-sky)
ADD_SUBDIRECTORY(stellarium-skycultures)
ADD_SUBDIRECTORY(stellarium-skycultures-descriptions)
ADD_SUBDIRECTORY(stellarium-planetary-features)
IF(ENABLE_SCRIPTING)
ADD_SUBDIRECTORY(stellarium-scripts)
Expand Down
28 changes: 28 additions & 0 deletions po/stellarium-sky/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
FILE(GLOB poscfiles RELATIVE "${CMAKE_SOURCE_DIR}/po/stellarium-sky/" "*.po")
LIST(SORT poscfiles)
STRING(REGEX REPLACE ".po" "" outposcfiles "${poscfiles}")

GETTEXT_CREATE_TRANSLATIONS(stellarium-sky DEFAULT_TARGET ${outposcfiles})

# Discard this target if xgettext is not installed
IF(${XGETTEXT_FOUND})
ADD_CUSTOM_TARGET(
generate-pot-stellarium-sky
${GETTEXT_XGETTEXT_EXECUTABLE}
-o stellarium-sky.pot
--keyword=_:1,2c
--language=Python
--add-comments=TRANSLATORS:
--directory=${PROJECT_SOURCE_DIR}
--files-from=POTFILES.in
--copyright-holder=Stellarium's\ team
[email protected]
--from-code=utf-8
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
COMMENT "Generating stellarium-sky.pot"
VERBATIM
)

# Generate this POT file when building the "generate-pot" target.
ADD_DEPENDENCIES(generate-pot generate-pot-stellarium-sky)
ENDIF()
7 changes: 7 additions & 0 deletions po/stellarium-sky/POTFILES.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# Proper names of celestial bodies
skycultures/translations.fab
# Proper names of deep-sky objects
nebulae/default/names.dat
# International names of sky objects
skycultures/common_dso_names.fab
skycultures/common_star_names.fab
Loading
Loading