Merge pull request #43 from cdfre/master

Keep empty strings, Yml line breaks
schmittjoh · May 31, 2012 · 019f103 · 019f103
2 parents a08ff9d + ebb7d4d
commit 019f103
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/Model/Message.php b/Model/Message.php
@@ -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);
     }
 
     /**

diff --git a/Translation/Dumper/YamlDumper.php b/Translation/Dumper/YamlDumper.php
@@ -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) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -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);
         }
         /**
@@ Expand Down @@