From fe1ba5c5382c78853617e7b431bf865c32d89ca6 Mon Sep 17 00:00:00 2001
From: Phil Davis <phil.davis@world.inf.org>
Date: Sat, 23 Jun 2012 19:27:23 +0545
Subject: error_default_language should contain just the language code (like
 'en' 'fr'), not the whole path to the dir.

---
 config/squid-reverse/squid.inc | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/config/squid-reverse/squid.inc b/config/squid-reverse/squid.inc
index 9bedac86..c1a29ae6 100644
--- a/config/squid-reverse/squid.inc
+++ b/config/squid-reverse/squid.inc
@@ -747,7 +747,6 @@ function squid_resync_general() {
 
 	$pidfile = "{$g['varrun_path']}/squid.pid";
 	$language = ($settings['error_language'] ? $settings['error_language'] : 'en');
-	$errordir = SQUID_CONFBASE . '/errors/' . $language;
 	$icondir = SQUID_CONFBASE . '/icons';
 	$hostname = ($settings['visible_hostname'] ? $settings['visible_hostname'] : 'localhost');
 	$email = ($settings['admin_email'] ? $settings['admin_email'] : 'admin@localhost');
@@ -763,7 +762,7 @@ icp_port $icp_port
 pid_filename $pidfile
 cache_effective_user proxy
 cache_effective_group proxy
-error_default_language $errordir
+error_default_language $language
 icon_directory $icondir
 visible_hostname $hostname
 cache_mgr $email
-- 
cgit v1.2.3


From 20850d45dee464c5dce53a45d7f2fdf06addfba2 Mon Sep 17 00:00:00 2001
From: Phil Davis <phil.davis@world.inf.org>
Date: Sat, 23 Jun 2012 19:53:11 +0545
Subject: Minor typo and grammar - hopefully Marcello will receive lots of
 donations for his great work :)

---
 config/dansguardian/dansguardian_about.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/config/dansguardian/dansguardian_about.php b/config/dansguardian/dansguardian_about.php
index 49359472..e678ede7 100755
--- a/config/dansguardian/dansguardian_about.php
+++ b/config/dansguardian/dansguardian_about.php
@@ -1,6 +1,6 @@
 <?php
 /*
-	mailscanner_about.php
+	dansguardian_about.php
 	part of pfSense (http://www.pfsense.com/)
 	Copyright (C) 2011 Marcello Coutinho <marcellocoutinho@gmail.com>
 	All rights reserved.
@@ -96,9 +96,9 @@ include("head.inc");
                         <td width="78%" class="vtable"><?=gettext("Package Created by <a target=_new href='http://forum.pfsense.org/index.php?action=profile;u=4710'>Marcello Coutinho</a><br><br>");?></td>
                         </tr>
 						<tr>
-                        <td width="22%" valign="top" class="vncell"><?=gettext("Donatios ");?></td>
-                        <td width="78%" class="vtable"><?=gettext("If you like this package, please <a target=_new href='http://www.pfsense.org/index.php?option=com_content&task=view&id=47&Itemid=77'>donate to pfSense project</a>.<br><br>
-								 If you want that your donation goes to this package developer, make a note on donation forwarding it to me.<br><br>");?></td>
+                        <td width="22%" valign="top" class="vncell"><?=gettext("Donations ");?></td>
+                        <td width="78%" class="vtable"><?=gettext("If you like this package, please <a target=_new href='http://www.pfsense.org/index.php?option=com_content&task=view&id=47&Itemid=77'>donate to the pfSense project</a>.<br><br>
+								 If you want your donation to go to this package developer, make a note on the donation forwarding it to me.<br><br>");?></td>
                         </tr>
 						</table>
 						
-- 
cgit v1.2.3


From d4fd9771a96f1f172e5c8638830e10474169b13f Mon Sep 17 00:00:00 2001
From: Phil Davis <phil.davis@world.inf.org>
Date: Sat, 23 Jun 2012 20:01:03 +0545
Subject: Make the donation text read more naturally - Marcello, hopefully you
 get lots of donations, thanks for the work.

---
 config/pf-blocker/pfblocker.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/pf-blocker/pfblocker.xml b/config/pf-blocker/pfblocker.xml
index 650f2909..b4da539c 100755
--- a/config/pf-blocker/pfblocker.xml
+++ b/config/pf-blocker/pfblocker.xml
@@ -230,8 +230,8 @@
 			<fielddescr>Donation</fielddescr>
 			<fieldname>donation</fieldname>
 			<type>checkbox</type>
-			<description><![CDATA[If you like this package, please <a target=_new href='http://www.pfsense.org/index.php?option=com_content&task=view&id=47&Itemid=77'>donate to pfSense project</a>.<br>
-								 If you want that your donation goes to these package developers, make a note on donation forwarding it to us.<br>]]></description>
+			<description><![CDATA[If you like this package, please <a target=_new href='http://www.pfsense.org/index.php?option=com_content&task=view&id=47&Itemid=77'>donate to the pfSense project</a>.<br>
+								 If you want your donation to go to these package developers, make a note on the donation forwarding it to us.<br>]]></description>
 		</field>
 	</fields>
 	<custom_php_install_command>
-- 
cgit v1.2.3


From 6796a93b93544d650ba95e4da601d64e3f7fb299 Mon Sep 17 00:00:00 2001
From: Phil Davis <phil.davis@world.inf.org>
Date: Sat, 23 Jun 2012 23:41:32 +0545
Subject: Change the default language here to the language code 'en'. Although
 note that this does not seem to actually get used. There is code in squid.inc
 that builds the dropdown language list based on the dir names of the squid
 error dirs at run time. No default seems to get picked at all, and on the
 first install it ends up defaulting to 'af' - the first entry in the list. So
 that needs to be worked out. But in any case this change does no harm and
 updates a setting that would otherwise look odd/wrong.

---
 config/squid3/squid.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/squid3/squid.xml b/config/squid3/squid.xml
index f82cf81a..ea13625e 100644
--- a/config/squid3/squid.xml
+++ b/config/squid3/squid.xml
@@ -249,7 +249,7 @@
 			<fieldname>error_language</fieldname>
 			<description>Select the language in which the proxy server will display error messages to users.</description>
 			<type>select</type>
-			<default_value>English</default_value>
+			<default_value>en</default_value>
 		</field>
 		<field>
 			<fielddescr>Disable X-Forward</fielddescr>
-- 
cgit v1.2.3