Merge branch 'next' into 'master'

Next

See merge request !14

README.md

@@ -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

ajax/template/LangList.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>

locale.xml

@@ -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[

quiqqer/quiqqer/lib/templates/mail/footer.html

@@ -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>

quiqqer/quiqqer/lib/templates/mail/header.html

@@ -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>

settings.xml

@@ -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>

src/QUI/TemplateCologne/Controls/LangCurrencySwitch.php

@@ -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');
         };