Kdyby / Translation

src/IResourceLoader.php

Doc Comments +2 added lines

@@ -27,6 +27,7 @@ 
 	 *
 	 * @param string $format The format of the loader
 	 * @param LoaderInterface $loader
+	 * @return void
 	 */
 	public function addLoader($format, LoaderInterface $loader);
 
@@ -45,6 +46,7 @@ 
 	 * @param string $domain
 	 * @param MessageCatalogue $catalogue
 	 * @throws LoaderNotFoundException
+	 * @return void
 	 */
 	public function loadResource($format, $resource, $domain, MessageCatalogue $catalogue);
 

src/PrefixedTranslator.php

Spacing +3 added lines, -3 removed lines

@@ -62,7 +62,7 @@ 
 	public function translate($message, $count = NULL, $parameters = [], $domain = NULL, $locale = NULL)
 	{
 		$translationString = ($message instanceof Phrase ? $message->message : $message);
-		$prefix = $this->prefix . '.';
+		$prefix = $this->prefix.'.';
 
 		if (Strings::startsWith($message, '//')) {
 			$prefix = NULL;
@@ -70,7 +70,7 @@ 
 		}
 
 		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));
 		}
 
 		if (is_array($count)) {
@@ -80,7 +80,7 @@ 
 			$count = NULL;
 		}
 
-		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, -2 removed lines

@@ -61,8 +61,8 @@
 
 
 	/**
-	 * @param string|\Kdyby\Translation\Phrase $message
-	 * @param int|array|NULL $count
+	 * @param string $message
+	 * @param integer|null $count
 	 * @param array|string|NULL $parameters
 	 * @param string|NULL $domain
 	 * @param string|NULL $locale

src/DI/TranslationExtension.php

Spacing +15 added lines, -15 removed lines

@@ -111,7 +111,7 @@ 
 
 		$builder->addDefinition($this->prefix('helpers'))
 			->setClass('Kdyby\Translation\TemplateHelpers')
-			->setFactory($this->prefix('@default') . '::createTemplateHelpers');
+			->setFactory($this->prefix('@default').'::createTemplateHelpers');
 
 		$builder->addDefinition($this->prefix('fallbackResolver'))
 			->setClass('Kdyby\Translation\FallbackResolver');
@@ -135,8 +135,8 @@ 
 		$builder->addDefinition($this->prefix('loader'))
 			->setClass('Kdyby\Translation\TranslationLoader');
 
-		$loaders = $this->loadFromFile(__DIR__ . '/config/loaders.neon');
-		$this->loadLoaders($loaders, $config['loaders'] ? : array_keys($loaders));
+		$loaders = $this->loadFromFile(__DIR__.'/config/loaders.neon');
+		$this->loadLoaders($loaders, $config['loaders'] ?: array_keys($loaders));
 
 		if ($this->isRegisteredConsoleExtension()) {
 			$this->loadConsole($config);
@@ -204,8 +204,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);
 		}
@@ -221,7 +221,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);
 		}
@@ -233,8 +233,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);
 		}
@@ -249,7 +249,7 @@ 
 
 		$this->beforeCompileLogging($config);
 
-		$registerToLatte = function (Nette\DI\ServiceDefinition $def) {
+		$registerToLatte = function(Nette\DI\ServiceDefinition $def) {
 			$def->addSetup('?->onCompile[] = function($engine) { Kdyby\Translation\Latte\TranslateMacros::install($engine->getCompiler()); }', ['@self']);
 
 			$def->addSetup('addProvider', ['translator', $this->prefix('@default')])
@@ -289,7 +289,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);
 		}
@@ -298,7 +298,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);
 		}
@@ -321,7 +321,7 @@ 
 			$config['dirs'] = array_merge($config['dirs'], array_values($extension->getTranslationResources()));
 		}
 
-		$config['dirs'] = array_map(function ($dir) {
+		$config['dirs'] = array_map(function($dir) {
 			return str_replace((DIRECTORY_SEPARATOR === '/') ? '\\' : '/', DIRECTORY_SEPARATOR, $dir);
 		}, $config['dirs']);
 
@@ -367,8 +367,8 @@ 
 		$whitelistRegexp = Kdyby\Translation\Translator::buildWhitelistRegexp($config['whitelist']);
 		$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) {
@@ -467,7 +467,7 @@ 
 	 */
 	public static function register(Nette\Configurator $configurator)
 	{
-		$configurator->onCompile[] = function ($config, Nette\DI\Compiler $compiler) {
+		$configurator->onCompile[] = function($config, Nette\DI\Compiler $compiler) {
 			$compiler->addExtension('translation', new TranslationExtension());
 		};
 	}

src/Latte/TranslateMacros.php

Spacing +1 added lines, -1 removed lines

@@ -51,7 +51,7 @@
 				$value = var_export($node->content, TRUE);
 				$node->content = '';
 			} else {
-				$node->openingCode = '<?php ob_start(function () {}) ?>' . $node->openingCode;
+				$node->openingCode = '<?php ob_start(function () {}) ?>'.$node->openingCode;
 				$value = 'ob_get_clean()';
 			}
 

src/TranslationLoader.php

Spacing +2 added lines, -2 removed lines

@@ -95,8 +95,8 @@
 	{
 		foreach ($this->getLoaders() as $format => $loader) {
 			// load any existing translation files
-			$extension = $catalogue->getLocale() . '.' . $format;
-			foreach (Finder::findFiles('*.' . $extension)->from($directory) as $file) {
+			$extension = $catalogue->getLocale().'.'.$format;
+			foreach (Finder::findFiles('*.'.$extension)->from($directory) as $file) {
 				/** @var \SplFileInfo $file */
 				$domain = substr($file->getFileName(), 0, -1 * strlen($extension) - 1);
 				$this->loadResource($format, $file->getPathname(), $domain, $catalogue);

src/Caching/PhpFileStorage.php

Spacing +2 added lines, -2 removed lines

@@ -54,10 +54,10 @@
 	{
 		return parent::getCacheFile(substr_replace(
 			$key,
-			trim(strtr($this->hint, '\\/@', '.._'), '.') . '-',
+			trim(strtr($this->hint, '\\/@', '.._'), '.').'-',
 			strpos($key, Nette\Caching\Cache::NAMESPACE_SEPARATOR) + 1,
 			0
-		)) . '.php';
+		)).'.php';
 	}
 
 }

src/Diagnostics/Panel.php

Spacing +23 added lines, -24 removed lines

@@ -91,7 +91,7 @@ 
 	public function getTab()
 	{
 		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>';
 	}
 
@@ -124,16 +124,16 @@ 
 
 				/** @var 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;
 				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>';
 			}
 		}
 
@@ -151,14 +151,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(Nette\Utils\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(Nette\Utils\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;}
@@ -178,19 +177,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 Nette\Utils\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>';
 	}
 
 
@@ -204,25 +203,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 (Nette\Utils\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>';
 	}
 
 
@@ -347,9 +346,9 @@ 
 		if ($call = Helpers::findTrace($e->getPrevious()->getTrace(), $method)) {
 			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>'
 			];
 		}
 	}

Doc Comments +3 added lines, -1 removed lines

@@ -244,7 +244,7 @@ 
 
 
 	/**
-	 * @param \Exception|\Throwable $e
+	 * @param \Exception $e
 	 * @param string|NULL $domain
 	 */
 	public function choiceError($e, $domain)
@@ -362,6 +362,8 @@ 
 	/**
 	 * Returns link to editor.
 	 * @author David Grudl
+	 * @param integer $line
+	 * @param string $text
 	 * @return Nette\Utils\Html|string
 	 */
 	private static function editorLink($file, $line, $text = NULL)

src/CatalogueCompiler.php

Spacing +1 added lines, -1 removed lines

@@ -161,7 +161,7 @@
 			, $locale, $availableCatalogues[$locale]->all(), new Code\PhpLiteral($fallbackContent)
 		);
 
-		return '<?php' . "\n\n" . $content;
+		return '<?php'."\n\n".$content;
 	}
 
 

src/LocaleResolver/AcceptHeaderResolver.php

Spacing +4 added lines, -4 removed lines

@@ -65,10 +65,10 @@
 			return NULL;
 		}
 
-		$s = strtolower($header);  // case insensitive
-		$s = strtr($s, '_', '-');  // cs_CZ means cs-CZ
-		rsort($langs);             // first more specific
-		preg_match_all('#(' . implode('|', $langs) . ')(?:-[^\s,;=]+)?\s*(?:;\s*q=([0-9.]+))?#', $s, $matches);
+		$s = strtolower($header); // case insensitive
+		$s = strtr($s, '_', '-'); // cs_CZ means cs-CZ
+		rsort($langs); // first more specific
+		preg_match_all('#('.implode('|', $langs).')(?:-[^\s,;=]+)?\s*(?:;\s*q=([0-9.]+))?#', $s, $matches);
 
 		if (!$matches[0]) {
 			return NULL;