Kdyby / Translation

src/Diagnostics/Panel.php

Doc Comments +1 added lines

@@ -338,6 +338,7 @@
 	/**
 	 * Returns link to editor.
 	 *
+	 * @param string $text
 	 * @return \Nette\Utils\Html|string
 	 */
 	private static function editorLink($file, $line, $text = NULL)

Spacing +26 added lines, -27 removed lines

@@ -83,7 +83,7 @@ 
 	public function getTab(): ?string
 	{
 		return '<span title="Translation"><img width="16px" height="16px" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB90DExAuL9uIsPUAAAQ2SURBVFjD7Ze9bxxVFMV/583skjgOIXEaKCNFAgmQ+ExS8qEUCEHH30BBScG/QM1fEmgoAAkoAigSKKFASElHESEFbGcdez7uoXhvZteW7ewmQjRMsTs7s/Pufeece+4d+P/4jw8ddvHq1avv2b5mm02Lr9Y7/gpQBCFDD5YhgsAoRLhHMtHnRYNAAb3yt92//9y3v3x+MFY6LIGIuGYbKedngzAGsPK5Kb8BGRAu9xiuL+zQ6NphsQ5NYB7YhA1jQCObyOHG/3sMlpM0hmGNcmXh7w9PYL5wfsphbCMPaOR7BipEJahV0FHZvZ2D+1i2qY+gYERCZTGZzLdFkLNIht/v72AHGM5Pa85MqowUc4p81PaPo2CgIa9RxOZ8jowDZm0WXo2oBdttN8ihIABC5dPLI7BIQQA5prEGIeYdbnVtSSpD3WCaCCqpMB8jXSshEBFEROZ9TCTvepC/be63HWA2ppNRoJttP1flvkp5BArmNBQl5zSIMJtNRxJEwHqVOF1XGLHVdSQp+0CpAi1UytJVYHteBQ7cm7AgIKnAH7CWhBDrVRqfud91UERLFNPyihQMwaOUIAI5I9D0PU2Xz9frCjs4WVVUMhJstR2SwaUWgvx7VQqyG2b4IoIoO9xsWipllJ6sK1JB7Exd4whmbUcYlCVcRKrVq0DSqCIVRlPZ4SCqO7MHC0Ey1Epiu+k5XafMvbRaFXCgdBxBOIgw202/TyNBtmuHibJRYba6LjuAsgjjCA3UxwWPCEwanRCJ7bYd/eHspFootdwhdvqeJsyegyaCSVK271US2E9BNp8otbTd9STlB89NJvRFmJREJ4K7e0El2Op6NiY1x7GQlpoawihgq+lIZF2s1xWdu9GAcO6Yp6rcE4OcwGDGR7nhUglYRjL32pbOQdMH61VCzgiFc8eUs+2cTIkuoI2MmH20D9TLzEzuTafgwtp0dNXO5FlhsOvSh23zzBPTBfDm4ny0BBBWAInWpSmVmSDzqrEko0TpBwct9W+xGgKL41hWoMeJB/LQsa/JlOYkVDrmAHlpwnF0M6of2gdIC7vUvDUNk1HMbwVRbmo+jA3tOlaYByTYbRJdiG1E3UFFg2IvLxqm67qR1yg71kLflDXvwhHhsxtbSycw2xWffXiPP+/NmFTiGyX21t9m99RbWDCZ1Fy5dAlJeXyz6aOfz48Mzli6aPTp8rMXz/585UVeun7z4WW418Kll0/w9Pk1/t5JTHdh2otpElMl1PX8eP06fdus9ObhQ2g4VBrVxpvvdl/Ovmgacev2Dnf+2GXnxi6zGw/KMJrNJUXPS6fXmCaNw+d8GNV8KHXgp87xyg83tVQCALPvLlvCVUK/3tnh9t3mkw8+/u3Tx3kNu/H6C7z6063lnLBU4dd98NHzF9Z47eKpE4/7Hngw+LHHzveX3zmAyBv/xsvpP+li/lm3bxkuAAAAAElFTkSuQmCC" />'
-			. $this->translator->getLocale() . ($this->untranslated ? ' <b>(' . count(array_unique($this->untranslated, SORT_REGULAR)) . ' errors)</b>' : '')
+			. $this->translator->getLocale().($this->untranslated ? ' <b>('.count(array_unique($this->untranslated, SORT_REGULAR)).' errors)</b>' : '')
 			. '</span>';
 	}
 
@@ -114,17 +114,17 @@ 
 
 				/** @var \Nette\Application\Request[] $snapshot */
 				$params = $snapshot['request']->getParameters();
-				$s .= '<tr><th width="10px">&nbsp;</th>' .
-					'<th>' . $h($snapshot['request']->getPresenterName() . (isset($params['action']) ? ':' . $params['action'] : '')) . '</th>' .
-					'<th>' . $h($snapshot['locale']) . '</th></tr>';
+				$s .= '<tr><th width="10px">&nbsp;</th>'.
+					'<th>'.$h($snapshot['request']->getPresenterName().(isset($params['action']) ? ':'.$params['action'] : '')).'</th>'.
+					'<th>'.$h($snapshot['locale']).'</th></tr>';
 
 				$l = 1;
 				/** @var mixed[][] $snapshot */
 				foreach ($snapshot['resolvers'] as $name => $resolvedLocale) {
-					$s .= '<tr><td>' . ($l++) . '.</td><td>' . $h($name) . '</td><td>' . $h($resolvedLocale) . '</td></tr>';
+					$s .= '<tr><td>'.($l++).'.</td><td>'.$h($name).'</td><td>'.$h($resolvedLocale).'</td></tr>';
 				}
 
-				$panel[] = '<table style="width:100%">' . $s . '</table>';
+				$panel[] = '<table style="width:100%">'.$s.'</table>';
 			}
 		}
 
@@ -142,14 +142,13 @@ 
 			}
 
 			$panel[] = '<h2>Ignored resources</h2>';
-			$panel[] = '<p>Whitelist config: ' . implode(', ', array_map($h, $this->localeWhitelist)) . '</p>';
+			$panel[] = '<p>Whitelist config: '.implode(', ', array_map($h, $this->localeWhitelist)).'</p>';
 			$panel[] = $this->renderResources($this->ignoredResources);
 		}
 
-		return empty($panel) ? '' :
-			'<h1>Missing translations: ' . count(array_unique($this->untranslated, SORT_REGULAR)) .
-			', Resources: ' . count(Arrays::flatten($this->resources)) . '</h1>' .
-			'<div class="nette-inner tracy-inner kdyby-TranslationPanel" style="min-width:500px">' . implode($panel) . '</div>' .
+		return empty($panel) ? '' : '<h1>Missing translations: '.count(array_unique($this->untranslated, SORT_REGULAR)).
+			', Resources: '.count(Arrays::flatten($this->resources)).'</h1>'.
+			'<div class="nette-inner tracy-inner kdyby-TranslationPanel" style="min-width:500px">'.implode($panel).'</div>'.
 			'<style>
 				#nette-debug .kdyby-TranslationPanel h2,
 				#tracy-debug .kdyby-TranslationPanel h2 {font-size: 23px;}
@@ -167,19 +166,19 @@ 
 			$s .= '<tr><td>';
 
 			if ($message instanceof \Exception || $message instanceof \Throwable) {
-				$s .= '<span style="color:red">' . $h($message->getMessage()) . '</span>';
+				$s .= '<span style="color:red">'.$h($message->getMessage()).'</span>';
 
 			} elseif ($message instanceof Html) {
-				$s .= '<span style="color:red">Nette\Utils\Html(' . $h((string) $message) . ')</span>';
+				$s .= '<span style="color:red">Nette\Utils\Html('.$h((string) $message).')</span>';
 
 			} else {
 				$s .= $h($message);
 			}
 
-			$s .= '</td><td>' . $h($untranslated['domain']) . '</td></tr>';
+			$s .= '</td><td>'.$h($untranslated['domain']).'</td></tr>';
 		}
 
-		return '<table style="width:100%"><tr><th>Untranslated message</th><th>Translation domain</th></tr>' . $s . '</table>';
+		return '<table style="width:100%"><tr><th>Untranslated message</th><th>Translation domain</th></tr>'.$s.'</table>';
 	}
 
 	private function renderResources($resourcesMap)
@@ -191,25 +190,25 @@ 
 		foreach ($resourcesMap as $locale => $resources) {
 			foreach ($resources as $resourcePath => $domain) {
 				$s .= '<tr>';
-				$s .= '<td>' . $h($locale) . '</td>';
-				$s .= '<td>' . $h($domain) . '</td>';
+				$s .= '<td>'.$h($locale).'</td>';
+				$s .= '<td>'.$h($domain).'</td>';
 
-				$relativePath = str_replace(rtrim($this->rootDir, '/') . '/', '', $resourcePath);
+				$relativePath = str_replace(rtrim($this->rootDir, '/').'/', '', $resourcePath);
 				if (Strings::startsWith($relativePath, 'vendor/')) {
 					$parts = explode('/', $relativePath, 4);
 					$left = array_pop($parts);
-					$relativePath = $h(implode('/', $parts) . '/.../') . '<b>' . $h(basename($left)) . '</b>';
+					$relativePath = $h(implode('/', $parts).'/.../').'<b>'.$h(basename($left)).'</b>';
 
 				} else {
-					$relativePath = $h(dirname($relativePath)) . '/<b>' . $h(basename($relativePath)) . '</b>';
+					$relativePath = $h(dirname($relativePath)).'/<b>'.$h(basename($relativePath)).'</b>';
 				}
 
-				$s .= '<td>' . self::editorLink($resourcePath, 1, $relativePath) . '</td>';
+				$s .= '<td>'.self::editorLink($resourcePath, 1, $relativePath).'</td>';
 				$s .= '</tr>';
 			}
 		}
 
-		return '<table style="width:100%"><tr><th>Locale</th><th>Domain</th><th>Resource filename</th></tr>' . $s . '</table>';
+		return '<table style="width:100%"><tr><th>Locale</th><th>Domain</th><th>Resource filename</th></tr>'.$s.'</table>';
 	}
 
 	/**
@@ -245,7 +244,7 @@ 
 	public function addResource($format, $resource, $locale, $domain)
 	{
 		if (is_array($resource)) {
-			$resource = 'array ' . md5(serialize($resource));
+			$resource = 'array '.md5(serialize($resource));
 		}
 
 		$this->resources[$locale][$resource] = $domain;
@@ -265,7 +264,7 @@ 
 	public function addIgnoredResource($format, $resource, $locale, $domain)
 	{
 		if (is_array($resource)) {
-			$resource = 'array ' . md5(serialize($resource));
+			$resource = 'array '.md5(serialize($resource));
 		}
 
 		$this->ignoredResources[$locale][$resource] = $domain;
@@ -323,14 +322,14 @@ 
 			return NULL;
 		}
 
-		$method = YamlFileLoader::class . '::load';
+		$method = YamlFileLoader::class.'::load';
 		$call = Helpers::findTrace($e->getPrevious()->getTrace(), $method);
 		if ($call !== NULL) {
 			return [
 				'tab' => 'YAML dictionary',
-				'panel' => '<p><b>File:</b> ' . self::editorLink($call['args'][0], $previous->getParsedLine()) . '</p>'
+				'panel' => '<p><b>File:</b> '.self::editorLink($call['args'][0], $previous->getParsedLine()).'</p>'
 					. ($previous->getParsedLine() ? BlueScreen::highlightFile($call['args'][0], $previous->getParsedLine()) : '')
-					. '<p>' . $previous->getMessage() . ' </p>',
+					. '<p>'.$previous->getMessage().' </p>',
 			];
 		}
 	}

src/PrefixedTranslator.php

Spacing +3 added lines, -3 removed lines

@@ -60,7 +60,7 @@ 
 	public function translate($message, ...$arg): string
 	{
 		$translationString = ($message instanceof Phrase ? $message->message : $message);
-		$prefix = $this->prefix . '.';
+		$prefix = $this->prefix.'.';
 
 		$count = isset($arg[0]) ? $arg[0] : NULL;
 		$parameters = isset($arg[1]) ? $arg[1] : [];
@@ -73,10 +73,10 @@ 
 		}
 
 		if ($message instanceof Phrase) {
-			return $this->translator->translate(new Phrase($prefix . $translationString, $message->count, $message->parameters, $message->domain, $message->locale));
+			return $this->translator->translate(new Phrase($prefix.$translationString, $message->count, $message->parameters, $message->domain, $message->locale));
 		}
 
-		return $this->translator->translate($prefix . $translationString, $count, (array) $parameters, $domain, $locale);
+		return $this->translator->translate($prefix.$translationString, $count, (array) $parameters, $domain, $locale);
 	}
 
 	/**

Doc Comments +2 added lines, -1 removed lines

@@ -53,8 +53,9 @@
 	}
 
 	/**
-	 * @param string|\Kdyby\Translation\Phrase $message
+	 * @param string $message
 	 * @param array|string|NULL ...$arg
+	 * @param integer|null $arg
 	 * @return string
 	 */
 	public function translate($message, ...$arg): string

src/Phrase.php

Spacing +1 added lines, -1 removed lines

@@ -83,7 +83,7 @@
 	public function translate(Translator $translator, $count = NULL, array $parameters = [], $domain = NULL, $locale = NULL): string
 	{
 		if (!is_string($this->message)) {
-			throw new \Kdyby\Translation\InvalidStateException('Message is not a string, type ' . gettype($this->message) . ' given.');
+			throw new \Kdyby\Translation\InvalidStateException('Message is not a string, type '.gettype($this->message).' given.');
 		}
 
 		$count = ($count !== NULL) ? (int) $count : $this->count;

src/DI/TranslationExtension.php

Spacing +15 added lines, -15 removed lines

@@ -152,7 +152,7 @@ 
 
 		$builder->addDefinition($this->prefix('helpers'))
 			->setClass(TemplateHelpers::class)
-			->setFactory($this->prefix('@default') . '::createTemplateHelpers');
+			->setFactory($this->prefix('@default').'::createTemplateHelpers');
 
 		$builder->addDefinition($this->prefix('fallbackResolver'))
 			->setClass(FallbackResolver::class);
@@ -186,7 +186,7 @@ 
 		$builder->addDefinition($this->prefix('loader'))
 			->setClass(TranslationLoader::class);
 
-		$loaders = $this->loadFromFile(__DIR__ . '/config/loaders.neon');
+		$loaders = $this->loadFromFile(__DIR__.'/config/loaders.neon');
 		$this->loadLoaders($loaders, $config['loaders'] ?: array_keys($loaders));
 
 		if ($this->isRegisteredConsoleExtension()) {
@@ -250,8 +250,8 @@ 
 	{
 		$builder = $this->getContainerBuilder();
 
-		foreach ($this->loadFromFile(__DIR__ . '/config/dumpers.neon') as $format => $class) {
-			$builder->addDefinition($this->prefix('dumper.' . $format))
+		foreach ($this->loadFromFile(__DIR__.'/config/dumpers.neon') as $format => $class) {
+			$builder->addDefinition($this->prefix('dumper.'.$format))
 				->setClass($class)
 				->addTag(self::TAG_DUMPER, $format);
 		}
@@ -265,7 +265,7 @@ 
 			if (array_search($format, $allowed) === FALSE) {
 				continue;
 			}
-			$builder->addDefinition($this->prefix('loader.' . $format))
+			$builder->addDefinition($this->prefix('loader.'.$format))
 				->setClass($class)
 				->addTag(self::TAG_LOADER, $format);
 		}
@@ -275,8 +275,8 @@ 
 	{
 		$builder = $this->getContainerBuilder();
 
-		foreach ($this->loadFromFile(__DIR__ . '/config/extractors.neon') as $format => $class) {
-			$builder->addDefinition($this->prefix('extractor.' . $format))
+		foreach ($this->loadFromFile(__DIR__.'/config/extractors.neon') as $format => $class) {
+			$builder->addDefinition($this->prefix('extractor.'.$format))
 				->setClass($class)
 				->addTag(self::TAG_EXTRACTOR, $format);
 		}
@@ -290,7 +290,7 @@ 
 
 		$this->beforeCompileLogging($config);
 
-		$registerToLatte = function (FactoryDefinition $def) {
+		$registerToLatte = function(FactoryDefinition $def) {
 			$def->getResultDefinition()->addSetup('?->onCompile[] = function($engine) { ?::install($engine->getCompiler()); }', ['@self', new PhpLiteral(TranslateMacros::class)]);
 
 			$def->getResultDefinition()
@@ -298,7 +298,7 @@ 
 				->addSetup('addFilter', ['translate', [$this->prefix('@helpers'), 'translateFilterAware']]);
 		};
 
-		$latteFactoryService = $builder->getByType(LatteFactory::class)?: $builder->getByType(ILatteFactory::class);
+		$latteFactoryService = $builder->getByType(LatteFactory::class) ?: $builder->getByType(ILatteFactory::class);
 		if (!$latteFactoryService || !self::isOfType($builder->getDefinition($latteFactoryService)->getClass(), LatteEngine::class)) {
 			$latteFactoryService = 'nette.latteFactory';
 		}
@@ -335,7 +335,7 @@ 
 		foreach ($builder->findByTag(self::TAG_EXTRACTOR) as $extractorId => $meta) {
 			Validators::assert($meta, 'string:2..');
 
-			$extractor->addSetup('addExtractor', [$meta, '@' . $extractorId]);
+			$extractor->addSetup('addExtractor', [$meta, '@'.$extractorId]);
 
 			$builder->getDefinition($extractorId)->setAutowired(FALSE);
 		}
@@ -345,7 +345,7 @@ 
 		foreach ($builder->findByTag(self::TAG_DUMPER) as $dumperId => $meta) {
 			Validators::assert($meta, 'string:2..');
 
-			$writer->addSetup('addDumper', [$meta, '@' . $dumperId]);
+			$writer->addSetup('addDumper', [$meta, '@'.$dumperId]);
 
 			$builder->getDefinition($dumperId)->setAutowired(FALSE);
 		}
@@ -369,7 +369,7 @@ 
 			$config['dirs'] = array_merge($config['dirs'], array_values($extension->getTranslationResources()));
 		}
 
-		$config['dirs'] = array_map(function ($dir) use ($builder) {
+		$config['dirs'] = array_map(function($dir) use ($builder) {
 			return str_replace((DIRECTORY_SEPARATOR === '/') ? '\\' : '/', DIRECTORY_SEPARATOR, Helpers::expand($dir, $builder->parameters));
 		}, $config['dirs']);
 
@@ -414,8 +414,8 @@ 
 		/** @var \Nette\DI\Definitions\ServiceDefinition $translator */
 		$translator = $builder->getDefinition($this->prefix('default'));
 
-		$mask = array_map(function ($value) {
-			return '*.*.' . $value;
+		$mask = array_map(function($value) {
+			return '*.*.'.$value;
 		}, array_keys($this->loaders));
 
 		foreach (Finder::findFiles($mask)->from($dirs) as $file) {
@@ -498,7 +498,7 @@ 
 	 */
 	public static function register(Configurator $configurator)
 	{
-		$configurator->onCompile[] = function ($config, Compiler $compiler) {
+		$configurator->onCompile[] = function($config, Compiler $compiler) {
 			$compiler->addExtension('translation', new TranslationExtension());
 		};
 	}