Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

prepare for Nette 2.4 #108

Closed
wants to merge 3 commits into from
Closed

prepare for Nette 2.4 #108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7f3e9e6
prepare to Nette 2.4
JanGalek May 14, 2016
5d70707
Travis: added test for nette-2.4
JanGalek May 14, 2016
d2f7488
Travis: remove before_install tmp/composer-nette
JanGalek May 14, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Expand Up @@ -15,6 +15,7 @@ php:

env:
matrix:
- NETTE=nette-2.4
- NETTE=nette-2.3-dev
- NETTE=nette-2.3

Expand All @@ -28,7 +29,6 @@ matrix:
before_install:
- travis_retry composer self-update
- wget -O /tmp/composer-nette https://raw.githubusercontent.com/Kdyby/TesterExtras/master/bin/composer-nette.php
- php /tmp/composer-nette

install:
- travis_retry composer update --no-interaction --prefer-dist $COMPOSER_EXTRA_ARGS
Expand Down
52 changes: 26 additions & 26 deletions composer.json 100644 → 100755
View file
Open in desktop
Expand Up @@ -17,15 +17,15 @@
"issues": "https://github.com/kdyby/translation/issues"
},
"require": {
"latte/latte": "~2.3@dev",
"nette/caching": "~2.3@dev",
"nette/di": "~2.3@dev",
"nette/finder": "~2.3@dev",
"nette/http": "~2.3@dev",
"nette/neon": "~2.3@dev",
"nette/php-generator": "~2.3@dev",
"nette/reflection": "~2.3@dev",
"nette/utils": "~2.3@dev",
"latte/latte": "dev-master",
"nette/caching": "~2.4@dev",
"nette/di": "~2.4@dev",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is not good, because you won't be able to install older nette

"nette/finder": "~2.4@dev",
"nette/http": "~2.4@dev",
"nette/neon": "~2.4@dev",
"nette/php-generator": "~2.4@dev",
"nette/reflection": "~2.4@dev",
"nette/utils": "~2.4@dev",

"psr/log": "^1.0",
"symfony/translation": "~2.5",
Expand All @@ -39,27 +39,27 @@
"symfony/yaml": "If you wanna store translations in YAML format - supports multiline strings."
},
"require-dev": {
"nette/application": "~2.3@dev",
"nette/bootstrap": "~2.3@dev",
"nette/caching": "~2.3@dev",
"nette/application": "~2.4@dev",
"nette/bootstrap": "~2.4@dev",
"nette/caching": "~2.4@dev",
"nette/component-model": "~2.2@dev",
"nette/database": "~2.3@dev",
"nette/database": "~2.4@dev",
"nette/deprecated": "~2.2@dev",
"nette/di": "~2.3@dev",
"nette/finder": "~2.3@dev",
"nette/forms": "~2.3@dev",
"nette/http": "~2.3@dev",
"nette/mail": "~2.3@dev",
"nette/neon": "~2.3@dev",
"nette/php-generator": "~2.3@dev",
"nette/reflection": "~2.3@dev",
"nette/robot-loader": "~2.3@dev",
"nette/di": "~2.4@dev",
"nette/finder": "~2.4@dev",
"nette/forms": "~2.4@dev",
"nette/http": "~2.4@dev",
"nette/mail": "~2.4@dev",
"nette/neon": "~2.4@dev",
"nette/php-generator": "~2.4@dev",
"nette/reflection": "~2.4@dev",
"nette/robot-loader": "~2.4@dev",
"nette/safe-stream": "~2.3@dev",
"nette/security": "~2.3@dev",
"nette/security": "~2.4@dev",
"nette/tokenizer": "~2.2@dev",
"nette/utils": "~2.3@dev",
"latte/latte": "~2.3@dev",
"tracy/tracy": "~2.3@dev",
"nette/utils": "~2.4@dev",
"latte/latte": "~2.4@dev",
"tracy/tracy": "~2.4@dev",

"kdyby/monolog": "^1.2@dev",
"symfony/console": "~2.3",
Expand Down
Empty file modified license.md 100644 → 100755
View file
Open in desktop
Empty file.
6 changes: 3 additions & 3 deletions src/Kdyby/Translation/Latte/TranslateMacros.php
View file
Open in desktop
Expand Up @@ -47,14 +47,14 @@ public static function install(Compiler $compiler)
public function macroTranslate(MacroNode $node, PhpWriter $writer)
{
if ($node->closing) {
return $writer->write('echo %modify($template->translate(ob_get_clean()))');
return $writer->write('$_fi = new LR\FilterInfo(\Latte\Engine::CONTENT_TEXT); echo $this->filters->filterContent("translate", $_fi, ob_get_clean())');

} elseif ($node->isEmpty = ($node->args !== '')) {
if ($this->containsOnlyOneWord($node)) {
return $writer->write('echo %modify($template->translate(%node.word))');
return $writer->write('$_fi = new LR\FilterInfo(\Latte\Engine::CONTENT_TEXT); echo $this->filters->filterContent("translate", $_fi, %node.word)');

} else {
return $writer->write('echo %modify($template->translate(%node.word, %node.args))');
return $writer->write('$_fi = new LR\FilterInfo(\Latte\Engine::CONTENT_TEXT); echo $this->filters->filterContent("translate", $_fi, %node.word, %node.args)');
}

} else {
Expand Down