Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
converse.js
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
converse.js
Commits
223d6d87
Commit
223d6d87
authored
Nov 27, 2015
by
Michal Čihař
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Implement merging of PO file comments
Issue #922 Signed-off-by:
Michal Čihař
<
michal@cihar.com
>
parent
d790aebc
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
0 deletions
+13
-0
weblate/trans/formats.py
weblate/trans/formats.py
+8
-0
weblate/trans/tests/data/cs.po
weblate/trans/tests/data/cs.po
+1
-0
weblate/trans/tests/test_files.py
weblate/trans/tests/test_files.py
+4
-0
No files found.
weblate/trans/formats.py
View file @
223d6d87
...
...
@@ -920,6 +920,14 @@ class PoFormat(FileFormat):
self
.
store
.
updateheader
(
**
update
)
header
=
self
.
store
.
header
()
newheader
=
otherstore
.
store
.
header
()
if
not
header
or
not
newheader
:
return
header
.
removenotes
()
header
.
addnote
(
newheader
.
getnotes
())
@
register_fileformat
class
PoMonoFormat
(
PoFormat
):
...
...
weblate/trans/tests/data/cs.po
View file @
223d6d87
...
...
@@ -2,6 +2,7 @@
# Copyright (C) 2012 THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
# Automatically generated, 2012.
# Testing Weblate, 2015.
#
msgid ""
msgstr ""
...
...
weblate/trans/tests/test_files.py
View file @
223d6d87
...
...
@@ -112,6 +112,10 @@ class ImportTest(ImportBaseTest):
self
.
assertEqual
(
header
[
'Language-Team'
],
'Test Team <noreply@weblate.org>'
)
self
.
assertIn
(
'Testing Weblate, 2015.'
,
unit
.
translation
.
store
.
store
.
header
().
getnotes
()
)
def
test_import_author
(
self
):
'''
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment