Fix escaped characters in translations #569
Conversation
|
A tonne of erroneous translations. For now I have adjusted the xml resources as well, but we should probably tweak the conversion script later to handle all the edge cases (some translators add xml tags inside the resources, such as |
| <string name="welcome_intro4_headline">Güçlü</string> | ||
| <string name="welcome_intro4_message">Sınırsız sohbetler, görüntüler, videolar, sesli iletiler ve daha fazlası. Çoklu istemci yetenekli.</string> | ||
| <!-- Translators: "free" as in freedom here, not "free" as in "free beer" --> | ||
| <string name="welcome_intro5_headline">Özgür</string> | ||
| <!-- Translators: "free" as in freedom here, not "free" as in "free beer" --> | ||
| <string name="welcome_intro5_message">Delta Chat sonsuza dek özgürdür.<br/>Açık kaynaklı. Reklâm yok. Abonelik yok. Satıcı kilidi yok.</string> |
There was a problem hiding this comment.
This doesn't have a new line in the original
| json = require(file) | ||
| } catch (e) { | ||
| console.error(e.message) | ||
| return false |
There was a problem hiding this comment.
First test makes sure the file is valid json.
| console.error(e.message) | ||
| return false | ||
| } | ||
| return Object.keys(json).every(k1 => { |
There was a problem hiding this comment.
For every resource ..
| } | ||
| return Object.keys(json).every(k1 => { | ||
| const v1 = json[k1] | ||
| return Object.keys(v1).every(k2 => { |
There was a problem hiding this comment.
.. every key of that resource (e.g. "message" etc) ..
| ) | ||
| return false | ||
| } | ||
|
|
There was a problem hiding this comment.
It should be a string ..
| if (!testString('\\\\n')) return false | ||
| if (!testString("\\\\'")) return false | ||
| if (!testString('\\\\\\"')) return false | ||
| if (!testString('\\\\')) return false |
There was a problem hiding this comment.
And it shouldn't contain these.
There was a problem hiding this comment.
Could probably refactor this into one return statement. Up to you guys.
There was a problem hiding this comment.
It's fine with multiple returns to me
ralphtheninja
changed the title
|
It would be nice to merge this today. It kills two bugs. |
i just pulled new translations from transifex - are these already the changes from this pr? just asking because it is a bit dangerous to push sources to transifex as this will always overwrite all work of the translators (transifex is not line bases afaik) since the last pull (16 hours ago in this case). for android, therefore, i never edit the strings-LANG.xml files locally but do this always in the web-frontend. |
|
@r10s I didn't push these to Transifex. I edited them on Transifex and pulled them. |
Closes #544, closes #515