Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Drop dependency from translate-toolkit, use etree.indent() #9855

Merged
merged 1 commit into from
Sep 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions requirements.in
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
aqtinstall==3.1.15
glean-parser==13.0.0
oathtool==2.3.2
pyrsistent==0.20.0
yamllint==1.35.1
aqtinstall==3.1.15
translate-toolkit==3.13.*

# Windows-only dependency included via glean-parser.
# Dependabot misses this, so let's make it explict.
Expand Down
164 changes: 0 additions & 164 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -305,162 +305,6 @@ jsonschema-specifications==2023.7.1 \
--hash=sha256:05adf340b659828a004220a9613be00fa3f223f2b82002e273dee62fd50524b1 \
--hash=sha256:c91a50404e88a1f6ba40636778e2ee08f6e24c5613fe4c53ac24578a5a7f72bb
# via jsonschema
lxml==5.2.1 \
--hash=sha256:04ab5415bf6c86e0518d57240a96c4d1fcfc3cb370bb2ac2a732b67f579e5a04 \
--hash=sha256:057cdc6b86ab732cf361f8b4d8af87cf195a1f6dc5b0ff3de2dced242c2015e0 \
--hash=sha256:058a1308914f20784c9f4674036527e7c04f7be6fb60f5d61353545aa7fcb739 \
--hash=sha256:08802f0c56ed150cc6885ae0788a321b73505d2263ee56dad84d200cab11c07a \
--hash=sha256:0a15438253b34e6362b2dc41475e7f80de76320f335e70c5528b7148cac253a1 \
--hash=sha256:0c3f67e2aeda739d1cc0b1102c9a9129f7dc83901226cc24dd72ba275ced4218 \
--hash=sha256:0e7259016bc4345a31af861fdce942b77c99049d6c2107ca07dc2bba2435c1d9 \
--hash=sha256:0ed777c1e8c99b63037b91f9d73a6aad20fd035d77ac84afcc205225f8f41188 \
--hash=sha256:0f5d65c39f16717a47c36c756af0fb36144069c4718824b7533f803ecdf91138 \
--hash=sha256:0f8c09ed18ecb4ebf23e02b8e7a22a05d6411911e6fabef3a36e4f371f4f2585 \
--hash=sha256:11a04306fcba10cd9637e669fd73aa274c1c09ca64af79c041aa820ea992b637 \
--hash=sha256:1ae67b4e737cddc96c99461d2f75d218bdf7a0c3d3ad5604d1f5e7464a2f9ffe \
--hash=sha256:1c5bb205e9212d0ebddf946bc07e73fa245c864a5f90f341d11ce7b0b854475d \
--hash=sha256:1f7785f4f789fdb522729ae465adcaa099e2a3441519df750ebdccc481d961a1 \
--hash=sha256:200e63525948e325d6a13a76ba2911f927ad399ef64f57898cf7c74e69b71095 \
--hash=sha256:21c2e6b09565ba5b45ae161b438e033a86ad1736b8c838c766146eff8ceffff9 \
--hash=sha256:2213afee476546a7f37c7a9b4ad4d74b1e112a6fafffc9185d6d21f043128c81 \
--hash=sha256:27aa20d45c2e0b8cd05da6d4759649170e8dfc4f4e5ef33a34d06f2d79075d57 \
--hash=sha256:2a66bf12fbd4666dd023b6f51223aed3d9f3b40fef06ce404cb75bafd3d89536 \
--hash=sha256:2c9d147f754b1b0e723e6afb7ba1566ecb162fe4ea657f53d2139bbf894d050a \
--hash=sha256:2ddfe41ddc81f29a4c44c8ce239eda5ade4e7fc305fb7311759dd6229a080052 \
--hash=sha256:31e9a882013c2f6bd2f2c974241bf4ba68c85eba943648ce88936d23209a2e01 \
--hash=sha256:3249cc2989d9090eeac5467e50e9ec2d40704fea9ab72f36b034ea34ee65ca98 \
--hash=sha256:3545039fa4779be2df51d6395e91a810f57122290864918b172d5dc7ca5bb433 \
--hash=sha256:394ed3924d7a01b5bd9a0d9d946136e1c2f7b3dc337196d99e61740ed4bc6fe1 \
--hash=sha256:3a6b45da02336895da82b9d472cd274b22dc27a5cea1d4b793874eead23dd14f \
--hash=sha256:3a74c4f27167cb95c1d4af1c0b59e88b7f3e0182138db2501c353555f7ec57f4 \
--hash=sha256:3d0c3dd24bb4605439bf91068598d00c6370684f8de4a67c2992683f6c309d6b \
--hash=sha256:3dbe858ee582cbb2c6294dc85f55b5f19c918c2597855e950f34b660f1a5ede6 \
--hash=sha256:3dc773b2861b37b41a6136e0b72a1a44689a9c4c101e0cddb6b854016acc0aa8 \
--hash=sha256:3f7765e69bbce0906a7c74d5fe46d2c7a7596147318dbc08e4a2431f3060e306 \
--hash=sha256:417d14450f06d51f363e41cace6488519038f940676ce9664b34ebf5653433a5 \
--hash=sha256:44f6c7caff88d988db017b9b0e4ab04934f11e3e72d478031efc7edcac6c622f \
--hash=sha256:491755202eb21a5e350dae00c6d9a17247769c64dcf62d8c788b5c135e179dc4 \
--hash=sha256:4951e4f7a5680a2db62f7f4ab2f84617674d36d2d76a729b9a8be4b59b3659be \
--hash=sha256:52421b41ac99e9d91934e4d0d0fe7da9f02bfa7536bb4431b4c05c906c8c6919 \
--hash=sha256:530e7c04f72002d2f334d5257c8a51bf409db0316feee7c87e4385043be136af \
--hash=sha256:533658f8fbf056b70e434dff7e7aa611bcacb33e01f75de7f821810e48d1bb66 \
--hash=sha256:5670fb70a828663cc37552a2a85bf2ac38475572b0e9b91283dc09efb52c41d1 \
--hash=sha256:56c22432809085b3f3ae04e6e7bdd36883d7258fcd90e53ba7b2e463efc7a6af \
--hash=sha256:58278b29cb89f3e43ff3e0c756abbd1518f3ee6adad9e35b51fb101c1c1daaec \
--hash=sha256:588008b8497667f1ddca7c99f2f85ce8511f8f7871b4a06ceede68ab62dff64b \
--hash=sha256:59565f10607c244bc4c05c0c5fa0c190c990996e0c719d05deec7030c2aa8289 \
--hash=sha256:59689a75ba8d7ffca577aefd017d08d659d86ad4585ccc73e43edbfc7476781a \
--hash=sha256:5aea8212fb823e006b995c4dda533edcf98a893d941f173f6c9506126188860d \
--hash=sha256:5c670c0406bdc845b474b680b9a5456c561c65cf366f8db5a60154088c92d102 \
--hash=sha256:5ca1e8188b26a819387b29c3895c47a5e618708fe6f787f3b1a471de2c4a94d9 \
--hash=sha256:5d077bc40a1fe984e1a9931e801e42959a1e6598edc8a3223b061d30fbd26bbc \
--hash=sha256:5d5792e9b3fb8d16a19f46aa8208987cfeafe082363ee2745ea8b643d9cc5b45 \
--hash=sha256:5dd1537e7cc06efd81371f5d1a992bd5ab156b2b4f88834ca852de4a8ea523fa \
--hash=sha256:5ea7b6766ac2dfe4bcac8b8595107665a18ef01f8c8343f00710b85096d1b53a \
--hash=sha256:622020d4521e22fb371e15f580d153134bfb68d6a429d1342a25f051ec72df1c \
--hash=sha256:627402ad8dea044dde2eccde4370560a2b750ef894c9578e1d4f8ffd54000461 \
--hash=sha256:644df54d729ef810dcd0f7732e50e5ad1bd0a135278ed8d6bcb06f33b6b6f708 \
--hash=sha256:64641a6068a16201366476731301441ce93457eb8452056f570133a6ceb15fca \
--hash=sha256:64c2baa7774bc22dd4474248ba16fe1a7f611c13ac6123408694d4cc93d66dbd \
--hash=sha256:6588c459c5627fefa30139be4d2e28a2c2a1d0d1c265aad2ba1935a7863a4913 \
--hash=sha256:66bc5eb8a323ed9894f8fa0ee6cb3e3fb2403d99aee635078fd19a8bc7a5a5da \
--hash=sha256:68a2610dbe138fa8c5826b3f6d98a7cfc29707b850ddcc3e21910a6fe51f6ca0 \
--hash=sha256:6935bbf153f9a965f1e07c2649c0849d29832487c52bb4a5c5066031d8b44fd5 \
--hash=sha256:6992030d43b916407c9aa52e9673612ff39a575523c5f4cf72cdef75365709a5 \
--hash=sha256:6a014510830df1475176466b6087fc0c08b47a36714823e58d8b8d7709132a96 \
--hash=sha256:6ab833e4735a7e5533711a6ea2df26459b96f9eec36d23f74cafe03631647c41 \
--hash=sha256:6cc6ee342fb7fa2471bd9b6d6fdfc78925a697bf5c2bcd0a302e98b0d35bfad3 \
--hash=sha256:6cf58416653c5901e12624e4013708b6e11142956e7f35e7a83f1ab02f3fe456 \
--hash=sha256:70a9768e1b9d79edca17890175ba915654ee1725975d69ab64813dd785a2bd5c \
--hash=sha256:70ac664a48aa64e5e635ae5566f5227f2ab7f66a3990d67566d9907edcbbf867 \
--hash=sha256:71e97313406ccf55d32cc98a533ee05c61e15d11b99215b237346171c179c0b0 \
--hash=sha256:7221d49259aa1e5a8f00d3d28b1e0b76031655ca74bb287123ef56c3db92f213 \
--hash=sha256:74b28c6334cca4dd704e8004cba1955af0b778cf449142e581e404bd211fb619 \
--hash=sha256:764b521b75701f60683500d8621841bec41a65eb739b8466000c6fdbc256c240 \
--hash=sha256:78bfa756eab503673991bdcf464917ef7845a964903d3302c5f68417ecdc948c \
--hash=sha256:794f04eec78f1d0e35d9e0c36cbbb22e42d370dda1609fb03bcd7aeb458c6377 \
--hash=sha256:79bd05260359170f78b181b59ce871673ed01ba048deef4bf49a36ab3e72e80b \
--hash=sha256:7a7efd5b6d3e30d81ec68ab8a88252d7c7c6f13aaa875009fe3097eb4e30b84c \
--hash=sha256:7c17b64b0a6ef4e5affae6a3724010a7a66bda48a62cfe0674dabd46642e8b54 \
--hash=sha256:804f74efe22b6a227306dd890eecc4f8c59ff25ca35f1f14e7482bbce96ef10b \
--hash=sha256:853e074d4931dbcba7480d4dcab23d5c56bd9607f92825ab80ee2bd916edea53 \
--hash=sha256:857500f88b17a6479202ff5fe5f580fc3404922cd02ab3716197adf1ef628029 \
--hash=sha256:865bad62df277c04beed9478fe665b9ef63eb28fe026d5dedcb89b537d2e2ea6 \
--hash=sha256:88e22fc0a6684337d25c994381ed8a1580a6f5ebebd5ad41f89f663ff4ec2885 \
--hash=sha256:8b9c07e7a45bb64e21df4b6aa623cb8ba214dfb47d2027d90eac197329bb5e94 \
--hash=sha256:8de8f9d6caa7f25b204fc861718815d41cbcf27ee8f028c89c882a0cf4ae4134 \
--hash=sha256:8e77c69d5892cb5ba71703c4057091e31ccf534bd7f129307a4d084d90d014b8 \
--hash=sha256:9123716666e25b7b71c4e1789ec829ed18663152008b58544d95b008ed9e21e9 \
--hash=sha256:958244ad566c3ffc385f47dddde4145088a0ab893504b54b52c041987a8c1863 \
--hash=sha256:96323338e6c14e958d775700ec8a88346014a85e5de73ac7967db0367582049b \
--hash=sha256:9676bfc686fa6a3fa10cd4ae6b76cae8be26eb5ec6811d2a325636c460da1806 \
--hash=sha256:9b0ff53900566bc6325ecde9181d89afadc59c5ffa39bddf084aaedfe3b06a11 \
--hash=sha256:9b9ec9c9978b708d488bec36b9e4c94d88fd12ccac3e62134a9d17ddba910ea9 \
--hash=sha256:9c6ad0fbf105f6bcc9300c00010a2ffa44ea6f555df1a2ad95c88f5656104817 \
--hash=sha256:9ca66b8e90daca431b7ca1408cae085d025326570e57749695d6a01454790e95 \
--hash=sha256:9e2addd2d1866fe112bc6f80117bcc6bc25191c5ed1bfbcf9f1386a884252ae8 \
--hash=sha256:a0af35bd8ebf84888373630f73f24e86bf016642fb8576fba49d3d6b560b7cbc \
--hash=sha256:a2b44bec7adf3e9305ce6cbfa47a4395667e744097faed97abb4728748ba7d47 \
--hash=sha256:a2dfe7e2473f9b59496247aad6e23b405ddf2e12ef0765677b0081c02d6c2c0b \
--hash=sha256:a55ee573116ba208932e2d1a037cc4b10d2c1cb264ced2184d00b18ce585b2c0 \
--hash=sha256:a7baf9ffc238e4bf401299f50e971a45bfcc10a785522541a6e3179c83eabf0a \
--hash=sha256:a8d5c70e04aac1eda5c829a26d1f75c6e5286c74743133d9f742cda8e53b9c2f \
--hash=sha256:a91481dbcddf1736c98a80b122afa0f7296eeb80b72344d7f45dc9f781551f56 \
--hash=sha256:ab31a88a651039a07a3ae327d68ebdd8bc589b16938c09ef3f32a4b809dc96ef \
--hash=sha256:abc25c3cab9ec7fcd299b9bcb3b8d4a1231877e425c650fa1c7576c5107ab851 \
--hash=sha256:adfb84ca6b87e06bc6b146dc7da7623395db1e31621c4785ad0658c5028b37d7 \
--hash=sha256:afbbdb120d1e78d2ba8064a68058001b871154cc57787031b645c9142b937a62 \
--hash=sha256:afd5562927cdef7c4f5550374acbc117fd4ecc05b5007bdfa57cc5355864e0a4 \
--hash=sha256:b070bbe8d3f0f6147689bed981d19bbb33070225373338df755a46893528104a \
--hash=sha256:b0b58fbfa1bf7367dde8a557994e3b1637294be6cf2169810375caf8571a085c \
--hash=sha256:b560e3aa4b1d49e0e6c847d72665384db35b2f5d45f8e6a5c0072e0283430533 \
--hash=sha256:b6241d4eee5f89453307c2f2bfa03b50362052ca0af1efecf9fef9a41a22bb4f \
--hash=sha256:b6787b643356111dfd4032b5bffe26d2f8331556ecb79e15dacb9275da02866e \
--hash=sha256:bcbf4af004f98793a95355980764b3d80d47117678118a44a80b721c9913436a \
--hash=sha256:beb72935a941965c52990f3a32d7f07ce869fe21c6af8b34bf6a277b33a345d3 \
--hash=sha256:bf2e2458345d9bffb0d9ec16557d8858c9c88d2d11fed53998512504cd9df49b \
--hash=sha256:c2d35a1d047efd68027817b32ab1586c1169e60ca02c65d428ae815b593e65d4 \
--hash=sha256:c38d7b9a690b090de999835f0443d8aa93ce5f2064035dfc48f27f02b4afc3d0 \
--hash=sha256:c6f2c8372b98208ce609c9e1d707f6918cc118fea4e2c754c9f0812c04ca116d \
--hash=sha256:c817d420c60a5183953c783b0547d9eb43b7b344a2c46f69513d5952a78cddf3 \
--hash=sha256:c8ba129e6d3b0136a0f50345b2cb3db53f6bda5dd8c7f5d83fbccba97fb5dcb5 \
--hash=sha256:c94e75445b00319c1fad60f3c98b09cd63fe1134a8a953dcd48989ef42318534 \
--hash=sha256:cc4691d60512798304acb9207987e7b2b7c44627ea88b9d77489bbe3e6cc3bd4 \
--hash=sha256:cc518cea79fd1e2f6c90baafa28906d4309d24f3a63e801d855e7424c5b34144 \
--hash=sha256:cd53553ddad4a9c2f1f022756ae64abe16da1feb497edf4d9f87f99ec7cf86bd \
--hash=sha256:cf22b41fdae514ee2f1691b6c3cdeae666d8b7fa9434de445f12bbeee0cf48dd \
--hash=sha256:d38c8f50ecf57f0463399569aa388b232cf1a2ffb8f0a9a5412d0db57e054860 \
--hash=sha256:d3be9b2076112e51b323bdf6d5a7f8a798de55fb8d95fcb64bd179460cdc0704 \
--hash=sha256:d4f2cc7060dc3646632d7f15fe68e2fa98f58e35dd5666cd525f3b35d3fed7f8 \
--hash=sha256:d7520db34088c96cc0e0a3ad51a4fd5b401f279ee112aa2b7f8f976d8582606d \
--hash=sha256:d793bebb202a6000390a5390078e945bbb49855c29c7e4d56a85901326c3b5d9 \
--hash=sha256:da052e7962ea2d5e5ef5bc0355d55007407087392cf465b7ad84ce5f3e25fe0f \
--hash=sha256:dae0ed02f6b075426accbf6b2863c3d0a7eacc1b41fb40f2251d931e50188dad \
--hash=sha256:ddc678fb4c7e30cf830a2b5a8d869538bc55b28d6c68544d09c7d0d8f17694dc \
--hash=sha256:df2e6f546c4df14bc81f9498bbc007fbb87669f1bb707c6138878c46b06f6510 \
--hash=sha256:e02c5175f63effbd7c5e590399c118d5db6183bbfe8e0d118bdb5c2d1b48d937 \
--hash=sha256:e196a4ff48310ba62e53a8e0f97ca2bca83cdd2fe2934d8b5cb0df0a841b193a \
--hash=sha256:e233db59c8f76630c512ab4a4daf5a5986da5c3d5b44b8e9fc742f2a24dbd460 \
--hash=sha256:e32be23d538753a8adb6c85bd539f5fd3b15cb987404327c569dfc5fd8366e85 \
--hash=sha256:e3d30321949861404323c50aebeb1943461a67cd51d4200ab02babc58bd06a86 \
--hash=sha256:e89580a581bf478d8dcb97d9cd011d567768e8bc4095f8557b21c4d4c5fea7d0 \
--hash=sha256:e998e304036198b4f6914e6a1e2b6f925208a20e2042563d9734881150c6c246 \
--hash=sha256:ec42088248c596dbd61d4ae8a5b004f97a4d91a9fd286f632e42e60b706718d7 \
--hash=sha256:efa7b51824aa0ee957ccd5a741c73e6851de55f40d807f08069eb4c5a26b2baa \
--hash=sha256:f0a1bc63a465b6d72569a9bba9f2ef0334c4e03958e043da1920299100bc7c08 \
--hash=sha256:f18a5a84e16886898e51ab4b1d43acb3083c39b14c8caeb3589aabff0ee0b270 \
--hash=sha256:f2a9efc53d5b714b8df2b4b3e992accf8ce5bbdfe544d74d5c6766c9e1146a3a \
--hash=sha256:f3bbbc998d42f8e561f347e798b85513ba4da324c2b3f9b7969e9c45b10f6169 \
--hash=sha256:f42038016852ae51b4088b2862126535cc4fc85802bfe30dea3500fdfaf1864e \
--hash=sha256:f443cdef978430887ed55112b491f670bba6462cea7a7742ff8f14b7abb98d75 \
--hash=sha256:f51969bac61441fd31f028d7b3b45962f3ecebf691a510495e5d2cd8c8092dbd \
--hash=sha256:f8aca2e3a72f37bfc7b14ba96d4056244001ddcc18382bd0daa087fd2e68a354 \
--hash=sha256:f9737bf36262046213a28e789cc82d82c6ef19c85a0cf05e75c670a33342ac2c \
--hash=sha256:fd6037392f2d57793ab98d9e26798f44b8b4da2f2464388588f48ac52c489ea1 \
--hash=sha256:feaa45c0eae424d3e90d78823f3828e7dc42a42f21ed420db98da2c4ecf0a2cb \
--hash=sha256:ff097ae562e637409b429a7ac958a20aab237a0378c42dabaa1e3abf2f896e5f \
--hash=sha256:ff46d772d5f6f73564979cd77a4fffe55c916a05f3cb70e7c9c0590059fb29ef
# via translate-toolkit
markupsafe==2.1.3 \
--hash=sha256:05fb21170423db021895e1ea1e1f3ab3adb85d1c2333cbc2310f2a26bc77272e \
--hash=sha256:0a4e4a1aff6c7ac4cd55792abf96c915634c2b97e3cc1c7129578aa68ebd754e \
Expand Down Expand Up @@ -1056,18 +900,10 @@ texttable==1.7.0 \
# via
# aqtinstall
# py7zr
translate-toolkit==3.13.3 \
--hash=sha256:5bd73841a0ae99dbb583489879a4fa742860b3faa75ef2bb9d4f06f9e3195d75 \
--hash=sha256:efabe2b974243da53cfdc31082d81f536008607a4ad4e65a3098a85b44ae2d6e
# via -r requirements.in
urllib3==2.0.7 \
--hash=sha256:c97dfde1f7bd43a71c8d2a58e369e9b2bf692d1334ea9f9cae55add7d0dd0f84 \
--hash=sha256:fdb6d215c776278489906c2f8916e6e7d4f5a9b602ccbcfdf7f016fc8da0596e
# via requests
wcwidth==0.2.13 \
--hash=sha256:3da69048e4540d84af32131829ff948f1e022c1c6bdb8d6102117aac784f6859 \
--hash=sha256:72ea0c06399eb286d978fdedb6923a9eb47e1c486ce63e9b4e64fc18303972b5
# via translate-toolkit
yamllint==1.35.1 \
--hash=sha256:2e16e504bb129ff515b37823b472750b36b6de07963bd74b307341ef5ad8bdc3 \
--hash=sha256:7a003809f88324fd2c877734f2d575ee7881dd9043360657cc8049c809eba6cd
Expand Down
43 changes: 28 additions & 15 deletions scripts/ci/update_server_names.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@
import requests
import sys
import xml.etree.ElementTree as etree
from translate.misc.xml_helpers import reindent

MULLVAD_SERVER_LIST_API = "https://api.mullvad.net/public/relays/wireguard/v2"
XLIFF_NAMESPACE = "{urn:oasis:names:tc:xliff:document:1.2}"


def fetch_server_list():
country_names = {}
city_names = []
Expand All @@ -23,7 +23,7 @@ def fetch_server_list():
if response.status_code == 200:
data = response.json()

locations = data.get('locations', {})
locations = data.get("locations", {})
for country_code, location in locations.items():
country_code = country_code.split("-")[0]
country_name = location.get("country", None)
Expand Down Expand Up @@ -69,8 +69,13 @@ def fetch_server_list():

script_path = os.path.dirname(os.path.abspath(__file__))
xliff_path = os.path.join(
script_path, os.path.pardir, os.path.pardir, 'src', 'translations',
'extras', 'extras.xliff'
script_path,
os.path.pardir,
os.path.pardir,
"src",
"translations",
"extras",
"extras.xliff",
)
if not os.path.exists(xliff_path):
sys.exit(f"extras.xliff not found in path {xliff_path}")
Expand All @@ -79,10 +84,10 @@ def fetch_server_list():
root = tree.getroot()

found_server_names = []
for trans_unit in root.findall(f'.//{XLIFF_NAMESPACE}trans-unit'):
unit_id = trans_unit.get('id')
if unit_id.startswith('servers.'):
found_server_names.append(unit_id.split('.')[1])
for trans_unit in root.findall(f".//{XLIFF_NAMESPACE}trans-unit"):
unit_id = trans_unit.get("id")
if unit_id.startswith("servers."):
found_server_names.append(unit_id.split(".")[1])

###
# 3. Get the list of missing servers strings and update extras.xliff
Expand All @@ -93,27 +98,35 @@ def fetch_server_list():
print("Server list is up to date!")
sys.exit(0)

missing_string_map = { key: value for key, value in string_map.items() if key in missing}
missing_string_map = {
key: value for key, value in string_map.items() if key in missing
}

# Iterate over the entries and add them to the XLIFF tree
servers_node = root.find(f".//{XLIFF_NAMESPACE}file[@original='../src/apps/vpn/ui/screens/home/ViewServers.qml']//{XLIFF_NAMESPACE}body")
servers_node = root.find(
f".//{XLIFF_NAMESPACE}file[@original='../src/apps/vpn/ui/screens/home/ViewServers.qml']//{XLIFF_NAMESPACE}body"
)
if servers_node is None:
sys.exit("Unable to find servers node. Has the extras.xliff file been changed?")

for id, source in missing_string_map.items():
new_unit = etree.SubElement(servers_node, "{urn:oasis:names:tc:xliff:document:1.2}trans-unit")
new_unit = etree.SubElement(
servers_node, "{urn:oasis:names:tc:xliff:document:1.2}trans-unit"
)
new_unit.set("id", f"servers.{id}")

new_unit.set("{urn:oasis:names:tc:xliff:document:1.2}xml:space", "preserve")

source_node = etree.SubElement(new_unit, "{urn:oasis:names:tc:xliff:document:1.2}source")
source_node = etree.SubElement(
new_unit, "{urn:oasis:names:tc:xliff:document:1.2}source"
)
source_node.text = source

# Save the new tree to extras.xliff file
with open(xliff_path, "w", encoding="utf-8") as fp:
etree.register_namespace('',"urn:oasis:names:tc:xliff:document:1.2")
etree.register_namespace("", "urn:oasis:names:tc:xliff:document:1.2")
# Fix indentation
reindent(root)
etree.indent(root)
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the only real change.

# Create the XLIFF string we are going to write to the file
xml_string = etree.tostring(
root,
Expand All @@ -126,7 +139,7 @@ def fetch_server_list():
# Make sure the xliff tag doesn't get unnecessarily changed
xml_string = xml_string.replace(
'<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">',
'<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">'
'<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">',
)
# Truncate the original file for rewriting
fp.truncate(0)
Expand Down
Loading