Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: cdfre/JMSTranslationBundle
base: a08ff9d599
...
head fork: cdfre/JMSTranslationBundle
compare: aa21340cff
Checking mergeability… Don't worry, you can still create the pull request.
  • 2 commits
  • 2 files changed
  • 0 commit comments
  • 1 contributor
Showing with 2 additions and 1 deletion.
  1. +1 −1  Model/Message.php
  2. +1 −0  Translation/Dumper/YamlDumper.php
View
2  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);
}
/**
View
1  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) {

No commit comments for this range

Something went wrong with that request. Please try again.