Skip to content

O
OpnSense
Commit 52850fd6 authored by Franco Fichtner's avatar Franco Fichtner
Browse files
Options

www: nitpicking on natural language in menus 

* Abbreviations are generally discouraged in persistent
  menu items.  They look unprofessional or plain sloppy.

* Items should be short and concise.  One word if possible.
  Always avoid doubled meanings like e.g. "HA" + "Sync".

* "Manager" this and that everwhere is simply annoying.
parent bb1d3336
Hide whitespace changes
Inline Side-by-side
Showing with 30 additions and 24 deletions
src/etc/inc/priv.defs.inc
View file @ 52850fd6
......@@ -1219,8 +1219,8 @@ $priv_list['page-system-groupmanager-addprivs']['match'] = array();
$priv_list['page-system-groupmanager-addprivs']['match'][] = "system_groupmanager_addprivs.php*";
$priv_list['page-system-hasync'] = array();
$priv_list['page-system-hasync']['name'] = gettext("Webcfg - System: High Availability Sync");
$priv_list['page-system-hasync']['descr'] = gettext("Allow access to the 'System: High Availability Sync' page.");
$priv_list['page-system-hasync']['name'] = gettext("Webcfg - System: High Availability");
$priv_list['page-system-hasync']['descr'] = gettext("Allow access to the 'System: High Availability' page.");
$priv_list['page-system-hasync']['match'] = array();
$priv_list['page-system-hasync']['match'][] = "system_hasync.php*";
......
src/etc/inc/upgrade_config.inc
View file @ 52850fd6
......@@ -2039,7 +2039,7 @@ function upgrade_055_to_056() {
if (!is_array($config['cert']))
$config['cert'] = array();
/* migrate ipsec ca's to cert manager */
/* migrate ipsec ca's to certificate manager */
if (is_array($config['ipsec']['cacert'])) {
foreach($config['ipsec']['cacert'] as & $cacert) {
$ca = array();
......@@ -2054,7 +2054,7 @@ function upgrade_055_to_056() {
unset($config['ipsec']['cacert']);
}
/* migrate phase1 certificates to cert manager */
/* migrate phase1 certificates to certificate manager */
if (is_array($config['ipsec']['phase1'])) {
foreach($config['ipsec']['phase1'] as & $ph1ent) {
$cert = array();
......
src/etc/rc.filter_synchronize
View file @ 52850fd6
......@@ -250,7 +250,7 @@ if (file_exists('/var/run/booting')) {
}
if (is_array($config['hasync'])) {
update_filter_reload_status("Building high availability sync information");
update_filter_reload_status("Building high availability information");
$hasync = $config['hasync'];
if (empty($hasync['synchronizetoip'])) {
......
src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml
View file @ 52850fd6
......@@ -14,7 +14,7 @@
<GeneralSetup VisibleName="General Setup" url="/system_general.php"/>
<HighAvailSync VisibleName="High Availability Sync" url="/system_hasync.php"/>
<HighAvailSync VisibleName="High Availability" url="/system_hasync.php"/>
<Routing url="/system_gateways.php"/>
......
src/www/carp_status.php
View file @ 52850fd6
<?php
/*
Copyright (C) 2014 Deciso B.V.
Copyright (C) 2004 Scott Ullrich
......@@ -182,7 +183,7 @@ include("head.inc");
<p class="vexpl">
<span class="red"><strong><?=gettext("Note"); ?>:</strong></span>
<br />
<?=gettext("You can configure high availability sync settings"); ?> <a href="system_hasync.php"><?=gettext("here"); ?></a>.
<?=gettext("You can configure high availability settings"); ?> <a href="system_hasync.php"><?=gettext("here"); ?></a>.
</p>
<?php
......
src/www/fbegin.inc
View file @ 52850fd6
......@@ -126,17 +126,17 @@ function active_main_menu() {
// System
$system_menu = array();
$system_menu[] = array(gettext("Settings"), "/system_general.php");
$system_menu[] = array(gettext("Certificates"), "/system_camanager.php");
$system_menu[] = array(gettext("Firmware"), "/system_firmware_check.php");
$system_menu[] = array(gettext("High Avail. Sync"), "/system_hasync.php");
$system_menu[] = array(gettext("Setup Wizard"), "/wizard.php?xml=setup_wizard.xml");
$system_menu[] = array(gettext("High Availability"), "/system_hasync.php");
$system_menu[] = array(gettext("Routing"), "/system_gateways.php");
$system_menu[] = array(gettext("Cert Manager"), "/system_camanager.php");
if (!isAllowedPage("system_usermanager.php*"))
$system_menu[] = array(gettext("Settings"), "/system_general.php");
$system_menu[] = array(gettext("Setup Wizard"), "/wizard.php?xml=setup_wizard.xml");
if (!isAllowedPage("system_usermanager.php*")) {
$system_menu[] = array(gettext("User Manager"), "/system_usermanager_passwordmg.php");
else
} else {
$system_menu[] = array(gettext("User Manager"), "/system_usermanager.php");
$system_menu = msort($system_menu,0);
}
// Interfaces
$interfaces_menu = array();
......
src/www/services_captiveportal.php
View file @ 52850fd6
<?php
/*
Copyright (C) 2014-2015 Deciso B.V.
Copyright (C) 2003-2006 Manuel Kasper <mk@neon1.net>.
......@@ -949,7 +950,7 @@ function enable_change(enable_change) {
<?php endforeach; ?>
</select>
<?php else: ?>
<b><?=gettext("No Certificates defined."); ?></b> <br />Create one under <a href="system_certmanager.php">System &gt; Cert Manager</a>.
<b><?=gettext("No Certificates defined."); ?></b> <br />Create one under <a href="system_certmanager.php">System: Certificates</a>.
<?php endif; ?>
</td>
</tr>
......
src/www/system_authservers.php
View file @ 52850fd6
<?php
/*
Copyright (C) 2014-2015 Deciso B.V.
Copyright (C) 2014-2015 Deciso B.V.
Copyright (C) 2010 Ermal Luçi
Copyright (C) 2008 Shrew Soft Inc.
All rights reserved.
......@@ -546,7 +547,7 @@ function select_clicked() {
<br /><span><?=gettext("This option is used if 'SSL Encrypted' option is choosen.");?> <br />
<?=gettext("It must match with the CA in the AD otherwise problems will arise.");?></span>
<?php else: ?>
<b>No Certificate Authorities defined.</b> <br />Create one under <a href="system_camanager.php">System &gt; Cert Manager</a>.
<b>No Certificate Authorities defined.</b> <br />Create one under <a href="system_camanager.php">System: Certificates</a>.
<?php endif; ?>
</td>
</tr>
......
src/www/system_hasync.php
View file @ 52850fd6
<?php
/*
Copyright (C) 2014-2015 Deciso B.V.
Copyright (C) 2012 Darren Embry <dse@webonastick.com>.
......@@ -66,7 +67,7 @@ if ($_POST) {
$a_hasync['synchronizetoip'] = $pconfig['synchronizetoip'];
$a_hasync['username'] = $pconfig['username'];
$a_hasync['password'] = $pconfig['password'];
write_config("Updated High Availability Sync configuration");
write_config("Updated High Availability configuration");
interfaces_carp_setup();
header("Location: system_hasync.php");
exit();
......@@ -84,7 +85,7 @@ $pconfig['password'] = $a_hasync['password'];
$ifaces = get_configured_interface_with_descr();
$ifaces["lo0"] = "loopback";
$pgtitle = array(gettext("System"),gettext("High Availability Sync"));
$pgtitle = array(gettext("System"),gettext("High Availability"));
$shortcut_section = "carp";
include("head.inc");
?>
......
src/www/vpn_openvpn_client.php
View file @ 52850fd6
<?php
/*
Copyright (C) 2014-2015 Deciso B.V.
Copyright (C) 2008 Shrew Soft Inc.
......@@ -760,7 +761,7 @@ function autotls_change() {
<?php endforeach; ?>
</select>
<?php else: ?>
<b>No Certificate Authorities defined.</b> <br />Create one under <a href="system_camanager.php">System &gt; Cert Manager</a>.
<b>No Certificate Authorities defined.</b> <br />Create one under <a href="system_camanager.php">System: Certificates</a>.
<?php endif; ?>
</td>
</tr>
......@@ -789,7 +790,7 @@ function autotls_change() {
<option value="" <?PHP if (empty($pconfig['certref'])) echo "selected=\"selected\""; ?>>None (Username and Password required)</option>
</select>
<?php if (!count($a_cert)): ?>
<b>No Certificates defined.</b> <br />Create one under <a href="system_certmanager.php">System &gt; Cert Manager</a> if one is required for this connection.
<b>No Certificates defined.</b> <br />Create one under <a href="system_certmanager.php">System: Certificates</a> if one is required for this connection.
<?php endif; ?>
</td>
</tr>
......
src/www/vpn_openvpn_server.php
View file @ 52850fd6
<?php
/*
Copyright (C) 2014-2015 Deciso B.V.
Copyright (C) 2008 Shrew Soft Inc.
......@@ -960,7 +961,7 @@ function tuntap_change() {
<?php endforeach; ?>
</select>
<?php else: ?>
<b>No Certificate Authorities defined.</b> <br />Create one under <a href="system_camanager.php">System &gt; Cert Manager</a>.
<b>No Certificate Authorities defined.</b> <br />Create one under <a href="system_camanager.php">System: Certificates</a>.
<?php endif; ?>
</td>
</tr>
......@@ -985,7 +986,7 @@ function tuntap_change() {
<?php endforeach; ?>
</select>
<?php else: ?>
<b>No Certificate Revocation Lists (CRLs) defined.</b> <br />Create one under <a href="system_crlmanager.php">System &gt; Cert Manager</a>.
<b>No Certificate Revocation Lists (CRLs) defined.</b> <br />Create one under <a href="system_crlmanager.php">System: Certificates</a>.
<?php endif; ?>
</td>
</tr>
......@@ -1014,7 +1015,7 @@ function tuntap_change() {
<?php endforeach; ?>
</select>
<?php else: ?>
<b>No Certificates defined.</b> <br />Create one under <a href="system_certmanager.php">System &gt; Cert Manager</a>.
<b>No Certificates defined.</b> <br />Create one under <a href="system_certmanager.php">System: Certificates</a>.
<?php endif; ?>
</td>
</tr>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Technounit-GROUP 2023