Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Keep empty strings, Yml line breaks #43

Merged
merged 3 commits into from

2 participants

David Frerich Johannes
David Frerich

This PR is fixes the 2 issues I reported.

Johannes schmittjoh merged commit 019f103 into from
Johannes
Owner

Thanks!

This was referenced
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on May 31, 2012
  1. David Frerich
  2. David Frerich

    Keep empty strings

    cdfre authored
  3. David Frerich

    tabs => spaces

    cdfre authored
This page is out of date. Refresh to see the latest.
Showing with 2 additions and 1 deletion.
  1. +1 −1  Model/Message.php
  2. +1 −0  Translation/Dumper/YamlDumper.php
2  Model/Message.php
View
@@ -116,7 +116,7 @@ public function isNew()
public function getLocaleString()
{
- return $this->localeString ?: ($this->desc ?: $this->id);
+ return $this->localeString !== null ? $this->localeString : ($this->desc !== null ? $this->desc : $this->id);
}
/**
1  Translation/Dumper/YamlDumper.php
View
@@ -53,6 +53,7 @@ private function dumpStructureRecursively(array $structure)
}
if ($desc) {
+ $desc = str_replace(array("\r\n", "\n", "\r", "\t"), array('\r\n', '\n', '\r', '\t'), $desc);
$this->writer->writeln('# Desc: '.$desc);
}
if ($meaning) {
Something went wrong with that request. Please try again.