From 2ca41c78d92cb88a7e2bc907b88357960a1893fb Mon Sep 17 00:00:00 2001
From: Henning Leutz <leutz@pcsg.de>
Date: Thu, 4 Aug 2022 11:45:47 +0200
Subject: [PATCH] fix: remove placeholder for old strftime information; added
new icu formatting at the description
---
locale.xml | 24 ++++++++++++------------
settings.xml | 7 ++++---
2 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/locale.xml b/locale.xml
index 8d2dcd5..f44e315 100644
--- a/locale.xml
+++ b/locale.xml
@@ -502,19 +502,19 @@
</locale>
<locale name="shop.settings.general.timestampFormat.description" html="true">
<de><![CDATA[
- Dieses Datumsformat wird für ein komplettes Datumsformat verwendet (z.B: dd.mm.YYYY H:i:s).
+ Dieses Datumsformat wird für ein komplettes Datumsformat verwendet (z.B: dd.MM.yyyy HH:mm:ss).
<br /><br />
Einstellungen und oder mögliche Datumsformate finden Sie unter:<br />
- <a href="http://php.net/manual/de/function.strftime.php#refsect1-function.strftime-parameters">
- http://php.net/manual/de/function.strftime.php#refsect1-function.strftime-parameters
+ <a href="https://unicode-org.github.io/icu/userguide/format_parse/datetime/" target="_blank">
+ https://unicode-org.github.io/icu/userguide/format_parse/datetime/
</a>
]]></de>
<en><![CDATA[
- This date format is used for a complete date format (e.g.: dd.mm.YYYYY H:i:s).
+ This date format is used for a complete date format (e.g.: dd.MM.yyyy HH:mm:ss).
<br /><br />
Settings and or possible date formats can be found under:<br />
- <a href="http://php.net/manual/en/function.strftime.php#refsect1-function.strftime-parameters">
- http://php.net/manual/en/function.strftime.php#refsect1-function.strftime-parameters
+ <a href="https://unicode-org.github.io/icu/userguide/format_parse/datetime/" target="_blank">
+ https://unicode-org.github.io/icu/userguide/format_parse/datetime/
</a>
]]></en>
</locale>
@@ -528,19 +528,19 @@
</locale>
<locale name="shop.settings.general.dateFormat.description">
<de><![CDATA[
- Dieses Datumsformat wird für ein partiell Datumsformat verwendet (z.B: dd.mm.YYYY).
+ Dieses Datumsformat wird für ein partiell Datumsformat verwendet (z.B: dd.MM.yyyy).
<br /><br />
Einstellungen und oder mögliche Datumsformate finden Sie unter:<br />
- <a href="http://php.net/manual/de/function.strftime.php#refsect1-function.strftime-parameters">
- http://php.net/manual/de/function.strftime.php#refsect1-function.strftime-parameters
+ <a href="https://unicode-org.github.io/icu/userguide/format_parse/datetime/">
+ https://unicode-org.github.io/icu/userguide/format_parse/datetime/
</a>
]]></de>
<en><![CDATA[
- This date format is used for a partial date format (e.g.: dd.mm.YYYYY).
+ This date format is used for a partial date format (e.g.: dd.MM.yyyy).
<br /><br />
Settings and or possible date formats can be found under:<br />
- <a href="http://php.net/manual/en/function.strftime.php#refsect1-function.strftime-parameters">
- http://php.net/manual/en/function.strftime.php#refsect1-function.strftime-parameters
+ <a href="https://unicode-org.github.io/icu/userguide/format_parse/datetime/">
+ https://unicode-org.github.io/icu/userguide/format_parse/datetime/
</a>
]]></en>
</locale>
diff --git a/settings.xml b/settings.xml
index 7a487de..37b9fb4 100644
--- a/settings.xml
+++ b/settings.xml
@@ -271,7 +271,8 @@
<title>
<locale group="quiqqer/erp" var="menu.erp.company.bank.title"/>
</title>
- <input type="hidden" conf="company.bankAccountId" data-qui="package/quiqqer/erp/bin/backend/controls/bankAccounts/Select">
+ <input type="hidden" conf="company.bankAccountId"
+ data-qui="package/quiqqer/erp/bin/backend/controls/bankAccounts/Select">
<text>
<locale group="quiqqer/erp" var="menu.erp.company.bankAccountId"/>
</text>
@@ -285,7 +286,7 @@
<input conf="timestampFormat"
data-qui="controls/system/AvailableLanguages"
- data-qui-options-placeholder="%c"
+ data-qui-options-placeholder=" "
>
<text>
<locale group="quiqqer/erp" var="shop.settings.general.timestampFormat"/>
@@ -297,7 +298,7 @@
<input conf="dateFormat"
data-qui="controls/system/AvailableLanguages"
- data-qui-options-placeholder="%D"
+ data-qui-options-placeholder=" "
>
<text>
<locale group="quiqqer/erp" var="shop.settings.general.dateFormat"/>
--
GitLab