D11160.id26780.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D11160.id26780.diff
View Options

	diff --git a/src/internationalization/PhutilTranslator.php b/src/internationalization/PhutilTranslator.php
	--- a/src/internationalization/PhutilTranslator.php
	+++ b/src/internationalization/PhutilTranslator.php
	@@ -60,6 +60,11 @@

	public function translate($text /* , ... */) {
	$translation = idx($this->translations, $text, $text);
	+
	+ if ($translation === null) {
	+ $translation = $text;
	+ }
	+
	$args = func_get_args();
	while (is_array($translation)) {
	$translation = $this->chooseVariant($translation, next($args));
	@@ -89,6 +94,13 @@
	}

	$result = vsprintf($translation, $args);
	+ if ($result === false) {
	+ // If vsprintf() fails (often because the translated string references
	+ // too many parameters), show the bad template with a note instead of
	+ // returning an empty string. This makes it easier to figure out what
	+ // went wrong and fix it.
	+ $result = '[Invalid Translation!] '.$translation;
	+ }

	if ($this->language == 'en-ac') {
	$result = strtoupper($result);