configure.ac | 16 ++++++++-------- l10ntools/source/ulfconv/msi-encodinglist.txt | 1 + scp2/source/ooo/module_langpack.ulf | 6 ++++++ solenv/inc/langlist.mk | 9 +++++++++ 4 files changed, 24 insertions(+), 8 deletions(-)
New commits: commit e8392bc1c984da1f09674055b1bac95e12de59a6 Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com> AuthorDate: Sat Jun 1 17:45:55 2024 +0200 Commit: Christian Lohmaier <lohmaier+libreoff...@googlemail.com> CommitDate: Sun Jun 2 19:26:46 2024 +0200 allow low-translation-completion-langs for dev-builds (e.g.: Sundanese) will be included when using --with-lang=ALL in non-release configuration (i.e. tinderbox provided daily builds), but not when using --enable-release-build. Change the way how configure fetches the list of all supported languages from a fancy sed call to running make with a dummy-recipe. Change-Id: I8bbea5fd95d37eac5bbce2e55ae34830b0ab4ebb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168334 Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com> Tested-by: Jenkins diff --git a/configure.ac b/configure.ac index 2cccb004e8dd..172417596a84 100644 --- a/configure.ac +++ b/configure.ac @@ -14457,14 +14457,14 @@ dnl =================================================================== AC_MSG_CHECKING([which languages to be built]) # get list of all languages # generate shell variable from completelangiso= from solenv/inc/langlist.mk -# the sed command does the following: -# + if a line ends with a backslash, append the next line to it -# + adds " on the beginning of the value (after =) -# + adds " at the end of the value -# + removes en-US; we want to put it on the beginning -# + prints just the section starting with 'completelangiso=' and ending with the " at the end of line -[eval $(sed -e :a -e '/\$/N; s/\ //; ta' -n -e 's/=/="/;s/\([^\]\)$/"/;s/en-US//;/^completelangiso/p' $SRC_ROOT/solenv/inc/langlist.mk)] -ALL_LANGS="en-US $completelangiso" +# we want en-US at the beginning +ALL_LANGS=$($GNUMAKE SRC_ROOT=$SRC_ROOT WITH_LANG="$with_lang" ENABLE_RELEASE_BUILD="$ENABLE_RELEASE_BUILD" -sr -f - <<'EOF' | tr -d ' ' +include $(SRC_ROOT)/solenv/inc/langlist.mk +all: + $(info en-US $(filter-out en-US,$(sort $(completelangiso)))) +EOF +) + # check the configured localizations WITH_LANG="$with_lang" diff --git a/l10ntools/source/ulfconv/msi-encodinglist.txt b/l10ntools/source/ulfconv/msi-encodinglist.txt index eaa1754cf538..453d1330dd39 100644 --- a/l10ntools/source/ulfconv/msi-encodinglist.txt +++ b/l10ntools/source/ulfconv/msi-encodinglist.txt @@ -147,6 +147,7 @@ sr-Latn 0 2074 # Serbian Latin sr-SP 0 3098 # Serbian Cyrillic ss 0 1579 # Swazi st 0 1072 # Southern Sotho, Sutu +sun 0 1690 # Sundanese, fake LCID sv 0 1053 sw 0 1089 # Swahili sw-TZ 0 1089 # Swahili diff --git a/scp2/source/ooo/module_langpack.ulf b/scp2/source/ooo/module_langpack.ulf index 5b51e7fa9f64..e9274207734c 100644 --- a/scp2/source/ooo/module_langpack.ulf +++ b/scp2/source/ooo/module_langpack.ulf @@ -70,6 +70,12 @@ en-US = "Spanish" [STR_DESC_MODULE_LANGPACK_ES] en-US = "Installs the Spanish user interface" +[STR_NAME_MODULE_LANGPACK_SUN] +en-US = "Sundanese" + +[STR_DESC_MODULE_LANGPACK_SUN] +en-US = "Installs the Sundanese user interface" + [STR_NAME_MODULE_LANGPACK_SV] en-US = "Swedish" diff --git a/solenv/inc/langlist.mk b/solenv/inc/langlist.mk index 0de00dff99a7..95a295c10738 100644 --- a/solenv/inc/langlist.mk +++ b/solenv/inc/langlist.mk @@ -138,6 +138,15 @@ zh-CN \ zh-TW \ zu +# languages with low translation percentage, but still wish to have daily builds +lowcompletion_langs = sun +ifneq ($(ENABLE_RELEASE_BUILD),TRUE) +completelangiso += $(lowcompletion_langs) +else +# allow to manually specify even in release config +completelangiso += $(foreach lang,$(WITH_LANG),$(filter $(lang),$(lowcompletion_langs))) +endif + ifneq ($(WITH_LANG),ALL) gb_WITH_LANG=$(WITH_LANG) else