Ticket #3687: l10n.php-misc-revised.diff

File l10n.php-misc-revised.diff, 1.6 kB (added by nbachiyski, 1 year ago)
_c with description after the string, common translate function, ngettext filter

wp-includes/l10n.php

old	new
17	17	return $locale;
18	18	}
19	19
20		// Return a translated string.
21		function __($text, $domain = 'default') {
	20	function translate($text, $domain) {
22	21	global $l10n;
23	22
24	23	if (isset($l10n[$domain]))
…	…
27	26	return $text;
28	27	}
29	28
	29	// Return a translated string.
	30	function __($text, $domain = 'default') {
	31	return translate($text, $domain);
	32	}
	33
30	34	// Echo a translated string.
31	35	function _e($text, $domain = 'default') {
32		global $l10n;
33
34		if (isset($l10n[$domain]))
35		echo apply_filters('gettext', $l10n[$domain]->translate($text), $text);
36		else
37		echo $text;
	36	echo translate($text, $domain);
38	37	}
39	38
40	39	function _c($text, $domain = 'default') {
41		global $l10n;
42
43		if ( isset($l10n[$domain]) )
44		$whole = apply_filters('gettext', $l10n[$domain]->translate($text), $text);
45		else
46		$whole = $text;
47
48		$trans = explode('\|', $whole, 2);
49		if ( isset( $trans[1] ) )
50		return $trans[1];
51		else
52		return $trans[0];
	40	$whole = translate($text, $domain);
	41	$last_bar = strrpos($whole, '\|');
	42	if ( false == $last_bar ) {
	43	return $whole;
	44	} else {
	45	return substr($whole, 0, $last_bar);
	46	}
53	47	}
54	48
55	49	// Return the plural form.
…	…
57	51	global $l10n;
58	52
59	53	if (isset($l10n[$domain])) {
60		return ~~$l10n[$domain]->ngettext(~~$single, $plural, $number);
	54	return apply_filters('ngettext', $l10n[$domain]->ngettext($single, $plural, $number), $single, $plural, $number);
61	55	} else {
62	56	if ($number != 1)
63	57	return $plural;