Peronalizations Removal
-
Attached is a list of "you" (includes "your") and "we" personalizations for anyone who wants to join in the fun of removing them.
-
I will do the "we" list right away - it is short and will only take a few minutes.
Edit, done:
https://github.com/pfsense/pfsense/pull/2837
https://github.com/pfsense/pfsense/pull/2838 -
There are some places where I think the direct "you" is fine, such as:
Would you like to submit the programming debug logs to the pfSense developers for inspection?
It seems odd to me to reword this (however it could be done). It really is a weird thing that has happened and "the pfSense system" is really talking to "you" - the sysadmin reading the screen.
-
There are some places where I think the direct "you" is fine, such as:
Would you like to submit the programming debug logs to the pfSense developers for inspection?
It seems odd to me to reword this (however it could be done). It really is a weird thing that has happened and "the pfSense system" is really talking to "you" - the sysadmin reading the screen.
That was my thinking on some of them too. So figured I'd leave them for a higher pay grade to decide.
-
I updated the "you" list to show ones I did as part of the "we", and ones that are 3rd-party code that does not need to be messed with:
-
There are some places where I think the direct "you" is fine, such as:
Would you like to submit the programming debug logs to the pfSense developers for inspection?
It seems odd to me to reword this (however it could be done). It really is a weird thing that has happened and "the pfSense system" is really talking to "you" - the sysadmin reading the screen.
It's still probably worth an attempt. In this case, The start of the sentence can simply be removed, leaving:
Submit the programming debug logs to the pfSense developers for inspection?
Though it could use a slight change for brevity:
Submit debug output to pfSense developers for inspection?
-
The list is getting much shorter.
-
The latest list.
Most of what remains is a lot of "Are you sure you . . . ?"
Haven't been able to come up with suitable changes for the rest of these. So if they should be changed it will probably have to be by someone with greater language skills (that's not necessarily a significant feat to achieve by the way).
So this looks like the end of the line for my remove personalizations effort. Unless I come across some more simple ones.
Special thanks to Phil Davis and NewEraCracker for taking on "Editor" duties.
-
Some suggestions… I'm not the best wordsmith, but these seem OK to me... Some of these might require option buttons to be changed from Yes/No to OK/Cancel, since these aren't questions anymore.
Please verify the replacement of the current configuration with this backup.
Please verify the removal of package %s.
Please verify the reinstallation of package %s.
Please verify the installation of package %s.
Please verify the reinstallation of all packages.
Please verify upgrading package %1$s from %2$s to %3$s.Please verify the request to [halt|reboot] the system.
Please verify the addition of this [BLOCK|PASS] rule.
Please verify the removal of this [P1|P2] entry.
Enhance the pfSense experience with pfSense Gold!
authgui.inc lines
This router is being accessed by an IP address not configured locally. It may be forwarded by NAT or other means. If this forwarding is unexpected, it should be verified that a man-in-the-middle attack is not taking place.Browser support for cookies must be enabled to login (assumption is that the browser supports cookies but they are disabled, since any modern browser does support them)
Enter your username… ?? Just Username: and Password:
config.console.inc
I would need to see the whole text blocks to properly re-write the config.console.inc texts, since there are line breaks and not all of the lines are shown in your file.EDIT:
Or maybe instead of "Please verify…", "Please confirm..." -
connfig.console.inc text within context of code.
if ($auto_assign) { echo << <eod<br>!!! Installation Media Detected: Auto Interface Option !!!! BEGIN MANUAL CONFIGURATION OR THE SYSTEM WILL PROCEED WITH AUTO CONFIGURATION. EOD; } echo "\n" . gettext("Do VLANs need to be set up first?"); echo "\n" . gettext( "If VLANs will not be used, or only for optional interfaces, it is typical to\n" . "say no here and use the webConfigurator to configure VLANs later, if required.") . "\n"; echo "\n" . gettext("Do you want to set up VLANs now [y|n]?") . " "; if ($auto_assign) { $key = timeout(); } else { $key = chop(fgets($fp)); } if (!isset($key) and $auto_assign) { // Auto Assign Interfaces do { echo << <eod<br>!!! Auto Assigning Interfaces !!! For installation purposes, you must plug in at least one NIC for the LAN connection. If you plug in a second NIC it will be assigned to WAN. Otherwise, WAN will be temporarily assigned to the next available NIC found regardless of activity. You should assign and configure the WAN interface according to your requirements If you haven't plugged in any network cables yet, now is the time to do so. The system will keep trying until you do. Searching for active interfaces... EOD; unset($wanif, $lanif); $media_iflist = $plugged_in = array(); $media_iflist = get_interface_list("media"); foreach ($media_iflist as $iface => $ifa) { if ($ifa['up']) { $plugged_in[] = $iface; } } $lanif = array_shift($plugged_in); $wanif = array_shift($plugged_in); if (isset($lanif) && !isset($wanif)) { foreach ($iflist as $iface => $ifa) { if ($iface != $lanif) { $wanif = $iface; break; } } } echo << <eod<br>Assigned WAN to : $wanif Assigned LAN to : $lanif If these assignments are not suitable, press any key to go back to manual configuration. EOD; $key = timeout(20); if (isset($key)) { return; } } while (!isset($wanif)); $config['system']['enablesshd'] = 'enabled'; $key = 'y'; } else { //Manually assign interfaces if (in_array($key, array('y', 'Y'))) { vlan_setup(); } if (is_array($config['vlans']['vlan']) && count($config['vlans']['vlan'])) { echo "\n\n" . gettext("VLAN interfaces:") . "\n\n"; foreach ($config['vlans']['vlan'] as $vlan) { echo sprintf("% -16s%s\n", "{$vlan['if']}_vlan{$vlan['tag']}", "VLAN tag {$vlan['tag']}, parent interface {$vlan['if']}"); $iflist[$vlan['if'] . '_vlan' . $vlan['tag']] = array(); $ifsmallist = trim($ifsmallist . " " . $vlan['if'] . '_vlan' . $vlan['tag']); } } echo << <eod<br>If you do not know the names of the interfaces, you may choose to use auto-detection. In that case, disconnect all interfaces now before hitting 'a' to initiate auto detection. EOD;</eod<br></eod<br></eod<br></eod<br> -
Feel free to change as you see fit. I did change some other wording in the auto-assigning block, as I thought it needed more than just the de-personalization.
–------------------------------------------------------
echo "\n" . gettext("Should VLANs be set up now? [y|n]") . " ";
–------------------------------------------------------
!!! Auto Assigning Interfaces !!!
For setup purposes, the first NIC connected should be your
LAN connection. If a second NIC is connected, it will be assigned
to WAN. Otherwise WAN will be temporarily assigned to
the next available NIC found regardless of activity. The WAN
interface should then be assigned and configured as required.Please make the connection(s) to your pfSense interface(s) now.
The system will continue checking until they have been made.Searching for active interfaces...
If the names of the interfaces are not known, auto-detection can
be used instead. To use auto-detection, please disconnect all
interfaces before pressing 'a' to begin the process.
-
Thanks Virgiliomi. Your work has made the list much shorter.
