Merge pull request #5357 in SW/shopware from sw-19742/5.3/fix-cronjob…

…-interval-combo-snippets to 5.3 * commit '8258c6de62b6cfe0bca1bbdf5174d6900ef7bfd3': SW-19742 - Fixed cronjob combobox interval preset snippets Fixed seconds typo on 12 hours interval
jhit · Aug 30, 2017 · f16f9bb · f16f9bb
2 parents 9b59020 + 8258c6d
commit f16f9bb
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/snippets/backend/config/view/main.ini b/snippets/backend/config/view/main.ini
@@ -7,7 +7,8 @@ element/interval/1_day = "1 day (86400 sec.)"
 element/interval/1_hour = "1 hour (3600 sec.)"
 element/interval/1_week = "1 week (604800 sec.)"
 element/interval/10_minutes = "10 minutes (600 sec.)"
-element/interval/12_hours = "12 hours (28800 sec.)"
+element/interval/12_hours = "12 hours (43200 sec.)"
+element/interval/8_hours = "8 hours (28800 sec.)"
 element/interval/15_minutes = "15 minutes (900 sec.)"
 element/interval/2_days = "2 days (172800 sec.)"
 element/interval/2_hours = "2 hours (7200 sec.)"
@@ -41,7 +42,8 @@ element/interval/1_day = "1 Tag (86400 Sek.)"
 element/interval/1_hour = "1 Stunde (3600 Sek.)"
 element/interval/1_week = "1 Woche (604800 Sek.)"
 element/interval/10_minutes = "10 Minuten (600 Sek.)"
-element/interval/12_hours = "12 Stunden (28800 Sek.)"
+element/interval/8_hours = "8 Stunden (28800 Sek.)"
+element/interval/12_hours = "12 Stunden (43200 Sek.)"
 element/interval/15_minutes = "15 Minuten (900 Sek.)"
 element/interval/2_days = "2 Tage (172800 Sek.)"
 element/interval/2_hours = "2 Stunden (7200 Sek.)"
@@ -64,4 +66,4 @@ table/add_tooltip = "Hinzufügen"
 table/delete_text = "Löschen"
 table/delete_tooltip = "Löschen"
 window/title = "Grundeinstellungen"
-window/title_template = "Grundeinstellungen - [label]"
+window/title_template = "Grundeinstellungen - [label]"
diff --git a/themes/Backend/ExtJs/backend/base/component/element/interval.js b/themes/Backend/ExtJs/backend/base/component/element/interval.js
@@ -48,7 +48,8 @@ Ext.define('Shopware.apps.Base.view.element.Interval', {
         [3600, '{s name=element/interval/1_hour}1 Hour (3600 Sec.){/s}'],
         [7200, '{s name=element/interval/2_hours}2 Hours (7200 Sec.){/s}'],
         [14400, '{s name=element/interval/4_hours}4 Hours (14400 Sec.){/s}'],
-        [28800, '{s name=element/interval/12_hours}12 Hours (28800 Sec.){/s}'],
+        [28800, '{s name=element/interval/8_hours}8 Hours (28800 Sec.){/s}'],
+        [43200, '{s name=element/interval/12_hours}12 Hours (43200 Sec.){/s}'],
         [86400, '{s name=element/interval/1_day}1 Day (86400 Sec.){/s}'],
         [172800, '{s name=element/interval/2_days}2 Days (172800 Sec.){/s}'],
         [604800, '{s name=element/interval/1_week}1 Week (604800 Sec.){/s}']

diff --git a/themes/Backend/ExtJs/backend/config/view/element/interval.js b/themes/Backend/ExtJs/backend/config/view/element/interval.js
@@ -47,7 +47,8 @@ Ext.define('Shopware.apps.Config.view.element.Interval', {
         [3600, '{s name=element/interval/1_hour}1 Hour (3600 Sec.){/s}'],
         [7200, '{s name=element/interval/2_hours}2 Hours (7200 Sec.){/s}'],
         [14400, '{s name=element/interval/4_hours}4 Hours (14400 Sec.){/s}'],
-        [28800, '{s name=element/interval/12_hours}12 Hours (28800 Sec.){/s}'],
+        [28800, '{s name=element/interval/8_hours}8 Hours (28800 Sec.){/s}'],
+        [43200, '{s name=element/interval/12_hours}12 Hours (43200 Sec.){/s}'],
         [86400, '{s name=element/interval/1_day}1 Day (86400 Sec.){/s}'],
         [172800, '{s name=element/interval/2_days}2 Days (172800 Sec.){/s}'],
         [604800, '{s name=element/interval/1_week}1 Week (604800 Sec.){/s}']