Merge branch 'dev' into 'next'

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

See merge request !30

bin/backend/controls/Shipping.js

@@ -168,7 +168,7 @@ define('package/quiqqer/shipping/bin/backend/controls/Shipping', [
                 buttons    : [
                     {
                         name     : 'add',
-                        text     : QUILocale.get('quiqqer/quiqqer', 'add'),
+                        text     : QUILocale.get('quiqqer/core', 'add'),
                         textimage: 'fa fa-plus',
                         events   : {
                             onClick: this.$openCreateDialog
@@ -179,7 +179,7 @@ define('package/quiqqer/shipping/bin/backend/controls/Shipping', [
                     },
                     {
                         name     : 'edit',
-                        text     : QUILocale.get('quiqqer/quiqqer', 'edit'),
+                        text     : QUILocale.get('quiqqer/core', 'edit'),
                         textimage: 'fa fa-edit',
                         disabled : true,
                         events   : {

bin/backend/controls/ShippingEntry.List.js

@@ -125,7 +125,7 @@ define('package/quiqqer/shipping/bin/backend/controls/ShippingEntry.List', [
                 pagination : false,
                 buttons    : [{
                     name     : 'add',
-                    text     : QUILocale.get('quiqqer/quiqqer', 'add'),
+                    text     : QUILocale.get('quiqqer/core', 'add'),
                     textimage: 'fa fa-plus',
                     events   : {
                         onClick: this.$openAddDialog

bin/backend/controls/ShippingEntry.js

@@ -76,8 +76,8 @@ define('package/quiqqer/shipping/bin/backend/controls/ShippingEntry', [
         $onCreate: function () {
             this.addButton({
                 name     : 'save',
-                title    : QUILocale.get('quiqqer/quiqqer', 'save'),
-                text     : QUILocale.get('quiqqer/quiqqer', 'save'),
+                title    : QUILocale.get('quiqqer/core', 'save'),
+                text     : QUILocale.get('quiqqer/core', 'save'),
                 textimage: 'fa fa-save',
                 events   : {
                     onClick: this.save
@@ -90,8 +90,8 @@ define('package/quiqqer/shipping/bin/backend/controls/ShippingEntry', [
 
             this.addButton({
                 name     : 'status',
-                text     : QUILocale.get('quiqqer/quiqqer', 'deactivate'),
-                title    : QUILocale.get('quiqqer/quiqqer', 'deactivate'),
+                text     : QUILocale.get('quiqqer/core', 'deactivate'),
+                title    : QUILocale.get('quiqqer/core', 'deactivate'),
                 textimage: 'fa fa-remove',
                 disabled : true,
                 events   : {
@@ -180,12 +180,12 @@ define('package/quiqqer/shipping/bin/backend/controls/ShippingEntry', [
                 Status = this.getButtons('status');
 
             if (status) {
-                Status.setAttribute('text', QUILocale.get('quiqqer/quiqqer', 'deactivate'));
-                Status.setAttribute('title', QUILocale.get('quiqqer/quiqqer', 'deactivate'));
+                Status.setAttribute('text', QUILocale.get('quiqqer/core', 'deactivate'));
+                Status.setAttribute('title', QUILocale.get('quiqqer/core', 'deactivate'));
                 Status.setAttribute('textimage', 'fa fa-remove');
             } else {
-                Status.setAttribute('text', QUILocale.get('quiqqer/quiqqer', 'activate'));
-                Status.setAttribute('title', QUILocale.get('quiqqer/quiqqer', 'activate'));
+                Status.setAttribute('text', QUILocale.get('quiqqer/core', 'activate'));
+                Status.setAttribute('title', QUILocale.get('quiqqer/core', 'activate'));
                 Status.setAttribute('textimage', 'fa fa-check');
             }
 

bin/backend/controls/settings/ShippingStatus.js

@@ -289,7 +289,7 @@ define('package/quiqqer/shipping/bin/backend/controls/settings/ShippingStatus',
                 maxWidth : 600,
                 autoclose: false,
                 ok_button: {
-                    text     : QUILocale.get('quiqqer/quiqqer', 'edit'),
+                    text     : QUILocale.get('quiqqer/core', 'edit'),
                     textimage: 'fa fa-edit'
                 },
                 events   : {
@@ -384,7 +384,7 @@ define('package/quiqqer/shipping/bin/backend/controls/settings/ShippingStatus',
                 maxWidth   : 600,
                 autoclose  : false,
                 ok_button  : {
-                    text     : QUILocale.get('quiqqer/quiqqer', 'remove'),
+                    text     : QUILocale.get('quiqqer/core', 'remove'),
                     textimage: 'fa fa-trash'
                 },
                 events     : {

bin/backend/controls/shippingRules/ShippingRuleList.js

@@ -92,7 +92,7 @@ define('package/quiqqer/shipping/bin/backend/controls/shippingRules/ShippingRule
                 serverSort       : true,
                 buttons          : [{
                     name     : 'create',
-                    text     : QUILocale.get('quiqqer/quiqqer', 'create'),
+                    text     : QUILocale.get('quiqqer/core', 'create'),
                     textimage: 'fa fa-plus',
                     events   : {
                         onClick: this.$openCreateDialog