Skip to content

Commit a7b5ad7

Browse files
committed
Changed Twine format padding.
Removed \t padding. Added extra space before [key] definition
1 parent 7a1a4cd commit a7b5ad7

File tree

5 files changed

+43
-34
lines changed

5 files changed

+43
-34
lines changed
Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,19 @@
11
[[Section]]
2-
[value_with_leading_accent]
3-
en = `value
4-
[value_with_trailing_accent]
5-
en = value`
6-
[value_with_leading_space]
7-
en = ` value`
8-
[value_with_trailing_space]
9-
en = `value `
10-
[value_wrapped_by_spaces]
11-
en = ` value `
12-
[value_wrapped_by_accents]
13-
en = ``value``
2+
3+
[value_with_leading_accent]
4+
en = `value
5+
6+
[value_with_trailing_accent]
7+
en = value`
8+
9+
[value_with_leading_space]
10+
en = ` value`
11+
12+
[value_with_trailing_space]
13+
en = `value `
14+
15+
[value_wrapped_by_spaces]
16+
en = ` value `
17+
18+
[value_wrapped_by_accents]
19+
en = ``value``
Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
[[Bookmarks]]
2-
[bookmarks_places]
3-
comment = Number of bookmarks on UI
4-
en:one = %d bookmark
5-
en:other = %d bookmarks
6-
ru:one = %d метка
7-
ru:few = %d метки
8-
ru:many = %d меток
9-
ru:other = %d меток
2+
3+
[bookmarks_places]
4+
comment = Number of bookmarks on UI
5+
en:one = %d bookmark
6+
en:other = %d bookmarks
7+
ru:one = %d метка
8+
ru:few = %d метки
9+
ru:many = %d меток
10+
ru:other = %d меток

python_twine/tests/test_formatters_plural.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -130,9 +130,10 @@ def test_write_plural_format(self):
130130
twine_content = fout.read()
131131

132132
assert twine_content == """[[OSM]]
133-
\t[num_edits]
134-
\t\ten:one = %d edit
135-
\t\ten:other = %d edits
133+
134+
[num_edits]
135+
en:one = %d edit
136+
en:other = %d edits
136137
"""
137138

138139
def test_read_plurals(self, fixtures_dir):

python_twine/tests/test_twine_file.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -192,11 +192,12 @@ def test_write_file(self):
192192
content = f.read()
193193

194194
assert content == """[[Test]]
195-
\t[test_key]
196-
\t\tcomment = A test string
197-
\t\ttags = test
198-
\t\ten = Test
199-
\t\tes = Prueba
195+
196+
[test_key]
197+
comment = A test string
198+
tags = test
199+
en = Test
200+
es = Prueba
200201
"""
201202
finally:
202203
Path(temp_path).unlink()

python_twine/twine/twine_file.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -371,20 +371,20 @@ def write(self, path: str):
371371
f.write(f"[[{section.name}]]\n")
372372

373373
for definition in section.definitions:
374-
f.write(f"\t[{definition.key}]\n")
374+
f.write(f"\n[{definition.key}]\n")
375375

376376
# Write comment
377377
if definition.raw_comment:
378-
f.write(f"\t\tcomment = {definition.raw_comment}\n")
378+
f.write(f"comment = {definition.raw_comment}\n")
379379

380380
# Write reference
381381
if definition.reference_key:
382-
f.write(f"\t\tref = {definition.reference_key}\n")
382+
f.write(f"ref = {definition.reference_key}\n")
383383

384384
# Write tags
385385
if definition.tags:
386386
tag_str = ",".join(definition.tags)
387-
f.write(f"\t\ttags = {tag_str}\n")
387+
f.write(f"tags = {tag_str}\n")
388388

389389
# Write developer language first
390390
if dev_lang:
@@ -413,12 +413,12 @@ def _write_value(
413413
# ru:other = %d меток
414414
output = ""
415415
for quantity, value in definition.plural_translation_for_lang(language).items():
416-
output += f"\t\t{language}:{quantity} = {escape_spaces_backticks(value)}\n"
416+
output += f"{language}:{quantity} = {escape_spaces_backticks(value)}\n"
417417

418418
elif language in definition.translations:
419419
singular_value = definition.translations[language]
420420
# Write singular
421-
output = f"\t\t{language} = {escape_spaces_backticks(singular_value)}\n"
421+
output = f"{language} = {escape_spaces_backticks(singular_value)}\n"
422422

423423
if output:
424424
file.write(output)

0 commit comments

Comments
 (0)