Project

General

Profile

« Previous | Next » 

Revision e4517c3c

Added by Jim Pingle about 9 years ago

Further text refinements for PR 2790

View differences:

src/usr/local/www/interfaces.php
622 622
			break;
623 623
		case "dhcp6":
624 624
			if (in_array($wancfg['ipaddrv6'], array())) {
625
				$input_errors[] = sprintf(gettext("The interface has to be reassigned to be able to configure as %s."), $_POST['type6']);
625
				$input_errors[] = sprintf(gettext("The interface must be reassigned to configure as %s."), $_POST['type6']);
626 626
			}
627 627
			if ($_POST['dhcp6-ia-pd-send-hint'] && strtolower($_POST['dhcp6-ia-pd-len']) == 'none') {
628 628
				$input_errors[] = gettext('DHCPv6 Prefix Delegation size must be provided when Send IPv6 prefix hint flag is checked');
......
632 632
			foreach ($ifdescrs as $ifent => $ifdescr) {
633 633
				if ($if != $ifent && ($config[interfaces][$ifent]['ipaddrv6'] == $_POST['type6'])) {
634 634
					if ($config[interfaces][$ifent]['prefix-6rd'] == $_POST['prefix-6rd']) {
635
						$input_errors[] = gettext("Only one interface can be configured in 6rd with same prefix.");
635
						$input_errors[] = gettext("Only one interface can be configured within a single 6rd prefix.");
636 636
						break;
637 637
					}
638 638
				}
......
641 641
				$input_errors[] = gettext("6RD Border Gateway must be an IPv4 address.");
642 642
			}
643 643
			if (in_array($wancfg['ipaddrv6'], array())) {
644
				$input_errors[] = sprintf(gettext("The interface has to be reassigned to be able to configure as %s."), $_POST['type6']);
644
				$input_errors[] = sprintf(gettext("The interface must be reassigned to configure as %s."), $_POST['type6']);
645 645
			}
646 646
			break;
647 647
		case "6to4":
......
652 652
				}
653 653
			}
654 654
			if (in_array($wancfg['ipaddrv6'], array())) {
655
				$input_errors[] = sprintf(gettext("The interface has to be reassigned to be able to configure as %s."), $_POST['type6']);
655
				$input_errors[] = sprintf(gettext("The interface must be reassigned to configure as %s."), $_POST['type6']);
656 656
			}
657 657
			break;
658 658
		case "track6":
659 659
			/* needs to check if $track6-prefix-id is used on another interface */
660 660
			if (in_array($wancfg['ipaddrv6'], array())) {
661
				$input_errors[] = sprintf(gettext("The interface has to be reassigned to be able to configure as %s."), $_POST['type6']);
661
				$input_errors[] = sprintf(gettext("The interface must be reassigned to configure as %s."), $_POST['type6']);
662 662
			}
663 663

  
664 664
			if (empty($_POST['track6-interface'])) {
......
670 670
			} else {
671 671
				$track6_prefix_id = intval($_POST['track6-prefix-id--hex'], 16);
672 672
				if ($track6_prefix_id < 0 || $track6_prefix_id > $_POST['ipv6-num-prefix-ids-' . $_POST['track6-interface']]) {
673
					$input_errors[] = gettext("An IPv6 prefix ID that is out of range was specified.") .
673
					$input_errors[] = gettext("The specified IPv6 Prefix ID is out of range.") .
674 674
						" ({$_POST['track6-interface']}) - (0) - (" . sprintf('%x', $_POST['ipv6-num-prefix-ids-' . $_POST['track6-interface']]) . ")";
675 675
				} else {
676 676
					foreach ($ifdescrs as $ifent => $ifdescr) {
......
1620 1620
		$old_wireless_mode = $wancfg['wireless']['mode'];
1621 1621
		$wancfg['wireless']['mode'] = $_POST['mode'];
1622 1622
		if (!interface_wireless_clone("{$wlanif}_", $wancfg)) {
1623
			$input_errors[] = sprintf(gettext("Unable to change mode to %s.	 May already have the maximum number of wireless clones supported in this mode."), $wlan_modes[$wancfg['wireless']['mode']]);
1623
			$input_errors[] = sprintf(gettext("Unable to change mode to %s. The maximum number of wireless clones supported in this mode may have been reached."), $wlan_modes[$wancfg['wireless']['mode']]);
1624 1624
		} else {
1625 1625
			mwexec("/sbin/ifconfig " . escapeshellarg($wlanif) . "_ destroy");
1626 1626
		}
......
1702 1702

  
1703 1703
if (is_subsystem_dirty('interfaces')) {
1704 1704
	print_apply_box(sprintf(gettext("The %s configuration has been changed."), $wancfg['descr']) . "<br />" .
1705
					gettext("The changes must be applied in order for them to take effect.") . "<br />" .
1705
					gettext("The changes must be applied to take effect.") . "<br />" .
1706 1706
					gettext("Don't forget to adjust the DHCP Server range if needed after applying."));
1707 1707
}
1708 1708

  
......
3377 3377
		if (textStatus === "error" && request.getResponseHeader("Content-Type") === "text/plain") {
3378 3378
			alert(request.responseText);
3379 3379
		} else {
3380
			alert("Could not create the IPv4 gateway at this time.");
3380
			alert("The IPv4 gateway could not be created.");
3381 3381
		}
3382 3382

  
3383 3383
		$("#newgateway").modal('hide');
......
3426 3426
		if (textStatus === "error" && request.getResponseHeader("Content-Type") === "text/plain") {
3427 3427
			alert(request.responseText);
3428 3428
		} else {
3429
			alert("Could not create the IPv6 gateway at this time.");
3429
			alert("The IPv6 gateway could not be created.");
3430 3430
		}
3431 3431

  
3432 3432
		$("#newgateway6").modal('hide');

Also available in: Unified diff