Merge remote-tracking branch 'origin/main' into main

weblate · weblate · commit 68aa770246b0 · 2021-05-12T16:12:27.000+02:00
diff --git a/py/makeqstrdata.py b/py/makeqstrdata.py
@@ -419,7 +419,6 @@ def compute_huffman_coding(translations, compression_filename):
 
     print("//", values, lengths)
     values = [(atom if len(atom) == 1 else chr(0x80 + words.index(atom))) for atom in values]
-    print("//", values, lengths)
     max_translation_encoded_length = max(
         len(translation.encode("utf-8")) for (original, translation) in translations
     )
diff --git a/tools/gen_display_resources.py b/tools/gen_display_resources.py
@@ -18,7 +18,7 @@
 parser.add_argument("--extra_characters", type=str, help="Unicode string of extra characters")
 parser.add_argument(
     "--sample_file",
-    type=argparse.FileType("r"),
+    type=argparse.FileType("r", encoding="utf-8"),
     help="Text file that includes strings to support.",
 )
 parser.add_argument("--output_c_file", type=argparse.FileType("w"), required=True)

Original file line number	Diff line number	Diff line change
`@@ -419,7 +419,6 @@ def compute_huffman_coding(translations, compression_filename):`
`419`	`419`
`420`	`420`	`print("//", values, lengths)`
`421`	`421`	`values = [(atom if len(atom) == 1 else chr(0x80 + words.index(atom))) for atom in values]`
`422`		`- print("//", values, lengths)`
`423`	`422`	`max_translation_encoded_length = max(`
`424`	`423`	`len(translation.encode("utf-8")) for (original, translation) in translations`
`425`	`424`	`)`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`parser.add_argument("--extra_characters", type=str, help="Unicode string of extra characters")`
`19`	`19`	`parser.add_argument(`
`20`	`20`	`"--sample_file",`
`21`		`- type=argparse.FileType("r"),`
	`21`	`+ type=argparse.FileType("r", encoding="utf-8"),`
`22`	`22`	`help="Text file that includes strings to support.",`
`23`	`23`	`)`
`24`	`24`	`parser.add_argument("--output_c_file", type=argparse.FileType("w"), required=True)`