Merge pull request #259 from ppfeufer/datatable-localization

[CHANGE] Improve Datatables localization
ppfeufer · Mar 8, 2025 · ebf4f99 · ebf4f99
2 parents ce44447 + 315ea47
commit ebf4f99
Show file tree

Hide file tree

Showing 13 changed files with 46 additions and 59 deletions.
diff --git a/.flake8 b/.flake8
@@ -1,6 +1,6 @@
 [flake8]
 exclude = .git, *migrations*, .tox, dist, htmlcov
 extend-ignore = E203, E266, E501, W503
-max-line-length = 888
+max-line-length = 88
 max-complexity = 18
 select = B,C,E,F,W,T4,B9
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -35,6 +35,10 @@ Section Order:
 ### Security
 -->
 
+### Changed
+
+- Improve Datatables localization
+
 ## [2.6.0] - 2025-02-02
 
 ### Changed

diff --git a/Makefile b/Makefile
@@ -64,7 +64,7 @@ prepare-release: graph_models pot
 #			fi; \
 #		done; \
 #	fi;
-	echo "Updated version in $(TEXT_BOLD)$(package)/__init__.py$(TEXT_BOLD_END)"
+	@echo "Updated version in $(TEXT_BOLD)$(package)/__init__.py$(TEXT_BOLD_END)"
 
 # Help
 .PHONY: help

diff --git a/aasrp/static/aasrp/javascript/my-srp-requests.js b/aasrp/static/aasrp/javascript/my-srp-requests.js
@@ -11,7 +11,7 @@ $(document).ready(() => {
     let userSrpAmount = 0;
 
     const tableUserSrpRequests = elementTableUserSrpRequests.DataTable({
-        language: aaSrpSettings.dataTable.translation,
+        language: aaSrpSettings.dataTable.language,
         ajax: {
             url: aaSrpSettings.url.userSrpRequests,
             dataSrc: '',
@@ -26,8 +26,15 @@ $(document).ready(() => {
                  * @param data
                  * @returns {*}
                  */
-                render: (data) => {
-                    return moment(data).utc().format(aaSrpSettings.datetimeFormat);
+                render: {
+                    _: (data) => {
+                        return data === null ? '' : moment(data).utc().format(
+                            aaSrpSettings.datetimeFormat
+                        );
+                    },
+                    sort: (data) => {
+                        return data === null ? '' : data;
+                    }
                 },
                 className: 'srp-request-time'
             },

diff --git a/aasrp/static/aasrp/javascript/my-srp-requests.min.js b/aasrp/static/aasrp/javascript/my-srp-requests.min.js
diff --git a/aasrp/static/aasrp/javascript/my-srp-requests.min.js.map b/aasrp/static/aasrp/javascript/my-srp-requests.min.js.map
diff --git a/aasrp/static/aasrp/javascript/srp-links.js b/aasrp/static/aasrp/javascript/srp-links.js
@@ -11,7 +11,7 @@ $(document).ready(() => {
     let totalSrpAmount = 0;
 
     const tableSrpLinks = elementTableSrpLinks.DataTable({
-        language: aaSrpSettings.dataTable.translation,
+        language: aaSrpSettings.dataTable.language,
         ajax: {
             url: aaSrpSettings.url.availableSrpLinks,
             dataSrc: '',
@@ -34,8 +34,15 @@ $(document).ready(() => {
                  * @param data
                  * @returns {*}
                  */
-                render: (data) => {
-                    return moment(data).utc().format(aaSrpSettings.datetimeFormat);
+                render: {
+                    _: (data) => {
+                        return data === null ? '' : moment(data).utc().format(
+                            aaSrpSettings.datetimeFormat
+                        );
+                    },
+                    sort: (data) => {
+                        return data === null ? '' : data;
+                    }
                 },
                 className: 'srp-link-fleet-time'
             },

diff --git a/aasrp/static/aasrp/javascript/srp-links.min.js b/aasrp/static/aasrp/javascript/srp-links.min.js