From aa21541ab08cd9b6562441953a73be388f199caa Mon Sep 17 00:00:00 2001
From: luckman212 <luke.hamburg@gmail.com>
Date: Tue, 18 Sep 2018 13:46:30 -0400
Subject: [PATCH 1/2] small fix to hide the "Drag to Change Order" text if
 roworderdragging is disabled

---
 src/usr/local/www/firewall_rules.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/usr/local/www/firewall_rules.php b/src/usr/local/www/firewall_rules.php
index 4e716940bdc..8d85750250d 100644
--- a/src/usr/local/www/firewall_rules.php
+++ b/src/usr/local/www/firewall_rules.php
@@ -347,7 +347,7 @@ function delete_nat_association($id) {
 <form method="post">
 	<input name="if" id="if" type="hidden" value="<?=$if?>" />
 	<div class="panel panel-default">
-		<div class="panel-heading"><h2 class="panel-title"><?=gettext("Rules (Drag to Change Order)")?></h2></div>
+		<div class="panel-heading"><h2 class="panel-title"><?=gettext("Rules" . (!isset($config['system']['webgui']['roworderdragging']) ? print(" (Drag to Change Order)") : ''))?></h2></div>
 		<div id="mainarea" class="table-responsive panel-body">
 			<table id="ruletable" class="table table-hover table-striped table-condensed" style="overflow-x: 'visible'">
 				<thead>

From d762652957858f853c2f3c6565fd640013b2b0a8 Mon Sep 17 00:00:00 2001
From: luckman212 <luke.hamburg@gmail.com>
Date: Wed, 19 Sep 2018 00:49:09 -0400
Subject: [PATCH 2/2] fixes gettext issue with non-English lang

---
 src/usr/local/www/firewall_rules.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/usr/local/www/firewall_rules.php b/src/usr/local/www/firewall_rules.php
index 8d85750250d..b9a7aa9f96e 100644
--- a/src/usr/local/www/firewall_rules.php
+++ b/src/usr/local/www/firewall_rules.php
@@ -328,6 +328,12 @@ function delete_nat_association($id) {
 	$showblockbogons = true;
 }
 
+if (isset($config['system']['webgui']['roworderdragging'])) {
+	$rules_header_text = 'Rules';
+} else {
+	$rules_header_text = 'Rules (Drag to Change Order)';
+}
+
 /* Load the counter data of each pf rule. */
 $rulescnt = pfSense_get_pf_rules();
 
@@ -347,7 +353,7 @@ function delete_nat_association($id) {
 <form method="post">
 	<input name="if" id="if" type="hidden" value="<?=$if?>" />
 	<div class="panel panel-default">
-		<div class="panel-heading"><h2 class="panel-title"><?=gettext("Rules" . (!isset($config['system']['webgui']['roworderdragging']) ? print(" (Drag to Change Order)") : ''))?></h2></div>
+		<div class="panel-heading"><h2 class="panel-title"><?=gettext($rules_header_text)?></h2></div>
 		<div id="mainarea" class="table-responsive panel-body">
 			<table id="ruletable" class="table table-hover table-striped table-condensed" style="overflow-x: 'visible'">
 				<thead>