Skip to content

fixes: translating "non-id" messages (containing spaces) #107

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

Closed
EaredSeal wants to merge 2 commits into from
Closed

fixes: translating "non-id" messages (containing spaces) #107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
476029b
fixes: translating "non-id" messages (containing spaces)
May 2, 2016
cf2c4cb
fixes: translating "non-id" messages (containing spaces)
May 2, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions src/Kdyby/Translation/Translator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -424,9 +424,16 @@ protected function assertValidLocale($locale)
*/
private function extractMessageDomain($message)
{
if (strpos($message, '.') !== FALSE && strpos($message, ' ') === FALSE) {
list($domain, $message) = explode('.', $message, 2);
if (strpos($message, '.') !== FALSE) {
if(strrpos($message, '//') === 0) {
list($domain, $message) = explode('.', substr($message, 2), 2);

} elseif (strpos($message, ' ') === FALSE) {
list($domain, $message) = explode('.', $message, 2);

} else {
$domain = 'messages';
}
} else {
$domain = 'messages';
}
Expand Down
1 change: 1 addition & 0 deletions tests/KdybyTests/Translation/PrefixedTranslator.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ class PrefixedTranslatorTest extends TestCase

Assert::same('Use 5 credits', $prefixed->translate(new Kdyby\Translation\Phrase('//front.orderForm.useCredits', 5)));
}

}

\run(new PrefixedTranslatorTest());
8 changes: 8 additions & 0 deletions tests/KdybyTests/Translation/Translator.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,14 @@ class TranslatorTest extends TestCase
Assert::same("Ahoj světe", $translator->translate('Hello World')); // default domain is 'messages'
}

public function testGlobalNonIdTranslations()
{
$translator = $this->createTranslator();
$translator->setLocale('en');

Assert::same('Welcome in my world', $translator->translate("//front.homepage.Hello world"));
Assert::same('Hello world', $translator->translate("//front.homepage.hello"));
}
}

\run(new TranslatorTest());
1 change: 1 addition & 0 deletions tests/KdybyTests/Translation/lang/front.en_US.neon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ homepage:
hello: Hello world
namedHello: Hello %name%
namedHelloCounting: Hello %name%|Helloes %name%
"Hello world": Welcome in my world

noescape:
hello: Hello <b>world</b>
Expand Down