Merge pull request #131 from joshschmelzle/main

Order reg dom screen by alphabet after US
WLAN-Pi · Dec 16, 2024 · f4d1b7f · f4d1b7f
2 parents 1fa36ef + c533dd8
commit f4d1b7f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/debian/changelog b/debian/changelog
@@ -1,6 +1,6 @@
-wlanpi-fpms (1.4.7) unstable; urgency=medium
+wlanpi-fpms (1.4.7-1) unstable; urgency=medium
 
-  * Add NO as regdom choice
+  * Add Norway (NO) as RF domain choice
 
   -- Josh Schmelzle <[email protected]>  Mon, 16 Dec 2024 11:32:51 -0500
 

diff --git a/fpms/fpms.py b/fpms/fpms.py
@@ -838,20 +838,20 @@ def create_shortcut(menu, path, location=[]):
                     {"name": "Show Domain", "action": show_reg_domain},
                     {"name": "Set Domain US", "action": [
                         {"name": "Confirm & Reboot", "action": set_reg_domain_us},]},
-                    {"name": "Set Domain CA", "action": [
-                        {"name": "Confirm & Reboot", "action": set_reg_domain_ca},]},
-                    {"name": "Set Domain GB", "action": [
-                        {"name": "Confirm & Reboot", "action": set_reg_domain_gb},]},
                     {"name": "Set Domain BR", "action": [
                         {"name": "Confirm & Reboot", "action": set_reg_domain_br},]},
-                    {"name": "Set Domain FR", "action": [
-                        {"name": "Confirm & Reboot", "action": set_reg_domain_fr},]},
+                    {"name": "Set Domain CA", "action": [
+                        {"name": "Confirm & Reboot", "action": set_reg_domain_ca},]},
                     {"name": "Set Domain CZ", "action": [
                         {"name": "Confirm & Reboot", "action": set_reg_domain_cz},]},
-                    {"name": "Set Domain NL", "action": [
-                        {"name": "Confirm & Reboot", "action": set_reg_domain_nl},]},
                     {"name": "Set Domain DE", "action": [
                         {"name": "Confirm & Reboot", "action": set_reg_domain_de},]},
+                    {"name": "Set Domain FR", "action": [
+                        {"name": "Confirm & Reboot", "action": set_reg_domain_fr},]},
+                    {"name": "Set Domain GB", "action": [
+                        {"name": "Confirm & Reboot", "action": set_reg_domain_gb},]},
+                    {"name": "Set Domain NL", "action": [
+                        {"name": "Confirm & Reboot", "action": set_reg_domain_nl},]},
                     {"name": "Set Domain NO", "action": [
                         {"name": "Confirm & Reboot", "action": set_reg_domain_no},]},
                 ]},

diff --git a/fpms/modules/reg_domain.py b/fpms/modules/reg_domain.py
@@ -30,7 +30,7 @@ def show_reg_domain(self, g_vars):
             self.alert_obj.display_alert_error(g_vars, 'Failed to get domain or no domain configured')
             g_vars['display_state'] = 'menu'
             return
-        output[0] = 'Domain: ' + output[0]
+        output[0] = 'RF Domain: ' + output[0]
         self.paged_table_obj.display_list_as_paged_table(g_vars, output, title="Show Domain")
         g_vars['display_state'] = 'page'