Skip to content
Code-Schnipsel Gruppen Projekte
Commit 4b8d8d31 erstellt von Henning Leutz's avatar Henning Leutz :martial_arts_uniform:
Dateien durchsuchen

Merge branch 'dev' into 'next'

fix: quiqqer/quiqqer locale and paths adapted to quiqqer/core

See merge request !13
Übergeordnete 111b6752 14416799
No related branches found
No related tags found
2 Merge Requests!14Next,!13fix: quiqqer/quiqqer locale and paths adapted to quiqqer/core
Pipeline #7752 bestanden mit Phase
in 11 Sekunden
......@@ -79,7 +79,7 @@ Example:
### Available template events
For more information go to
[QUIQQER Wiki - Template events](https://dev.quiqqer.com/quiqqer/quiqqer/wikis/design_standard#template-events).
[QUIQQER Wiki - Template events](https://dev.quiqqer.com/quiqqer/core/wikis/design_standard#template-events).
```html
......
......@@ -12,7 +12,7 @@
<img src="{$path}{$lang}.png"/>
</span>
<span class="lcs-menu-list-entry-link-text ">
{locale group="quiqqer/quiqqer" var="language.$lang"}
{locale group="quiqqer/core" var="language.$lang"}
</span>
</a>
......
......@@ -959,7 +959,7 @@
</groups>
<!-- override locale -->
<groups name="quiqqer/quiqqer" datatype="php">
<groups name="quiqqer/core" datatype="php">
<locale name="templates.mail.body.header.social" priority="10" html="true">
<de>
<![CDATA[
......
......@@ -94,7 +94,7 @@
<tr>
<td align="center" valign="middle" width="500" style="font-size: 12px; line-height: 18px; font-family: Helvetica, Arial, sans-serif; color:#666666; padding: 10px 0;">
{locale group="quiqqer/quiqqer" var="templates.mail.body.footer.social" HOST=$host}
{locale group="quiqqer/core" var="templates.mail.body.footer.social" HOST=$host}
</td>
</tr>
</table>
......
......@@ -18,7 +18,7 @@
<table border="0" cellpadding="0" cellspacing="0">
<tr>
<td align="right" style="font-size: 14px; font-family: Arial, sans-serif; color: #666666; text-decoration: none;">
{locale group="quiqqer/quiqqer" var="templates.mail.body.header.social" HOST=QUI::getRewrite()->getProject()->get(1)->getUrlRewrittenWithHost()}
{locale group="quiqqer/core" var="templates.mail.body.header.social" HOST=QUI::getRewrite()->getProject()->get(1)->getUrlRewrittenWithHost()}
</td>
</tr>
</table>
......
......@@ -1310,10 +1310,10 @@
<locale group="quiqqer/system" var="release_from_desc"/>
</option>
<option value="order_field ASC">
<locale group="quiqqer/quiqqer" var="order_field_asc"/>
<locale group="quiqqer/core" var="order_field_asc"/>
</option>
<option value="order_field DESC">
<locale group="quiqqer/quiqqer" var="order_field_desc"/>
<locale group="quiqqer/core" var="order_field_desc"/>
</option>
</select>
</settings>
......
......@@ -82,8 +82,8 @@ public function getBody(): string
$Currency = QUI\ERP\Currency\Handler::getUserCurrency();
}
if ($Locale->exists('quiqqer/quiqqer', 'language.' . $Project->getLang())) {
$imgAltText = $Locale->get('quiqqer/quiqqer', 'language.' . $Project->getLang());
if ($Locale->exists('quiqqer/core', 'language.' . $Project->getLang())) {
$imgAltText = $Locale->get('quiqqer/core', 'language.' . $Project->getLang());
} else {
$imgAltText = $Locale->get('quiqqer/template-cologne', 'label.language');
};
......
0% oder .
You are about to add 0 people to the discussion. Proceed with caution.
Bearbeitung dieser Nachricht zuerst beenden!
Bitte registrieren oder zum Kommentieren