You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2023/01/25 10:33:01 UTC
[ofbiz-framework] branch trunk updated: Fixed: File XML Properties file process error (OFBIZ-12738) (#580)
This is an automated email from the ASF dual-hosted git repository.
jleroux pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/trunk by this push:
new 870adbe31f Fixed: File XML Properties file process error (OFBIZ-12738) (#580)
870adbe31f is described below
commit 870adbe31f410251cfc02ef0937e05a99e28e354
Author: Jacques Le Roux <ja...@les7arts.com>
AuthorDate: Wed Jan 25 11:28:52 2023 +0100
Fixed: File XML Properties file process error (OFBIZ-12738) (#580)
This is caused by unescaped <> brackets in QRCodeUiLabels.xml in framework/common.
Fixed escape syntax for <>.
Thanks: Chenghu Shan
---
framework/common/config/QRCodeUiLabels.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/framework/common/config/QRCodeUiLabels.xml b/framework/common/config/QRCodeUiLabels.xml
index 11822d380a..725824b2d0 100644
--- a/framework/common/config/QRCodeUiLabels.xml
+++ b/framework/common/config/QRCodeUiLabels.xml
@@ -36,8 +36,8 @@
<value xml:lang="zh">无法写格式为{0}的图片。</value>
</property>
<property key="GeneratedTextNotMatchOriginal">
- <value xml:lang="en">The text in generated QR code doesn't match the original: <br/>[Text in QR code]{0} <br/>[Original text]{1}</value>
- <value xml:lang="zh">二维码中的文字信息与原信息不一致:<br/>[二维码中文字]{0}<br/>[原信息文字]{1}</value>
+ <value xml:lang="en">The text in generated QR code doesn't match the original: <br/>[Text in QR code]{0} <br/>[Original text]{1}</value>
+ <value xml:lang="zh">二维码中的文字信息与原信息不一致:<br/>[二维码中文字]{0} <br/>[原信息文字]{1}</value>
</property>
<property key="ParameterCannotEmpty">
<value xml:lang="en">The {0} parameter cannot be empty in generateQRCodeImage service!</value>