Merge branch 'ntr/5.6/minor-release-fixes' into '5.6'

Ntr/5.6/minor release fixes

See merge request shopware/5/product/shopware!9

Author: shyim

UPGRADE-5.6.md

@@ -22,6 +22,7 @@ This changelog references changes done in Shopware 5.6 patch versions.
     * `city`
     * `country`
     * `state`
+* Added `db.timezone` section to `config.php` to configure a custom timezone for the database connection
 
 ### Changes
 

engine/Shopware/Controllers/Backend/Systeminfo.php

@@ -127,8 +127,19 @@ public function getTimezoneAction()
     {
         $offset = 0;
         try {
+            $sql = <<<'SQL'
+                SELECT timeZones.timeZone
+                FROM (
+                    SELECT @@SESSION.time_zone AS timeZone
+                    UNION
+                    SELECT @@system_time_zone AS timeZone
+                ) AS timeZones
+                WHERE timeZone != 'SYSTEM'
+                LIMIT 1
+SQL;
+
             $timezone = $this->container->get('dbal_connection')
-                ->query('SELECT @@SESSION.time_zone;')
+                ->query($sql)
                 ->fetchColumn();
 
             if (in_array($timezone[0], ['-', '+'], true)) {

snippets/backend/category/main.ini

@@ -29,7 +29,7 @@ tabs/restrict_category/title = "Restrict category"
 tabs/restriction/button_add = "Add"
 tabs/restriction/button_remove = "Remove"
 tabs/settings_title = "Settings"
-tree/delete_confirmation = "Are you sure you want to delete category: [0] and all its subcategories?. There are [1] item(s) assigned to this category."
+tree/delete_confirmation = "Are you sure you want to delete category: [0] and all its subcategories?"
 tree/delete_confirmation_headline = "Delete this category?"
 tree/delete_confirmation_title = "Are you sure you want to delete the category?"
 tree/delete_failure = "Category could not be deleted."

themes/Backend/ExtJs/backend/category/controller/tree.js

@@ -68,7 +68,7 @@ Ext.define('Shopware.apps.Category.controller.Tree', {
         moveCategorySuccess : '{s name=tree/move_success}Category has been moved.{/s}',
         moveCategoryFailure : '{s name=tree/move_failure}Category could not be moved.{/s}',
         confirmDeleteCategoryTitle   : '{s name=tree/delete_confirmation_title}Are you sure you want to delete the category?{/s}',
-        confirmDeleteCategory : '{s name=tree/delete_confirmation}Are you sure you want to delete category: [0] and all its sub categories?.{/s}',
+        confirmDeleteCategory : '{s name=tree/delete_confirmation}Are you sure you want to delete category: [0] and all its subcategories?{/s}',
         confirmDeleteCategoryHeadline: '{s name=tree/delete_confirmation_headline}Delete this Category?{/s}',
         deleteSingleItemSuccess : '{s name=tree/delete_success}Category has been deleted.{/s}',
         deleteSingleItemFailure : '{s name=tree/delete_failure}Category could not be deleted.{/s}',