Merge pull request #143 from ppfeufer/dt-filter-translation

[CHANGE] Move datatable filter translation to their own object
ppfeufer · Dec 15, 2024 · c4c2ee5 · c4c2ee5
2 parents 811a710 + 615b264
commit c4c2ee5
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 20 deletions.
diff --git a/sovtimer/static/sovtimer/js/aa-sov-timer.js b/sovtimer/static/sovtimer/js/aa-sov-timer.js
@@ -195,27 +195,27 @@ $(document).ready(() => {
             columns: [
                 {
                     idx: 0,
-                    title: sovtimerSettings.translations.type
+                    title: sovtimerSettings.translation.dtFilter.type
                 },
                 {
                     idx: 10,
-                    title: sovtimerSettings.translations.system
+                    title: sovtimerSettings.translation.dtFilter.system
                 },
                 {
                     idx: 11,
-                    title: sovtimerSettings.translations.constellation
+                    title: sovtimerSettings.translation.dtFilter.constellation
                 },
                 {
                     idx: 12,
-                    title: sovtimerSettings.translations.region
+                    title: sovtimerSettings.translation.dtFilter.region
                 },
                 {
                     idx: 13,
-                    title: sovtimerSettings.translations.owner
+                    title: sovtimerSettings.translation.dtFilter.owner
                 },
                 {
                     idx: 14,
-                    title: sovtimerSettings.translations.activeCampaign
+                    title: sovtimerSettings.translation.dtFilter.activeCampaign
                 }
             ],
             autoSize: false,
@@ -230,7 +230,7 @@ $(document).ready(() => {
             elementTimerTotal.html(newTotal);
 
             // Upcoming timer (< 4 hrs)
-            if (data.active_campaign === sovtimerSettings.translations.no && data.remaining_time_in_seconds <= 14400) {
+            if (data.active_campaign === sovtimerSettings.translation.no && data.remaining_time_in_seconds <= 14400) {
                 $(row).addClass('aa-sovtimer-upcoming-campaign');
 
                 const currentUpcoming = elementTimerUpcoming.html();
@@ -240,7 +240,7 @@ $(document).ready(() => {
             }
 
             // Active timer
-            if (data.active_campaign === sovtimerSettings.translations.yes) {
+            if (data.active_campaign === sovtimerSettings.translation.yes) {
                 $(row).addClass('aa-sovtimer-active-campaign');
 
                 const currentActive = elementTimerActive.html();
@@ -269,15 +269,15 @@ $(document).ready(() => {
                 elementTimerTotal.html(newTotal);
 
                 // Upcoming timer (< 4 hrs)
-                if (item.active_campaign === sovtimerSettings.translations.no && item.remaining_time_in_seconds <= 14400) {
+                if (item.active_campaign === sovtimerSettings.translation.no && item.remaining_time_in_seconds <= 14400) {
                     const currentUpcoming = elementTimerUpcoming.html();
                     const newUpcoming = parseInt(currentUpcoming) + 1;
 
                     elementTimerUpcoming.html(newUpcoming);
                 }
 
                 // Active timer
-                if (item.active_campaign === sovtimerSettings.translations.yes) {
+                if (item.active_campaign === sovtimerSettings.translation.yes) {
                     const currentActive = elementTimerActive.html();
                     const newActive = parseInt(currentActive) + 1;
 

diff --git a/sovtimer/static/sovtimer/js/aa-sov-timer.min.js b/sovtimer/static/sovtimer/js/aa-sov-timer.min.js
diff --git a/sovtimer/static/sovtimer/js/aa-sov-timer.min.js.map b/sovtimer/static/sovtimer/js/aa-sov-timer.min.js.map
diff --git a/sovtimer/templates/sovtimer/bundles/aa-sov-timer-js.html b/sovtimer/templates/sovtimer/bundles/aa-sov-timer-js.html
@@ -2,6 +2,6 @@
 
 <script
     src="{% sovtimer_static 'sovtimer/js/aa-sov-timer.min.js' %}"
-    integrity="sha512-ATmV3LTL1l1166udZymAJZNsEGTmFBzHTNtyTpcFJ/ALPhBYnR5e1mG5QMXKb81YGo4CFJv+lnaF7YROdv7y4g=="
+    integrity="sha512-GslpIiyNkB5FdYA0DEutpKORe2iBn16tSZeKGeL3c8Di4wpLKNhQ32xfj6EQRW2TpJ1HnFUqgOX0fYInkMEwWA="
     crossorigin="anonymous"
 ></script>
diff --git a/sovtimer/templates/sovtimer/dashboard.html b/sovtimer/templates/sovtimer/dashboard.html
@@ -18,15 +18,17 @@
                 ajaxUpdate: '{% url "sovtimer:dashboard_data" %}'
             },
             dateformat: 'YYYY-MM-DD HH:mm:ss',
-            translations: {
-                system: '{% translate "System" %}',
-                constellation: '{% translate "Constellation" %}',
-                region: '{% translate "Region" %}',
-                owner: '{% translate "Owner / Defender" %}',
-                activeCampaign: '{% translate "Active campaign" %}',
+            translation: {
+                dtFilter: {
+                    type: '{% translate "Type" %}',
+                    system: '{% translate "System" %}',
+                    constellation: '{% translate "Constellation" %}',
+                    region: '{% translate "Region" %}',
+                    owner: '{% translate "Owner / Defender" %}',
+                    activeCampaign: '{% translate "Active campaign" %}',
+                },
                 yes: '{% translate "Yes" %}',
                 no: '{% translate "No" %}',
-                type: '{% translate "Type" %}',
             }
         };
     </script>