Project

General

Profile

« Previous | Next » 

Revision d1d0a1ad

Added by Vinicius Coque about 14 years ago

makes correct use of printf and gettext

removes variables names and replace it with '%s'

View differences:

etc/inc/filter.inc
2508 2508
			/*	  this shouldnt ever happen but instead of breaking the clients ruleset
2509 2509
			 *	  log an error.
2510 2510
			 */
2511
			log_error(gettext("ERROR!  PPTP enabled but could not resolve the \$pptpdtarget"));
2511
			log_error("ERROR!  PPTP enabled but could not resolve the \$pptpdtarget");
2512 2512
		}
2513 2513
	}
2514 2514

  
usr/local/www/diag_logs_ppp.php
87 87
			<div id="mainarea">
88 88
			<table class="tabcont" width="100%" border="0" cellspacing="0" cellpadding="0">
89 89
		  		<tr>
90
					<td colspan="2" class="listtopic"><?php printf (gettext("Last $nentries PPP log entries"),$nentries);?></td>
90
					<td colspan="2" class="listtopic"><?php printf(gettext("Last %s PPP log entries"),$nentries);?></td>
91 91
		  		</tr>
92 92
				<?php
93 93
				foreach($ppp_logarr as $logent){
usr/local/www/firewall_shaper_vinterface.php
111 111
				}
112 112
				$output_form .= $queue->build_form();
113 113
			} else {
114
				$input_errors[] = gettext("No queue with name {$qname} was found!");
114
				$input_errors[] = sprintf(gettext("No queue with name %s was found!"),$qname);
115 115
				$output_form .= "<p class=\"pgtitle\">" . $dn_default_shaper_msg."</p>";
116 116
				$dontshow = true;
117 117
			}
usr/local/www/interfaces.php
451 451
			}
452 452
		case "dhcp":
453 453
			if (in_array($wancfg['ipaddr'], array("ppp", "pppoe", "pptp", "l2tp")))
454
				$input_errors[] = gettext("You have to reassign the interface to be able to configure as {$_POST['type']}.");
454
				$input_errors[] = sprintf(gettext("You have to reassign the interface to be able to configure as %s."),$_POST['type']);
455 455
			if (in_array($wancfg['ipaddrv6'], array("ppp", "pppoe", "pptp", "l2tp")))
456
				$input_errors[] = gettext("You have to reassign the interface to be able to configure as {$_POST['type']}.");
456
				$input_errors[] = sprintf(gettext("You have to reassign the interface to be able to configure as %s."),$_POST['type']);
457 457
			break;
458 458
		case "ppp":
459 459
			$reqdfields = explode(" ", "port phone");
usr/local/www/services_captiveportal_vouchers.php
295 295
							$config['voucher']['msgexpired'] = $toreturn['voucher']['msgexpired'];
296 296
						if($toreturn['voucher']['msgnoaccess'])
297 297
							$config['voucher']['msgnoaccess'] = $toreturn['voucher']['msgnoaccess'];
298
						$savemsg = gettext("Voucher database has been synchronized from {$url}:{$port}");
298
						$savemsg = sprintf(gettext("Voucher database has been synchronized from %1\$s:%2\$s"),$url,$port);
299 299

  
300 300
						write_config();
301 301
						voucher_configure(true);
usr/local/www/system.php
135 135
			if(interface_has_gateway($_POST[$dnsgwitem])) {
136 136
				foreach($direct_networks_list as $direct_network) {
137 137
					if(ip_in_subnet($_POST[$dnsitem], $direct_network)) {
138
						$input_errors[] = gettext("You can not assign a gateway to DNS '{$_POST[$dnsitem]}' server which is on a directly connected network.");
138
						$input_errors[] = sprintf(gettext("You can not assign a gateway to DNS '%s' server which is on a directly connected network."),$_POST[$dnsitem]);
139 139
					}
140 140
				}
141 141
			}
usr/local/www/system_advanced_admin.php
93 93
		$althosts = explode(" ", $_POST['althostnames']);
94 94
		foreach ($althosts as $ah)
95 95
			if (!is_hostname($ah))
96
				$input_errors[] = gettext("Alternate hostname " . htmlspecialchars($ah) . " is not a valid hostname.");
96
				$input_errors[] = sprintf(gettext("Alternate hostname %s is not a valid hostname."),htmlspecialchars($ah));
97 97
	}
98 98

  
99 99
	if ($_POST['sshport'])
usr/local/www/system_advanced_misc.php
232 232
								<td width="78%" class="vtable">
233 233
									<input name="proxyurl" id="proxyurl" value="<?php if ($pconfig['proxyurl'] <> "") echo $pconfig['proxyurl']; ?>" class="formfld unknown">
234 234
									<br />
235
									<?=gettext("Proxy url for allowing {$g['product']} to use this proxy to connect outside."); ?>
235
									<?php printf(gettext("Proxy url for allowing %s to use this proxy to connect outside."),$g['product']); ?>
236 236
								</td>
237 237
							</tr>
238 238
							<tr>
......
240 240
								<td width="78%" class="vtable">
241 241
									<input name="proxyport" id="proxyport" value="<?php if ($pconfig['proxyport'] <> "") echo $pconfig['proxyport']; ?>" class="formfld unknown">
242 242
									<br />
243
									<?=gettext("Proxy url for allowing {$g['product']} to use this proxy port to connect outside. Default is 8080 for http protocol or ssl for 443."); ?>
243
									<?php printf(gettext("Proxy url for allowing %s to use this proxy port to connect outside. Default is 8080 for http protocol or ssl for 443."),$g['product']); ?>
244 244
								</td>
245 245
							</tr>
246 246
							<tr>
......
248 248
								<td width="78%" class="vtable">
249 249
									<input name="proxyuser" id="proxyuser" value="<?php if ($pconfig['proxyuser'] <> "") echo $pconfig['proxyuser']; ?>" class="formfld unknown">
250 250
									<br />
251
									<?=gettext("Proxy username for allowing {$g['product']} to use this proxy to connect outside"); ?>
251
									<?php printf(gettext("Proxy username for allowing %s to use this proxy to connect outside"),$g['product']); ?>
252 252
								</td>
253 253
							</tr>
254 254
							<tr>
......
256 256
								<td width="78%" class="vtable">
257 257
									<input type="password" name="proxypass" id="proxypass" value="<?php if ($pconfig['proxypass'] <> "") echo $pconfig['proxypass']; ?>" class="formfld unknown">
258 258
									<br />
259
									<?=gettext("Proxy password for allowing {$g['product']} to use this proxy to connect outside"); ?>
259
									<?php printf(gettext("Proxy password for allowing %s to use this proxy to connect outside"),$g['product']); ?>
260 260
								</td>
261 261
							</tr>
262 262
							<tr>
usr/local/www/system_gateways_edit.php
122 122
			$parent_sn = get_interface_subnet($_POST['interface']);
123 123
			$subnet = gen_subnet($parent_ip, $parent_sn) . "/" . $parent_sn;
124 124
			if(!ip_in_subnet($_POST['gateway'], $subnet) && !ip_in_interface_alias_subnet($_POST['interface'], $_POST['gateway'])) {
125
				$input_errors[] = sprintf(gettext("The gateway address %s does not lie within the chosen interface's subnet '{$subnet}'."), $_POST['gateway']);
125
				$input_errors[] = sprintf(gettext("The gateway address %1\$s does not lie within the chosen interface's subnet '%2\$s'."), $_POST['gateway'],$subnet);
126 126
			}
127 127
		}
128 128
		if (is_ipaddrv6($parent_ip)) {
129 129
			$parent_sn = get_interface_subnetv6($_POST['interface']);
130 130
			$subnet = gen_subnetv6($parent_ip, $parent_sn) . "/" . $parent_sn;
131 131
			if(!ip_in_subnet($_POST['gateway'], $subnet)) {
132
				$input_errors[] = sprintf(gettext("The gateway address %s does not lie within the chosen interface's subnet '{$subnet}'."), $_POST['gateway']);
132
				$input_errors[] = sprintf(gettext("The gateway address %1\$s does not lie within the chosen interface's subnet '%2\$s'."), $_POST['gateway'],$subnet);
133 133
			}
134 134
		}
135 135
	}
usr/local/www/wizards/openvpn_wizard.inc
599 599

  
600 600
	if (isset($pconfig['step11']['ovpnrule'])) {
601 601
		$rule = array();
602
		$rule['descr'] = gettext("OpenVPN {$server['description']} wizard");
602
		$rule['descr'] = sprintf(gettext("OpenVPN %s wizard"),$server['description']);
603 603
		/* Ensure the rule descr is not too long for pf to handle */
604 604
		if (strlen($rule['descr']) > 52)
605 605
			$rule['descr'] = substr($rule['descr'], 0, 52);
......
615 615
	}
616 616
	if (isset($pconfig['step11']['ovpnallow'])) {
617 617
		$rule = array();
618
		$rule['descr'] = gettext("OpenVPN {$server['description']} wizard");
618
		$rule['descr'] = sprintf(gettext("OpenVPN %s wizard"),$server['description']);
619 619
		/* Ensure the rule descr is not too long for pf to handle */
620 620
		if (strlen($rule['descr']) > 52)
621 621
			$rule['descr'] = substr($rule['descr'], 0, 52);

Also available in: Unified diff