diff --git a/Automation/Modules/Locale/Modules/Files/Modules/Update/Modules/Sh/sh.sh b/Automation/Modules/Locale/Modules/Files/Modules/Update/Modules/Sh/sh.sh index 8442646..9e31bf2 100755 --- a/Automation/Modules/Locale/Modules/Files/Modules/Update/Modules/Sh/sh.sh +++ b/Automation/Modules/Locale/Modules/Files/Modules/Update/Modules/Sh/sh.sh @@ -60,7 +60,6 @@ function sh { --package-name=${PACKAGE_NAME} \ --package-version=${PACKAGE_VERSION} \ --msgid-bugs-address="centos-l10n-${TCAR_SCRIPT_LANG_LL}@centos.org.cu" \ - --copyright-holder="$(tcar_printCopyrightInfo --holder)" \ --sort-by-file ${FILES} # When there is not any translatable string to retrieve from file, diff --git a/Automation/Modules/Locale/Modules/Files/Modules/Update/update_convertXmlToPot.sh b/Automation/Modules/Locale/Modules/Files/Modules/Update/update_convertXmlToPot.sh index 570421a..8112741 100755 --- a/Automation/Modules/Locale/Modules/Files/Modules/Update/update_convertXmlToPot.sh +++ b/Automation/Modules/Locale/Modules/Files/Modules/Update/update_convertXmlToPot.sh @@ -30,7 +30,13 @@ function update_convertXmlToPot { local XML_FILE=${1} local POT_FILE=${2} - xml2po -a -l ${TCAR_SCRIPT_LANG_LC} ${XML_FILE} \ + # Move to final location before processing source file in order + # for relative calls (e.g., image files) inside the source files + # can be found by xml2po and no warning be printed from it. + pushd ${RENDER_TARGET} > /dev/null + + cat ${XML_FILE} | xml2po -a -l ${TCAR_SCRIPT_LANG_LC} - \ | msgcat --output-file=${POT_FILE} --width=70 --no-location - + popd > /dev/null } diff --git a/Automation/Modules/Locale/Modules/Files/files.sh b/Automation/Modules/Locale/Modules/Files/files.sh index d2e4a1f..11fc224 100755 --- a/Automation/Modules/Locale/Modules/Files/files.sh +++ b/Automation/Modules/Locale/Modules/Files/files.sh @@ -39,6 +39,11 @@ function files { # command-line. local RENDER_TYPE=$(echo ${RENDER_FROM} | sed -r 's/.+\.([[:alnum:]]+)$/\1/') + # Define location where final content will be stored. This is + # required for producing docbook document that contain relative + # paths inside (e.g., relative calls to image files) correctly. + RENDER_TARGET=$(dirname ${RENDER_FROM})/Final/${TCAR_SCRIPT_LANG_LC} + # Define absolute path of directory holding localization files. local LOCALE_FROM=$(dirname ${RENDER_FROM})/Locales if [[ ! -d ${LOCALE_FROM} ]];then