@@ -27,6 +27,7 @@ discard block |
||
| 27 | 27 | * |
| 28 | 28 | * @param string $format The format of the loader |
| 29 | 29 | * @param LoaderInterface $loader |
| 30 | + * @return void |
|
| 30 | 31 | */ |
| 31 | 32 | public function addLoader($format, LoaderInterface $loader); |
| 32 | 33 | |
@@ -45,6 +46,7 @@ discard block |
||
| 45 | 46 | * @param string $domain |
| 46 | 47 | * @param MessageCatalogue $catalogue |
| 47 | 48 | * @throws \Kdyby\Translation\LoaderNotFoundException |
| 49 | + * @return void |
|
| 48 | 50 | */ |
| 49 | 51 | public function loadResource($format, $resource, $domain, MessageCatalogue $catalogue); |
| 50 | 52 | |
@@ -117,7 +117,7 @@ discard block |
||
| 117 | 117 | |
| 118 | 118 | $builder->addDefinition($this->prefix('helpers')) |
| 119 | 119 | ->setClass(Kdyby\Translation\TemplateHelpers::class) |
| 120 | - ->setFactory($this->prefix('@default') . '::createTemplateHelpers'); |
|
| 120 | + ->setFactory($this->prefix('@default').'::createTemplateHelpers'); |
|
| 121 | 121 | |
| 122 | 122 | $builder->addDefinition($this->prefix('fallbackResolver')) |
| 123 | 123 | ->setClass(Kdyby\Translation\FallbackResolver::class); |
@@ -141,8 +141,8 @@ discard block |
||
| 141 | 141 | $builder->addDefinition($this->prefix('loader')) |
| 142 | 142 | ->setClass(Kdyby\Translation\TranslationLoader::class); |
| 143 | 143 | |
| 144 | - $loaders = $this->loadFromFile(__DIR__ . '/config/loaders.neon'); |
|
| 145 | - $this->loadLoaders($loaders, $config['loaders'] ? : array_keys($loaders)); |
|
| 144 | + $loaders = $this->loadFromFile(__DIR__.'/config/loaders.neon'); |
|
| 145 | + $this->loadLoaders($loaders, $config['loaders'] ?: array_keys($loaders)); |
|
| 146 | 146 | |
| 147 | 147 | if ($this->isRegisteredConsoleExtension()) { |
| 148 | 148 | $this->loadConsole($config); |
@@ -210,8 +210,8 @@ discard block |
||
| 210 | 210 | { |
| 211 | 211 | $builder = $this->getContainerBuilder(); |
| 212 | 212 | |
| 213 | - foreach ($this->loadFromFile(__DIR__ . '/config/dumpers.neon') as $format => $class) { |
|
| 214 | - $builder->addDefinition($this->prefix('dumper.' . $format)) |
|
| 213 | + foreach ($this->loadFromFile(__DIR__.'/config/dumpers.neon') as $format => $class) { |
|
| 214 | + $builder->addDefinition($this->prefix('dumper.'.$format)) |
|
| 215 | 215 | ->setClass($class) |
| 216 | 216 | ->addTag(self::TAG_DUMPER, $format); |
| 217 | 217 | } |
@@ -227,7 +227,7 @@ discard block |
||
| 227 | 227 | if (array_search($format, $allowed) === FALSE) { |
| 228 | 228 | continue; |
| 229 | 229 | } |
| 230 | - $builder->addDefinition($this->prefix('loader.' . $format)) |
|
| 230 | + $builder->addDefinition($this->prefix('loader.'.$format)) |
|
| 231 | 231 | ->setClass($class) |
| 232 | 232 | ->addTag(self::TAG_LOADER, $format); |
| 233 | 233 | } |
@@ -239,8 +239,8 @@ discard block |
||
| 239 | 239 | { |
| 240 | 240 | $builder = $this->getContainerBuilder(); |
| 241 | 241 | |
| 242 | - foreach ($this->loadFromFile(__DIR__ . '/config/extractors.neon') as $format => $class) { |
|
| 243 | - $builder->addDefinition($this->prefix('extractor.' . $format)) |
|
| 242 | + foreach ($this->loadFromFile(__DIR__.'/config/extractors.neon') as $format => $class) { |
|
| 243 | + $builder->addDefinition($this->prefix('extractor.'.$format)) |
|
| 244 | 244 | ->setClass($class) |
| 245 | 245 | ->addTag(self::TAG_EXTRACTOR, $format); |
| 246 | 246 | } |
@@ -255,7 +255,7 @@ discard block |
||
| 255 | 255 | |
| 256 | 256 | $this->beforeCompileLogging($config); |
| 257 | 257 | |
| 258 | - $registerToLatte = function (Nette\DI\ServiceDefinition $def) { |
|
| 258 | + $registerToLatte = function(Nette\DI\ServiceDefinition $def) { |
|
| 259 | 259 | $def->addSetup('?->onCompile[] = function($engine) { ?::install($engine->getCompiler()); }', ['@self', new Code\PhpLiteral(TranslateMacros::class)]); |
| 260 | 260 | |
| 261 | 261 | $def->addSetup('addProvider', ['translator', $this->prefix('@default')]) |
@@ -295,7 +295,7 @@ discard block |
||
| 295 | 295 | foreach ($builder->findByTag(self::TAG_EXTRACTOR) as $extractorId => $meta) { |
| 296 | 296 | Validators::assert($meta, 'string:2..'); |
| 297 | 297 | |
| 298 | - $extractor->addSetup('addExtractor', [$meta, '@' . $extractorId]); |
|
| 298 | + $extractor->addSetup('addExtractor', [$meta, '@'.$extractorId]); |
|
| 299 | 299 | |
| 300 | 300 | $builder->getDefinition($extractorId)->setAutowired(FALSE); |
| 301 | 301 | } |
@@ -304,7 +304,7 @@ discard block |
||
| 304 | 304 | foreach ($builder->findByTag(self::TAG_DUMPER) as $dumperId => $meta) { |
| 305 | 305 | Validators::assert($meta, 'string:2..'); |
| 306 | 306 | |
| 307 | - $writer->addSetup('addDumper', [$meta, '@' . $dumperId]); |
|
| 307 | + $writer->addSetup('addDumper', [$meta, '@'.$dumperId]); |
|
| 308 | 308 | |
| 309 | 309 | $builder->getDefinition($dumperId)->setAutowired(FALSE); |
| 310 | 310 | } |
@@ -327,7 +327,7 @@ discard block |
||
| 327 | 327 | $config['dirs'] = array_merge($config['dirs'], array_values($extension->getTranslationResources())); |
| 328 | 328 | } |
| 329 | 329 | |
| 330 | - $config['dirs'] = array_map(function ($dir) { |
|
| 330 | + $config['dirs'] = array_map(function($dir) { |
|
| 331 | 331 | return str_replace((DIRECTORY_SEPARATOR === '/') ? '\\' : '/', DIRECTORY_SEPARATOR, $dir); |
| 332 | 332 | }, $config['dirs']); |
| 333 | 333 | |
@@ -373,8 +373,8 @@ discard block |
||
| 373 | 373 | $whitelistRegexp = Kdyby\Translation\Translator::buildWhitelistRegexp($config['whitelist']); |
| 374 | 374 | $translator = $builder->getDefinition($this->prefix('default')); |
| 375 | 375 | |
| 376 | - $mask = array_map(function ($value) { |
|
| 377 | - return '*.*.' . $value; |
|
| 376 | + $mask = array_map(function($value) { |
|
| 377 | + return '*.*.'.$value; |
|
| 378 | 378 | }, array_keys($this->loaders)); |
| 379 | 379 | |
| 380 | 380 | foreach (Finder::findFiles($mask)->from($dirs) as $file) { |
@@ -474,7 +474,7 @@ discard block |
||
| 474 | 474 | */ |
| 475 | 475 | public static function register(Nette\Configurator $configurator) |
| 476 | 476 | { |
| 477 | - $configurator->onCompile[] = function ($config, Nette\DI\Compiler $compiler) { |
|
| 477 | + $configurator->onCompile[] = function($config, Nette\DI\Compiler $compiler) { |
|
| 478 | 478 | $compiler->addExtension('translation', new TranslationExtension()); |
| 479 | 479 | }; |
| 480 | 480 | } |
@@ -94,7 +94,7 @@ discard block |
||
| 94 | 94 | public function getTab() |
| 95 | 95 | { |
| 96 | 96 | 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" />' |
| 97 | - . $this->translator->getLocale() . ($this->untranslated ? ' <b>(' . count(array_unique($this->untranslated, SORT_REGULAR)) . ' errors)</b>' : '') |
|
| 97 | + . $this->translator->getLocale().($this->untranslated ? ' <b>('.count(array_unique($this->untranslated, SORT_REGULAR)).' errors)</b>' : '') |
|
| 98 | 98 | . '</span>'; |
| 99 | 99 | } |
| 100 | 100 | |
@@ -127,16 +127,16 @@ discard block |
||
| 127 | 127 | |
| 128 | 128 | /** @var Request[] $snapshot */ |
| 129 | 129 | $params = $snapshot['request']->getParameters(); |
| 130 | - $s .= '<tr><th width="10px"> </th>' . |
|
| 131 | - '<th>' . $h($snapshot['request']->getPresenterName() . (isset($params['action']) ? ':' . $params['action'] : '')) . '</th>' . |
|
| 132 | - '<th>' . $h($snapshot['locale']) . '</th></tr>'; |
|
| 130 | + $s .= '<tr><th width="10px"> </th>'. |
|
| 131 | + '<th>'.$h($snapshot['request']->getPresenterName().(isset($params['action']) ? ':'.$params['action'] : '')).'</th>'. |
|
| 132 | + '<th>'.$h($snapshot['locale']).'</th></tr>'; |
|
| 133 | 133 | |
| 134 | 134 | $l = 1; |
| 135 | 135 | foreach ($snapshot['resolvers'] as $name => $resolvedLocale) { |
| 136 | - $s .= '<tr><td>' . ($l++) . '.</td><td>' . $h($name) . '</td><td>' . $h($resolvedLocale) . '</td></tr>'; |
|
| 136 | + $s .= '<tr><td>'.($l++).'.</td><td>'.$h($name).'</td><td>'.$h($resolvedLocale).'</td></tr>'; |
|
| 137 | 137 | } |
| 138 | 138 | |
| 139 | - $panel[] = '<table style="width:100%">' . $s . '</table>'; |
|
| 139 | + $panel[] = '<table style="width:100%">'.$s.'</table>'; |
|
| 140 | 140 | } |
| 141 | 141 | } |
| 142 | 142 | |
@@ -154,14 +154,13 @@ discard block |
||
| 154 | 154 | } |
| 155 | 155 | |
| 156 | 156 | $panel[] = '<h2>Ignored resources</h2>'; |
| 157 | - $panel[] = '<p>Whitelist config: ' . implode(', ', array_map($h, $this->localeWhitelist)) . '</p>'; |
|
| 157 | + $panel[] = '<p>Whitelist config: '.implode(', ', array_map($h, $this->localeWhitelist)).'</p>'; |
|
| 158 | 158 | $panel[] = $this->renderResources($this->ignoredResources); |
| 159 | 159 | } |
| 160 | 160 | |
| 161 | - return empty($panel) ? '' : |
|
| 162 | - '<h1>Missing translations: ' . count(array_unique($this->untranslated, SORT_REGULAR)) . |
|
| 163 | - ', Resources: ' . count(Nette\Utils\Arrays::flatten($this->resources)) . '</h1>' . |
|
| 164 | - '<div class="nette-inner tracy-inner kdyby-TranslationPanel" style="min-width:500px">' . implode($panel) . '</div>' . |
|
| 161 | + return empty($panel) ? '' : '<h1>Missing translations: '.count(array_unique($this->untranslated, SORT_REGULAR)). |
|
| 162 | + ', Resources: '.count(Nette\Utils\Arrays::flatten($this->resources)).'</h1>'. |
|
| 163 | + '<div class="nette-inner tracy-inner kdyby-TranslationPanel" style="min-width:500px">'.implode($panel).'</div>'. |
|
| 165 | 164 | '<style> |
| 166 | 165 | #nette-debug .kdyby-TranslationPanel h2, |
| 167 | 166 | #tracy-debug .kdyby-TranslationPanel h2 {font-size: 23px;} |
@@ -181,19 +180,19 @@ discard block |
||
| 181 | 180 | $s .= '<tr><td>'; |
| 182 | 181 | |
| 183 | 182 | if ($message instanceof \Exception || $message instanceof \Throwable) { |
| 184 | - $s .= '<span style="color:red">' . $h($message->getMessage()) . '</span>'; |
|
| 183 | + $s .= '<span style="color:red">'.$h($message->getMessage()).'</span>'; |
|
| 185 | 184 | |
| 186 | 185 | } elseif ($message instanceof Nette\Utils\Html) { |
| 187 | - $s .= '<span style="color:red">Nette\Utils\Html(' . $h((string) $message) . ')</span>'; |
|
| 186 | + $s .= '<span style="color:red">Nette\Utils\Html('.$h((string) $message).')</span>'; |
|
| 188 | 187 | |
| 189 | 188 | } else { |
| 190 | 189 | $s .= $h($message); |
| 191 | 190 | } |
| 192 | 191 | |
| 193 | - $s .= '</td><td>' . $h($untranslated['domain']) . '</td></tr>'; |
|
| 192 | + $s .= '</td><td>'.$h($untranslated['domain']).'</td></tr>'; |
|
| 194 | 193 | } |
| 195 | 194 | |
| 196 | - return '<table style="width:100%"><tr><th>Untranslated message</th><th>Translation domain</th></tr>' . $s . '</table>'; |
|
| 195 | + return '<table style="width:100%"><tr><th>Untranslated message</th><th>Translation domain</th></tr>'.$s.'</table>'; |
|
| 197 | 196 | } |
| 198 | 197 | |
| 199 | 198 | |
@@ -207,25 +206,25 @@ discard block |
||
| 207 | 206 | foreach ($resourcesMap as $locale => $resources) { |
| 208 | 207 | foreach ($resources as $resourcePath => $domain) { |
| 209 | 208 | $s .= '<tr>'; |
| 210 | - $s .= '<td>' . $h($locale) . '</td>'; |
|
| 211 | - $s .= '<td>' . $h($domain) . '</td>'; |
|
| 209 | + $s .= '<td>'.$h($locale).'</td>'; |
|
| 210 | + $s .= '<td>'.$h($domain).'</td>'; |
|
| 212 | 211 | |
| 213 | - $relativePath = str_replace(rtrim($this->rootDir, '/') . '/', '', $resourcePath); |
|
| 212 | + $relativePath = str_replace(rtrim($this->rootDir, '/').'/', '', $resourcePath); |
|
| 214 | 213 | if (Nette\Utils\Strings::startsWith($relativePath, 'vendor/')) { |
| 215 | 214 | $parts = explode('/', $relativePath, 4); |
| 216 | 215 | $left = array_pop($parts); |
| 217 | - $relativePath = $h(implode('/', $parts) . '/.../') . '<b>' . $h(basename($left)) . '</b>'; |
|
| 216 | + $relativePath = $h(implode('/', $parts).'/.../').'<b>'.$h(basename($left)).'</b>'; |
|
| 218 | 217 | |
| 219 | 218 | } else { |
| 220 | - $relativePath = $h(dirname($relativePath)) . '/<b>' . $h(basename($relativePath)) . '</b>'; |
|
| 219 | + $relativePath = $h(dirname($relativePath)).'/<b>'.$h(basename($relativePath)).'</b>'; |
|
| 221 | 220 | } |
| 222 | 221 | |
| 223 | - $s .= '<td>' . self::editorLink($resourcePath, 1, $relativePath) . '</td>'; |
|
| 222 | + $s .= '<td>'.self::editorLink($resourcePath, 1, $relativePath).'</td>'; |
|
| 224 | 223 | $s .= '</tr>'; |
| 225 | 224 | } |
| 226 | 225 | } |
| 227 | 226 | |
| 228 | - return '<table style="width:100%"><tr><th>Locale</th><th>Domain</th><th>Resource filename</th></tr>' . $s . '</table>'; |
|
| 227 | + return '<table style="width:100%"><tr><th>Locale</th><th>Domain</th><th>Resource filename</th></tr>'.$s.'</table>'; |
|
| 229 | 228 | } |
| 230 | 229 | |
| 231 | 230 | |
@@ -347,13 +346,13 @@ discard block |
||
| 347 | 346 | return NULL; |
| 348 | 347 | } |
| 349 | 348 | |
| 350 | - $method = YamlFileLoader::class . '::load'; |
|
| 349 | + $method = YamlFileLoader::class.'::load'; |
|
| 351 | 350 | if ($call = Helpers::findTrace($e->getPrevious()->getTrace(), $method)) { |
| 352 | 351 | return [ |
| 353 | 352 | 'tab' => 'YAML dictionary', |
| 354 | - 'panel' => '<p><b>File:</b> ' . self::editorLink($call['args'][0], $previous->getParsedLine()) . '</p>' |
|
| 353 | + 'panel' => '<p><b>File:</b> '.self::editorLink($call['args'][0], $previous->getParsedLine()).'</p>' |
|
| 355 | 354 | . ($previous->getParsedLine() ? BlueScreen::highlightFile($call['args'][0], $previous->getParsedLine()) : '') |
| 356 | - . '<p>' . $previous->getMessage() . ' </p>' |
|
| 355 | + . '<p>'.$previous->getMessage().' </p>' |
|
| 357 | 356 | ]; |
| 358 | 357 | } |
| 359 | 358 | } |
@@ -56,7 +56,7 @@ discard block |
||
| 56 | 56 | $value = var_export($node->content, TRUE); |
| 57 | 57 | $node->content = ''; |
| 58 | 58 | } else { |
| 59 | - $node->openingCode = '<?php ob_start(function () {}) ?>' . $node->openingCode; |
|
| 59 | + $node->openingCode = '<?php ob_start(function () {}) ?>'.$node->openingCode; |
|
| 60 | 60 | $value = 'ob_get_clean()'; |
| 61 | 61 | } |
| 62 | 62 | |
@@ -91,7 +91,7 @@ discard block |
||
| 91 | 91 | throw new Latte\CompileException('Expected message prefix, none given'); |
| 92 | 92 | } |
| 93 | 93 | |
| 94 | - return $writer->write('$_translator = ' . PrefixedTranslator::class . '::register($this, %node.word);'); |
|
| 94 | + return $writer->write('$_translator = '.PrefixedTranslator::class.'::register($this, %node.word);'); |
|
| 95 | 95 | } |
| 96 | 96 | } |
| 97 | 97 | |
@@ -78,7 +78,7 @@ discard block |
||
| 78 | 78 | { |
| 79 | 79 | if (!$this->session->isStarted() && $this->httpResponse->isSent()) { |
| 80 | 80 | trigger_error( |
| 81 | - 'The advice of session locale resolver is required but the session has not been started and headers had been already sent. ' . |
|
| 81 | + 'The advice of session locale resolver is required but the session has not been started and headers had been already sent. '. |
|
| 82 | 82 | 'Either start your sessions earlier or disabled the SessionResolver.', |
| 83 | 83 | E_USER_WARNING |
| 84 | 84 | ); |
@@ -89,7 +89,7 @@ discard block |
||
| 89 | 89 | return NULL; |
| 90 | 90 | } |
| 91 | 91 | |
| 92 | - $short = array_map(function ($locale) { |
|
| 92 | + $short = array_map(function($locale) { |
|
| 93 | 93 | return substr($locale, 0, 2); |
| 94 | 94 | }, $translator->getAvailableLocales()); |
| 95 | 95 | |