Dictionary_da.mk | 7 ++----- da_DK/description.xml | 4 ++-- 2 files changed, 4 insertions(+), 7 deletions(-)
New commits: commit 8a76169e8be8c04b3abb802db38c170bc97b65bc Author: Xisco Fauli <[email protected]> AuthorDate: Thu Jun 11 10:36:42 2026 +0200 Commit: Xisco Fauli <[email protected]> CommitDate: Thu Jun 11 19:29:27 2026 +0200 da_DK: fix build l10ntools/source/xrmmerge.cxx is not prepared to work with subdirectories. Besides, en-US has to be the first on the list. This fix comes with another fix in l10ntools/source/xrmmerge.cxx --- a/l10ntools/source/xrmmerge.cxx +++ b/l10ntools/source/xrmmerge.cxx @@ -397,7 +397,8 @@ void XRMResMerge::WorkOnDesc( sSearch = "xlink:href=\""_ostr; sReplace = sSearch; - const OString sLocDescFilename = sDescFilename.replaceFirst( "en-US"_ostr, sCur); + // for cases like desc_en_US.txt or desc_en-US.txt + const OString sLocDescFilename = sDescFilename.replaceFirst( "en-US"_ostr, sCur).replaceFirst( "en_US"_ostr, sCur); sSearch += sDescFilename; sReplace += sLocDescFilename; Error: cannot write /home/tdf/lode/jenkins/workspace/lo_gerrit/tb/build_master/workdir/DescriptionTranslateTarget/dictionaries/da_DK/description/desc_da_DK.txt make[1]: *** [/home/tdf/lode/jenkins/workspace/lo_gerrit/tb/src_master/solenv/gbuild/Dictionary.mk:147: /home/tdf/lode/jenkins/workspace/lo_gerrit/tb/build_master/workdir/DescriptionTranslateTarget/dictionaries/da_DK/description.xml] Error 134 make[1]: *** Deleting file '/home/tdf/lode/jenkins/workspace/lo_gerrit/tb/build_master/workdir/DescriptionTranslateTarget/dictionaries/da_DK/description.xml' make[1]: *** Waiting for unfinished jobs.... Change-Id: Ibbb5f5d9529cd02143d81fe3fda72924658ae130 Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/206351 Tested-by: Xisco Fauli <[email protected]> Reviewed-by: Xisco Fauli <[email protected]> diff --git a/Dictionary_da.mk b/Dictionary_da.mk index 3138d78..60cbc5d 100644 --- a/Dictionary_da.mk +++ b/Dictionary_da.mk @@ -12,16 +12,13 @@ $(eval $(call gb_Dictionary_Dictionary,dict-da,dictionaries/da_DK)) $(eval $(call gb_Dictionary_add_root_files,dict-da,\ dictionaries/da_DK/da_DK.aff \ dictionaries/da_DK/da_DK.dic \ + dictionaries/da_DK/desc_da_DK.txt \ + dictionaries/da_DK/desc_en_US.txt \ dictionaries/da_DK/hyph_da_DK.dic \ dictionaries/da_DK/HYPH_da_DK_README.txt \ dictionaries/da_DK/README_da_DK.txt \ )) -$(eval $(call gb_Dictionary_add_files,dict-da,description,\ - dictionaries/da_DK/description/desc_da_DK.txt \ - dictionaries/da_DK/description/desc_en_US.txt \ -)) - $(eval $(call gb_Dictionary_add_files,dict-da,help/en,\ dictionaries/da_DK/help/en/help.tree \ )) diff --git a/da_DK/description/desc_da_DK.txt b/da_DK/desc_da_DK.txt similarity index 100% rename from da_DK/description/desc_da_DK.txt rename to da_DK/desc_da_DK.txt diff --git a/da_DK/description/desc_en_US.txt b/da_DK/desc_en_US.txt similarity index 100% rename from da_DK/description/desc_en_US.txt rename to da_DK/desc_en_US.txt diff --git a/da_DK/description.xml b/da_DK/description.xml index b3ca9d8..5e6ff68 100644 --- a/da_DK/description.xml +++ b/da_DK/description.xml @@ -23,8 +23,8 @@ <default xlink:href="Images/Trold_42x42.png" /> </icon> <extension-description> - <src xlink:href="description/desc_da_DK.txt" lang="da" /> - <src xlink:href="description/desc_en_US.txt" lang="en-US" /> + <src xlink:href="desc_en_US.txt" lang="en-US" /> + <src xlink:href="desc_da_DK.txt" lang="da" /> </extension-description> </description>
