diff options
| -rw-r--r-- | src/linguist/shared/ts.cpp | 3 | ||||
| -rw-r--r-- | tests/auto/linguist/lupdate/testdata/good/merge_versions/project.ts.result | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/src/linguist/shared/ts.cpp b/src/linguist/shared/ts.cpp index a5daf7c90..3cf5f1d31 100644 --- a/src/linguist/shared/ts.cpp +++ b/src/linguist/shared/ts.cpp @@ -412,6 +412,9 @@ bool TSReader::read(Translator &translator) } else { handleError(); } + // if the file is empty adopt AbsoluteLocation (default location type for Translator) + if (translator.messageCount() == 0) + maybeAbsolute = true; translator.setLocationsType(maybeRelative ? Translator::RelativeLocations : maybeAbsolute ? Translator::AbsoluteLocations : Translator::NoLocations); diff --git a/tests/auto/linguist/lupdate/testdata/good/merge_versions/project.ts.result b/tests/auto/linguist/lupdate/testdata/good/merge_versions/project.ts.result index 51a15683d..2bd6d92f9 100644 --- a/tests/auto/linguist/lupdate/testdata/good/merge_versions/project.ts.result +++ b/tests/auto/linguist/lupdate/testdata/good/merge_versions/project.ts.result @@ -4,10 +4,12 @@ <context> <name>FindDialog</name> <message> + <location filename="project.ui" line="42"/> <source>Qt Assistant - Finn text</source> <translation></translation> </message> <message> + <location filename="project.ui" line="45"/> <source>Finn tekst</source> <translation type="unfinished"></translation> </message> |