diff --git a/bin/backend/controls/DeliveryAddress.js b/bin/backend/controls/DeliveryAddress.js
index aa4263246089cd534c5280cf1d6fd88ef6367fb9..376fae75a935f2cc16ad376e7bfee041f53947ac 100644
--- a/bin/backend/controls/DeliveryAddress.js
+++ b/bin/backend/controls/DeliveryAddress.js
@@ -82,15 +82,15 @@ define('package/quiqqer/erp/bin/backend/controls/DeliveryAddress', [
lg,
'control.DeliveryAddress.tpl.labelDifferentDeliveryAddress'
),
- textAddresses: QUILocale.get('quiqqer/quiqqer', 'address'),
- textCompany: QUILocale.get('quiqqer/quiqqer', 'company'),
- textStreet: QUILocale.get('quiqqer/quiqqer', 'street_no'),
- textZip: QUILocale.get('quiqqer/quiqqer', 'zip'),
- textCity: QUILocale.get('quiqqer/quiqqer', 'city'),
- textCountry: QUILocale.get('quiqqer/quiqqer', 'country'),
- textSalutation: QUILocale.get('quiqqer/quiqqer', 'salutation'),
- textFirstname: QUILocale.get('quiqqer/quiqqer', 'firstname'),
- textLastname: QUILocale.get('quiqqer/quiqqer', 'lastname')
+ textAddresses: QUILocale.get('quiqqer/core', 'address'),
+ textCompany: QUILocale.get('quiqqer/core', 'company'),
+ textStreet: QUILocale.get('quiqqer/core', 'street_no'),
+ textZip: QUILocale.get('quiqqer/core', 'zip'),
+ textCity: QUILocale.get('quiqqer/core', 'city'),
+ textCountry: QUILocale.get('quiqqer/core', 'country'),
+ textSalutation: QUILocale.get('quiqqer/core', 'salutation'),
+ textFirstname: QUILocale.get('quiqqer/core', 'firstname'),
+ textLastname: QUILocale.get('quiqqer/core', 'lastname')
}));
// Address select
diff --git a/bin/backend/controls/OutputDialog.js b/bin/backend/controls/OutputDialog.js
index d9b4500178db1cb2936a3cbaa7812c0aa013eb6e..3cd8a6688ada8aa24f7346482f86acc4c7ae6faa 100644
--- a/bin/backend/controls/OutputDialog.js
+++ b/bin/backend/controls/OutputDialog.js
@@ -140,7 +140,7 @@ define('package/quiqqer/erp/bin/backend/controls/OutputDialog', [
labelEntityId : QUILocale.get(lg, 'controls.OutputDialog.labelEntityId'),
labelTemplate : QUILocale.get(lg, 'controls.OutputDialog.labelTemplate'),
labelOutputType : QUILocale.get(lg, 'controls.OutputDialog.labelOutputType'),
- labelEmail : QUILocale.get('quiqqer/quiqqer', 'recipient'),
+ labelEmail : QUILocale.get('quiqqer/core', 'recipient'),
showMarkAsSentOption: !!this.getAttribute('showMarkAsSentOption'),
mailEditor : !!this.getAttribute('mailEditor'),
labelOpenMailEditor : QUILocale.get(lg, 'controls.OutputDialog.labelOpenMailEditor'),
diff --git a/bin/backend/controls/articles/ArticleList.js b/bin/backend/controls/articles/ArticleList.js
index f52bef81ad3e7e81625cbaf6146ff9102713fa24..8284723f617857da3dc8ab4bf0ba37fe80a96fad 100644
--- a/bin/backend/controls/articles/ArticleList.js
+++ b/bin/backend/controls/articles/ArticleList.js
@@ -980,8 +980,8 @@ define('package/quiqqer/erp/bin/backend/controls/articles/ArticleList', [
}).inject(Container);
require([
- URL_OPT_DIR + 'quiqqer/quiqqer/bin/QUI/lib/tippy/tippy.min.js',
- 'css!' + URL_OPT_DIR + 'quiqqer/quiqqer/bin/QUI/lib/tippy/tippy.css'
+ URL_OPT_DIR + 'quiqqer/core/bin/QUI/lib/tippy/tippy.min.js',
+ 'css!' + URL_OPT_DIR + 'quiqqer/core/bin/QUI/lib/tippy/tippy.css'
], function(tippy) {
tippy(Warning, {
animateFill: false,
diff --git a/bin/backend/controls/articles/windows/PriceFactors.js b/bin/backend/controls/articles/windows/PriceFactors.js
index 6b256c6146cb12ea974fae98c54b33eb5c878f51..49d98ddc450b623a7313fef6599d408286981881 100644
--- a/bin/backend/controls/articles/windows/PriceFactors.js
+++ b/bin/backend/controls/articles/windows/PriceFactors.js
@@ -58,7 +58,7 @@ define('package/quiqqer/erp/bin/backend/controls/articles/windows/PriceFactors',
this.addButton(
new Element('button', {
'class': 'qui-button',
- html : QUILocale.get('quiqqer/quiqqer', 'close'),
+ html : QUILocale.get('quiqqer/core', 'close'),
events : {
click: () => {
this.close();
diff --git a/bin/backend/controls/customerFiles/Grid.js b/bin/backend/controls/customerFiles/Grid.js
index 66a8a3c9608f7147e2d8e1dfe81252a6885c8eb3..e7cbd7d0def51f507ac4c4efcf25808f73773928 100644
--- a/bin/backend/controls/customerFiles/Grid.js
+++ b/bin/backend/controls/customerFiles/Grid.js
@@ -150,17 +150,17 @@ define('package/quiqqer/erp/bin/backend/controls/customerFiles/Grid', [
dataType: 'node',
width: 50
}, {
- header: QUILocale.get('quiqqer/quiqqer', 'type'),
+ header: QUILocale.get('quiqqer/core', 'type'),
dataIndex: 'icon',
dataType: 'node',
width: 40
}, {
- header: QUILocale.get('quiqqer/quiqqer', 'file'),
+ header: QUILocale.get('quiqqer/core', 'file'),
dataIndex: 'basename',
dataType: 'string',
width: 300
}, {
- header: QUILocale.get('quiqqer/quiqqer', 'size'),
+ header: QUILocale.get('quiqqer/core', 'size'),
dataIndex: 'filesize_formatted',
dataType: 'string',
width: 100
diff --git a/bin/backend/controls/elements/TimeFilter.js b/bin/backend/controls/elements/TimeFilter.js
index 0b97c4bf2e117f86f2dfcea50795543412022f5c..98f2a1b5ab3e102440e8c31c9a84946299b558a3 100644
--- a/bin/backend/controls/elements/TimeFilter.js
+++ b/bin/backend/controls/elements/TimeFilter.js
@@ -128,7 +128,7 @@ define('package/quiqqer/erp/bin/backend/controls/elements/TimeFilter', [
var month = ("0" + (this.$Current.getMonth() + 1)).slice(-2);
- text = QUILocale.get('quiqqer/quiqqer', 'month.' + month);
+ text = QUILocale.get('quiqqer/core', 'month.' + month);
text = text + ' (' + this.$Current.getFullYear() + ')';
break;
@@ -161,7 +161,7 @@ define('package/quiqqer/erp/bin/backend/controls/elements/TimeFilter', [
case 'year':
this.$type = 'year';
- text = QUILocale.get('quiqqer/quiqqer', 'year');
+ text = QUILocale.get('quiqqer/core', 'year');
text = text + ' ' + this.$Current.getFullYear();
break;
diff --git a/bin/backend/controls/elements/YearFilter.js b/bin/backend/controls/elements/YearFilter.js
index 084198fe3aaca8e9e0c8b905a6d292981d4f1e78..3c8461411f14d936a39e40344f9e454829ef7a02 100644
--- a/bin/backend/controls/elements/YearFilter.js
+++ b/bin/backend/controls/elements/YearFilter.js
@@ -63,7 +63,7 @@ define('package/quiqqer/erp/bin/backend/controls/elements/YearFilter', [
'<div class="year-years"></div>' +
'<div class="year-cancel">' +
' <button class="qui-button--no-icon qui-button">' +
- QUILocale.get('quiqqer/quiqqer', 'cancel') +
+ QUILocale.get('quiqqer/core', 'cancel') +
'</button>' +
'</div>'
);
diff --git a/bin/backend/controls/manufacturers/Administration.js b/bin/backend/controls/manufacturers/Administration.js
index c540e7a1876bb9257befe4720d30fe2db3322761..076a66c725b7c06a40ca43e889fc08462e647caa 100644
--- a/bin/backend/controls/manufacturers/Administration.js
+++ b/bin/backend/controls/manufacturers/Administration.js
@@ -165,14 +165,14 @@ define('package/quiqqer/erp/bin/backend/controls/manufacturers/Administration',
});
columnModel.push({
- header : QUILocale.get('quiqqer/quiqqer', 'id'),
+ header : QUILocale.get('quiqqer/core', 'id'),
dataIndex: 'id',
dataType : 'integer',
width : 100
});
/*{
- header : QUILocale.get('quiqqer/quiqqer', 'username'),
+ header : QUILocale.get('quiqqer/core', 'username'),
dataIndex: 'username',
dataType : 'integer',
width : 150,
@@ -181,35 +181,35 @@ define('package/quiqqer/erp/bin/backend/controls/manufacturers/Administration',
}*/
columnModel.push({
- header : QUILocale.get('quiqqer/quiqqer', 'company'),
+ header : QUILocale.get('quiqqer/core', 'company'),
dataIndex: 'company',
dataType : 'string',
width : 150,
});
columnModel.push({
- header : QUILocale.get('quiqqer/quiqqer', 'firstname'),
+ header : QUILocale.get('quiqqer/core', 'firstname'),
dataIndex: 'firstname',
dataType : 'string',
width : 150,
});
columnModel.push({
- header : QUILocale.get('quiqqer/quiqqer', 'lastname'),
+ header : QUILocale.get('quiqqer/core', 'lastname'),
dataIndex: 'lastname',
dataType : 'string',
width : 150,
});
columnModel.push({
- header : QUILocale.get('quiqqer/quiqqer', 'email'),
+ header : QUILocale.get('quiqqer/core', 'email'),
dataIndex: 'email',
dataType : 'string',
width : 150,
});
columnModel.push({
- header : QUILocale.get('quiqqer/quiqqer', 'group'),
+ header : QUILocale.get('quiqqer/core', 'group'),
dataIndex: 'usergroup_display',
dataType : 'string',
width : 150,
@@ -222,7 +222,7 @@ define('package/quiqqer/erp/bin/backend/controls/manufacturers/Administration',
});
columnModel.push({
- header : QUILocale.get('quiqqer/quiqqer', 'c_date'),
+ header : QUILocale.get('quiqqer/core', 'c_date'),
dataIndex: 'regdate',
dataType : 'date',
width : 150
diff --git a/bin/backend/controls/manufacturers/create/Manufacturer.js b/bin/backend/controls/manufacturers/create/Manufacturer.js
index ffcb2c25f7e6eb37e7b39853104eb217329eedd6..29802db12723699684fbe75ddbc6e1911b657b1a 100644
--- a/bin/backend/controls/manufacturers/create/Manufacturer.js
+++ b/bin/backend/controls/manufacturers/create/Manufacturer.js
@@ -76,15 +76,15 @@ define('package/quiqqer/erp/bin/backend/controls/manufacturers/create/Manufactur
manufacturerGroupsHeader : QUILocale.get(lg, lgPrefix + 'manufacturerGroupsHeader'),
manufacturerGroupsText : QUILocale.get(lg, lgPrefix + 'manufacturerGroupsText'),
- textAddressCompany : QUILocale.get('quiqqer/quiqqer', 'company'),
- textAddressSalutation: QUILocale.get('quiqqer/quiqqer', 'salutation'),
- textAddressFirstname : QUILocale.get('quiqqer/quiqqer', 'firstname'),
- textAddressLastname : QUILocale.get('quiqqer/quiqqer', 'lastname'),
- textAddressStreet : QUILocale.get('quiqqer/quiqqer', 'street'),
- textAddressZIP : QUILocale.get('quiqqer/quiqqer', 'zip'),
- textAddressCity : QUILocale.get('quiqqer/quiqqer', 'city'),
- textAddressCountry : QUILocale.get('quiqqer/quiqqer', 'country'),
- textAddressEmail : QUILocale.get('quiqqer/quiqqer', 'email'),
+ textAddressCompany : QUILocale.get('quiqqer/core', 'company'),
+ textAddressSalutation: QUILocale.get('quiqqer/core', 'salutation'),
+ textAddressFirstname : QUILocale.get('quiqqer/core', 'firstname'),
+ textAddressLastname : QUILocale.get('quiqqer/core', 'lastname'),
+ textAddressStreet : QUILocale.get('quiqqer/core', 'street'),
+ textAddressZIP : QUILocale.get('quiqqer/core', 'zip'),
+ textAddressCity : QUILocale.get('quiqqer/core', 'city'),
+ textAddressCountry : QUILocale.get('quiqqer/core', 'country'),
+ textAddressEmail : QUILocale.get('quiqqer/core', 'email'),
previousButton: QUILocale.get(lg, lgPrefix + 'previousButton'),
nextButton : QUILocale.get(lg, lgPrefix + 'nextButton')
diff --git a/bin/backend/controls/settings/CustomerRequestWindowSettings.js b/bin/backend/controls/settings/CustomerRequestWindowSettings.js
index 40cbe965ba6f4427a9dfdb70e00784c6a0604b16..0a1c89881dd8ee088b27a78e0fc90f94207b2cc6 100644
--- a/bin/backend/controls/settings/CustomerRequestWindowSettings.js
+++ b/bin/backend/controls/settings/CustomerRequestWindowSettings.js
@@ -65,7 +65,7 @@ define('package/quiqqer/erp/bin/backend/controls/settings/CustomerRequestWindowS
dataType : 'QUI',
width : 60
}, {
- header : QUILocale.get('quiqqer/quiqqer', 'id'),
+ header : QUILocale.get('quiqqer/core', 'id'),
dataIndex: 'id',
dataType : 'number',
width : 60
diff --git a/bin/backend/controls/userData/UserData.js b/bin/backend/controls/userData/UserData.js
index fe0fc14548eab8cc1bbbde6b679c2cb323b14220..e1b849eb833d5cfa1d2948837b12f092ca0714be 100644
--- a/bin/backend/controls/userData/UserData.js
+++ b/bin/backend/controls/userData/UserData.js
@@ -125,11 +125,11 @@ define('package/quiqqer/erp/bin/backend/controls/userData/UserData', [
html: Mustache.render(template, {
labelTitle: labelUser,
labelCustomer: labelUser,
- labelAddress: QUILocale.get('quiqqer/quiqqer', 'address'),
- labelCompany: QUILocale.get('quiqqer/quiqqer', 'company'),
- labelStreet: QUILocale.get('quiqqer/quiqqer', 'street'),
- labelZip: QUILocale.get('quiqqer/quiqqer', 'zip'),
- labelCity: QUILocale.get('quiqqer/quiqqer', 'city'),
+ labelAddress: QUILocale.get('quiqqer/core', 'address'),
+ labelCompany: QUILocale.get('quiqqer/core', 'company'),
+ labelStreet: QUILocale.get('quiqqer/core', 'street'),
+ labelZip: QUILocale.get('quiqqer/core', 'zip'),
+ labelCity: QUILocale.get('quiqqer/core', 'city'),
labelExtra: QUILocale.get(pkg, 'UserData.btn.extra'),
labelUserEdit: QUILocale.get(pkg, 'UserData.btn.userEdit', {labelUser}),
labelContactPerson: QUILocale.get(pkg, 'UserData.tpl.labelContactPerson'),
diff --git a/src/QUI/ERP/User.php b/src/QUI/ERP/User.php
index 7c4d3941a0e718c3461ffe6fb29a03b1f52929f1..b0555752ce51ba787c94c88e27ed90569451d516 100644
--- a/src/QUI/ERP/User.php
+++ b/src/QUI/ERP/User.php
@@ -324,12 +324,12 @@ public function getName(): string
switch ($salutation) {
case 'Herr':
case 'mr':
- $salutation = QUI::getLocale()->get('quiqqer/quiqqer', 'address.salutation.male');
+ $salutation = QUI::getLocale()->get('quiqqer/core', 'address.salutation.male');
break;
case 'Frau':
case 'mrs':
- $salutation = QUI::getLocale()->get('quiqqer/quiqqer', 'address.salutation.female');
+ $salutation = QUI::getLocale()->get('quiqqer/core', 'address.salutation.female');
break;
}
diff --git a/tests/QUI/Composer/Utils/ParserTest.php b/tests/QUI/Composer/Utils/ParserTest.php
index 5e1fe017c699b47c64cc7ddab17d2fc9abada521..a6ab9ce4c9c422dfdb660379cd00768c45c20d24 100644
--- a/tests/QUI/Composer/Utils/ParserTest.php
+++ b/tests/QUI/Composer/Utils/ParserTest.php
@@ -15,7 +15,7 @@ class ParserTest extends \PHPUnit\Framework\TestCase
*/
public function testRequire()
{
- $string = 'quiqqer/quiqqer dev-dev 0572859 dev-dev 5dcea72 A modular based management';
+ $string = 'quiqqer/core dev-dev 0572859 dev-dev 5dcea72 A modular based management';
$result = QUI\Composer\Utils\Parser::parsePackageLineToArray($string);
$this->assertArrayHasKey('package', $result);