Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 5 additions & 3 deletions src/Generator/MoGenerator.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,13 @@ public function generateString(Translations $translations): string
}

foreach ($translations as $translation) {
if (!$translation->getTranslation() || $translation->isDisabled()) {
if (!$translation->isTranslated() || $translation->isDisabled()) {
continue;
}

if ($context = $translation->getContext()) {
$context = $translation->getContext();

if ($context !== null && $context !== '') {
$originalString = "{$context}\x04{$translation->getOriginal()}";
} else {
$originalString = $translation->getOriginal();
Expand Down Expand Up @@ -142,7 +144,7 @@ public function generateString(Translations $translations): string

private static function hasPluralTranslations(Translation $translation): bool
{
if (!$translation->getPlural()) {
if ($translation->getPlural() === null || $translation->getPlural() === '') {
return false;
}

Expand Down
35 changes: 25 additions & 10 deletions src/Generator/PoGenerator.php
Original file line number Diff line number Diff line change
Expand Up @@ -65,33 +65,38 @@ public function generateString(Translations $translations): string

$prefix = $translation->isDisabled() ? '#~ ' : '';

if ($context = $translation->getPreviousContext()) {
$lines[] = sprintf('%s#| msgctxt %s', $prefix, self::encode($context));
$previousContext = $translation->getPreviousContext();
if (self::hasValue($previousContext)) {
$lines[] = sprintf('%s#| msgctxt %s', $prefix, self::encode($previousContext));
}

if ($original = $translation->getPreviousOriginal()) {
$lines[] = sprintf('%s#| msgid %s', $prefix, self::encode($original));
$previousOriginal = $translation->getPreviousOriginal();
if (self::hasValue($previousOriginal)) {
$lines[] = sprintf('%s#| msgid %s', $prefix, self::encode($previousOriginal));
}

if ($plural = $translation->getPreviousPlural()) {
$lines[] = sprintf('%s#| msgid_plural %s', $prefix, self::encode($plural));
$previousPlural = $translation->getPreviousPlural();
if (self::hasValue($previousPlural)) {
$lines[] = sprintf('%s#| msgid_plural %s', $prefix, self::encode($previousPlural));
}

if ($context = $translation->getContext()) {
$context = $translation->getContext();
if (self::hasValue($context)) {
$lines[] = sprintf('%smsgctxt %s', $prefix, self::encode($context));
}

self::appendLines($lines, $prefix, 'msgid', $translation->getOriginal());

if ($plural = $translation->getPlural()) {
$plural = $translation->getPlural();
if (self::hasValue($plural)) {
self::appendLines($lines, $prefix, 'msgid_plural', $plural);
self::appendLines($lines, $prefix, 'msgstr[0]', $translation->getTranslation() ?: '');
self::appendLines($lines, $prefix, 'msgstr[0]', $translation->getTranslation() ?? '');

foreach ($translation->getPluralTranslations($pluralSize) as $k => $v) {
self::appendLines($lines, $prefix, sprintf('msgstr[%d]', $k + 1), $v);
}
} else {
self::appendLines($lines, $prefix, 'msgstr', $translation->getTranslation() ?: '');
self::appendLines($lines, $prefix, 'msgstr', $translation->getTranslation() ?? '');
}

$lines[] = '';
Expand All @@ -100,6 +105,16 @@ public function generateString(Translations $translations): string
return implode("\n", $lines);
}

/**
* Checks whether a string is set and not empty. Unlike a truthiness check, "0" is a valid value.
*
* @phpstan-assert-if-true string $value
*/
private static function hasValue(?string $value): bool
{
return $value !== null && $value !== '';
}

/**
* Add one or more lines depending whether the string is multiline or not.
*/
Expand Down
8 changes: 2 additions & 6 deletions src/Loader/PoLoader.php
Original file line number Diff line number Diff line change
Expand Up @@ -218,14 +218,10 @@ public static function decode(string $value): string

private static function isEmpty(Translation $translation): bool
{
if (!empty($translation->getOriginal())) {
if ($translation->getOriginal() !== '') {
return false;
}

if (!empty($translation->getTranslation())) {
return false;
}

return true;
return !$translation->isTranslated();
}
}
20 changes: 15 additions & 5 deletions src/Translation.php
Original file line number Diff line number Diff line change
Expand Up @@ -261,23 +261,25 @@ public function mergeWith(Translation $translation, int $strategy = 0): Translat

$override = (bool) ($strategy & Merge::TRANSLATIONS_OVERRIDE);

if (!$merged->translation || ($translation->translation && $override)) {
if (!self::hasValue($merged->translation) || (self::hasValue($translation->translation) && $override)) {
$merged->translation = $translation->translation;
}

if (!$merged->plural || ($translation->plural && $override)) {
if (!self::hasValue($merged->plural) || (self::hasValue($translation->plural) && $override)) {
$merged->plural = $translation->plural;
}

if (!$merged->previousContext || ($translation->previousContext && $override)) {
if (!self::hasValue($merged->previousContext) || (self::hasValue($translation->previousContext) && $override)) {
$merged->previousContext = $translation->previousContext;
}

if (!$merged->previousOriginal || ($translation->previousOriginal && $override)) {
if (!self::hasValue($merged->previousOriginal)
|| (self::hasValue($translation->previousOriginal) && $override)
) {
$merged->previousOriginal = $translation->previousOriginal;
}

if (!$merged->previousPlural || ($translation->previousPlural && $override)) {
if (!self::hasValue($merged->previousPlural) || (self::hasValue($translation->previousPlural) && $override)) {
$merged->previousPlural = $translation->previousPlural;
}

Expand All @@ -289,4 +291,12 @@ public function mergeWith(Translation $translation, int $strategy = 0): Translat

return $merged;
}

/**
* Checks whether a string is set and not empty. Unlike a truthiness check, "0" is a valid value.
*/
private static function hasValue(?string $value): bool
{
return $value !== null && $value !== '';
}
}
33 changes: 33 additions & 0 deletions tests/BasePoLoaderTestCase.php
Original file line number Diff line number Diff line change
Expand Up @@ -286,4 +286,37 @@ public function testMultilineDisabledTranslations(): void
$translation->getTranslation()
);
}

public function testZeroStrings(): void
{
$po = <<<'EOT'
msgid ""
msgstr ""
"Language: gl\n"

msgid "0"
msgstr ""

msgctxt "start of week"
msgid "1"
msgstr "0"

msgctxt "0"
msgid "Zero context"
msgstr "Translated"
EOT;
$translations = $this->createPoLoader()->loadString($po);

$this->assertCount(3, $translations);

$translation = $translations->find(null, '0');
$this->assertNotNull($translation);
$this->assertFalse($translation->isTranslated());

$translation = $translations->find('start of week', '1');
$this->assertNotNull($translation);
$this->assertSame('0', $translation->getTranslation());

$this->assertNotNull($translations->find('0', 'Zero context'));
}
}
28 changes: 28 additions & 0 deletions tests/MoGeneratorTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -54,4 +54,32 @@ public function testMoGenerator(): void
$this->assertCount(4, $result);
$this->assertCount(5, $result->getHeaders());
}

public function testZeroStrings(): void
{
$translations = Translations::create();

$translation = Translation::create('0', '1');
$translation->translate('0');
$translations->add($translation);

$translation = Translation::create(null, 'One');
$translation->setPlural('0');
$translation->translate('Singular');
$translation->translatePlural('Plural');
$translations->add($translation);

$result = (new MoLoader())->loadString((new MoGenerator())->generateString($translations));

$this->assertCount(2, $result);

$translation = $result->find('0', '1');
$this->assertNotNull($translation);
$this->assertSame('0', $translation->getTranslation());

$translation = $result->find(null, 'One');
$this->assertNotNull($translation);
$this->assertSame('0', $translation->getPlural());
$this->assertSame(['Plural'], $translation->getPluralTranslations());
}
}
36 changes: 36 additions & 0 deletions tests/PoGeneratorTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -114,4 +114,40 @@ public function testStringEncode(string $encoded, string $decoded): void
{
$this->assertSame($encoded, PoGenerator::encode($decoded));
}

public function testZeroStrings(): void
{
$translations = Translations::create();

$translation = Translation::create('0', '1');
$translation->translate('0');
$translation->setPreviousContext('0');
$translation->setPreviousOriginal('0');
$translations->add($translation);

$translation = Translation::create(null, 'One');
$translation->setPlural('0');
$translation->translate('0');
$translation->translatePlural('0');
$translations->add($translation);

$expected = <<<'EOT'
msgid ""
msgstr ""

#| msgctxt "0"
#| msgid "0"
msgctxt "0"
msgid "1"
msgstr "0"

msgid "One"
msgid_plural "0"
msgstr[0] "0"
msgstr[1] "0"

EOT;

$this->assertSame($expected, (new PoGenerator())->generateString($translations));
}
}
26 changes: 26 additions & 0 deletions tests/TranslationTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

use Gettext\Comments;
use Gettext\Flags;
use Gettext\Merge;
use Gettext\References;
use Gettext\Translation;
use PHPUnit\Framework\TestCase;
Expand Down Expand Up @@ -99,4 +100,29 @@ public function testMergeTranslation(): void
$this->assertNotSame($merged, $translation1);
$this->assertNotSame($merged, $translation2);
}

public function testMergeKeepsZeroStrings(): void
{
$translation1 = Translation::create(null, '1');
$translation1->setPlural('0');
$translation1->translate('0');

$translation2 = Translation::create(null, '1');
$translation2->setPlural('Plural');
$translation2->translate('One');

$merged = $translation1->mergeWith($translation2);

$this->assertSame('0', $merged->getTranslation());
$this->assertSame('0', $merged->getPlural());

$merged = $translation1->mergeWith(Translation::create(null, '1'), Merge::TRANSLATIONS_OVERRIDE);

$this->assertSame('0', $merged->getTranslation());

$merged = $translation2->mergeWith($translation1, Merge::TRANSLATIONS_OVERRIDE);

$this->assertSame('0', $merged->getTranslation());
$this->assertSame('0', $merged->getPlural());
}
}
Loading