napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2010 from calamares/accept-esperanto

Browse Source 
Remove special case for Esperanto
This commit is contained in:
Adriaan de Groot 2022-07-03 12:34:53 +02:00 committed by GitHub
commit 8f3ac6e00b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
CMakeLists.txt
View File

@ -139,8 +139,6 @@ set(CALAMARES_DESCRIPTION_SUMMARY "The distribution-independent installer framew
# (sr@latin in particular) or location (ca@valencia) need special # (sr@latin in particular) or location (ca@valencia) need special
# handling in libcalamares/locale/Translation.h . # handling in libcalamares/locale/Translation.h .
# #
# NOTE: move eo (Esperanto) to _ok once Qt can actually create a
# locale for it. (Qt 5.12.2 can, see Translation Status section).
# NOTE: move ie (Interlingue) to _ok once Qt supports it. # NOTE: move ie (Interlingue) to _ok once Qt supports it.
# NOTE: update these lines by running `txstats.py`, or for full automation # NOTE: update these lines by running `txstats.py`, or for full automation
# `txstats.py -e`. See also # `txstats.py -e`. See also
@ -411,19 +409,10 @@ set(Calamares_WITH_QML ${WITH_QML})
### Transifex Translation status ### Transifex Translation status
# #
# Construct language lists for use. This massages the language lists # Construct language lists for use. This massages the language lists if
# for use with older Qt (which does not support Esperanto) and checks # needed and checks for some obvious errors. The actual work of
# for some obvious error. The actual work of compiling translations # compiling translations is done in the lang/ directory.
# is done in the lang/ directory.
# #
if(Qt5_VERSION VERSION_GREATER 5.12.1)
# At least Qt 5.12.2 seems to support Esperanto in QLocale
if("eo" IN_LIST _tx_incomplete)
message(STATUS "Esperanto support since Qt 5.12.2, enabling Esperanto locale")
list(REMOVE_ITEM _tx_incomplete "eo")
list(APPEND _tx_ok "eo")
endif()
endif()
set(curr_tx ${_tx_complete} ${_tx_good} ${_tx_ok} ${_tx_incomplete}) set(curr_tx ${_tx_complete} ${_tx_good} ${_tx_ok} ${_tx_incomplete})
set(tx_errors OFF) set(tx_errors OFF)

6
ci/txstats.py
View File

@ -177,11 +177,9 @@ def get_tx_stats(languages, outputter, verbose):
# Some languages go into the "incomplete" list by definition, # Some languages go into the "incomplete" list by definition,
# regardless of their completion status: this can have various reasons. # regardless of their completion status: this can have various reasons.
# #
# Note that Esperanto (eo) is special-cased in CMakeLists.txt # - (Esperanto wasn't supported until Qt 5.12.2)
# during the build; recent Qt releases *do* support the language, # - Interlingue still is not supported by the minimum Qt version
# and it's at-the-least ok.
incomplete_languages = ( incomplete_languages = (
"eo", # Not supported by QLocale < 5.12.1
"ie", # Not supported by Qt at least through 5.15.0 "ie", # Not supported by Qt at least through 5.15.0
) )