From 9fe3c9fc8b7a507265e7be58a3fe1e25581f93c4 Mon Sep 17 00:00:00 2001
From: Arthur <worldnomad@gmail.com>
Date: Thu, 23 May 2024 12:46:07 -0700
Subject: [PATCH 1/3] 16202 fix mapit button for internationalized decimal
 seperator

---
 netbox/templates/dcim/device.html        | 2 +-
 netbox/templates/dcim/site.html          | 2 +-
 netbox/utilities/templatetags/helpers.py | 9 +++++++++
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/netbox/templates/dcim/device.html b/netbox/templates/dcim/device.html
index bf53ef0022c..e814c4bdd52 100644
--- a/netbox/templates/dcim/device.html
+++ b/netbox/templates/dcim/device.html
@@ -63,7 +63,7 @@ <h5 class="card-header">{% trans "Device" %}</h5>
                         {% if object.latitude and object.longitude %}
                           {% if config.MAPS_URL %}
                             <div class="position-absolute top-50 end-0 translate-middle-y d-print-none">
-                              <a href="{{ config.MAPS_URL }}{{ object.latitude }},{{ object.longitude }}" target="_blank" class="btn btn-primary">
+                              <a href="{{ config.MAPS_URL }}{{ object.latitude|untranslate_decimal_separator }},{{ object.longitude|untranslate_decimal_separator }}" target="_blank" class="btn btn-primary">
                                 <i class="mdi mdi-map-marker"></i> {% trans "Map It" %}
                               </a>
                             </div>
diff --git a/netbox/templates/dcim/site.html b/netbox/templates/dcim/site.html
index d3a44f3ac5a..7b986283f6f 100644
--- a/netbox/templates/dcim/site.html
+++ b/netbox/templates/dcim/site.html
@@ -95,7 +95,7 @@ <h5 class="card-header">{% trans "Site" %}</h5>
             {% if object.latitude and object.longitude %}
               {% if config.MAPS_URL %}
                 <div class="position-absolute top-50 end-0 translate-middle-y d-print-none">
-                  <a href="{{ config.MAPS_URL }}{{ object.latitude }},{{ object.longitude }}" target="_blank" class="btn btn-primary">
+                  <a href="{{ config.MAPS_URL }}{{ object.latitude|untranslate_decimal_separator }},{{ object.longitude|untranslate_decimal_separator }}" target="_blank" class="btn btn-primary">
                     <i class="mdi mdi-map-marker"></i> {% trans "Map It" %}
                   </a>
                 </div>
diff --git a/netbox/utilities/templatetags/helpers.py b/netbox/utilities/templatetags/helpers.py
index e8686f8c6c6..505ee41fef6 100644
--- a/netbox/utilities/templatetags/helpers.py
+++ b/netbox/utilities/templatetags/helpers.py
@@ -8,7 +8,9 @@
 from django.template.defaultfilters import date
 from django.urls import NoReverseMatch, reverse
 from django.utils import timezone
+from django.utils.formats import get_format
 from django.utils.safestring import mark_safe
+from django.utils.translation import get_language
 
 from core.models import ObjectType
 from utilities.forms import get_selected_values, TableConfigForm
@@ -30,6 +32,7 @@
     'startswith',
     'status_from_tag',
     'table_config_form',
+    'untranslate_decimal_separator',
     'utilization_graph',
     'validated_viewname',
     'viewname',
@@ -301,3 +304,9 @@ def applied_filters(context, model, form, query_params):
         'applied_filters': applied_filters,
         'save_link': save_link,
     }
+
+
+@register.filter()
+def untranslate_decimal_separator(number: str):
+    decimal_seperator = get_format('DECIMAL_SEPARATOR', get_language())
+    return str(number).replace(decimal_seperator, ".")

From 054362ec01642328698c76592c6b71e73e003abb Mon Sep 17 00:00:00 2001
From: Arthur <worldnomad@gmail.com>
Date: Tue, 28 May 2024 09:26:43 -0700
Subject: [PATCH 2/3] 16202 revert untranslate

---
 netbox/utilities/templatetags/helpers.py | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/netbox/utilities/templatetags/helpers.py b/netbox/utilities/templatetags/helpers.py
index 505ee41fef6..e8686f8c6c6 100644
--- a/netbox/utilities/templatetags/helpers.py
+++ b/netbox/utilities/templatetags/helpers.py
@@ -8,9 +8,7 @@
 from django.template.defaultfilters import date
 from django.urls import NoReverseMatch, reverse
 from django.utils import timezone
-from django.utils.formats import get_format
 from django.utils.safestring import mark_safe
-from django.utils.translation import get_language
 
 from core.models import ObjectType
 from utilities.forms import get_selected_values, TableConfigForm
@@ -32,7 +30,6 @@
     'startswith',
     'status_from_tag',
     'table_config_form',
-    'untranslate_decimal_separator',
     'utilization_graph',
     'validated_viewname',
     'viewname',
@@ -304,9 +301,3 @@ def applied_filters(context, model, form, query_params):
         'applied_filters': applied_filters,
         'save_link': save_link,
     }
-
-
-@register.filter()
-def untranslate_decimal_separator(number: str):
-    decimal_seperator = get_format('DECIMAL_SEPARATOR', get_language())
-    return str(number).replace(decimal_seperator, ".")

From d50057b36f2dedb76a0ebecafde415836f14da58 Mon Sep 17 00:00:00 2001
From: Arthur <worldnomad@gmail.com>
Date: Tue, 28 May 2024 09:32:02 -0700
Subject: [PATCH 3/3] 16202 revert untranslate

---
 netbox/templates/dcim/device.html | 3 ++-
 netbox/templates/dcim/site.html   | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/netbox/templates/dcim/device.html b/netbox/templates/dcim/device.html
index e814c4bdd52..12ba4a8d46c 100644
--- a/netbox/templates/dcim/device.html
+++ b/netbox/templates/dcim/device.html
@@ -5,6 +5,7 @@
 {% load helpers %}
 {% load plugins %}
 {% load i18n %}
+{% load l10n %}
 {% load mptt %}
 
 {% block content %}
@@ -63,7 +64,7 @@ <h5 class="card-header">{% trans "Device" %}</h5>
                         {% if object.latitude and object.longitude %}
                           {% if config.MAPS_URL %}
                             <div class="position-absolute top-50 end-0 translate-middle-y d-print-none">
-                              <a href="{{ config.MAPS_URL }}{{ object.latitude|untranslate_decimal_separator }},{{ object.longitude|untranslate_decimal_separator }}" target="_blank" class="btn btn-primary">
+                              <a href="{{ config.MAPS_URL }}{{ object.latitude|unlocalize }},{{ object.longitude|unlocalize }}" target="_blank" class="btn btn-primary">
                                 <i class="mdi mdi-map-marker"></i> {% trans "Map It" %}
                               </a>
                             </div>
diff --git a/netbox/templates/dcim/site.html b/netbox/templates/dcim/site.html
index 7b986283f6f..1ad0a75ae57 100644
--- a/netbox/templates/dcim/site.html
+++ b/netbox/templates/dcim/site.html
@@ -3,6 +3,7 @@
 {% load plugins %}
 {% load tz %}
 {% load i18n %}
+{% load l10n %}
 {% load mptt %}
 
 {% block breadcrumbs %}
@@ -95,7 +96,7 @@ <h5 class="card-header">{% trans "Site" %}</h5>
             {% if object.latitude and object.longitude %}
               {% if config.MAPS_URL %}
                 <div class="position-absolute top-50 end-0 translate-middle-y d-print-none">
-                  <a href="{{ config.MAPS_URL }}{{ object.latitude|untranslate_decimal_separator }},{{ object.longitude|untranslate_decimal_separator }}" target="_blank" class="btn btn-primary">
+                  <a href="{{ config.MAPS_URL }}{{ object.latitude|unlocalize }},{{ object.longitude|unlocalize }}" target="_blank" class="btn btn-primary">
                     <i class="mdi mdi-map-marker"></i> {% trans "Map It" %}
                   </a>
                 </div>