Fix more translation and translation updating issues #33433
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…g from other objects
BevapDin
reviewed
Aug 21, 2019
src/bionics.cpp
Outdated
| @@ -147,10 +147,9 @@ bool bionic_data::is_included( const bionic_id &id ) const | |||
| return std::find( included_bionics.begin(), included_bionics.end(), id ) != included_bionics.end(); | |||
| } | |||
|
|
|||
| bionic_data::bionic_data() | |||
| bionic_data::bionic_data() : name( translation( "bad bionic" ) ), | |||
There was a problem hiding this comment.
Suggested change
| bionic_data::bionic_data() : name( translation( "bad bionic" ) ), | |
| bionic_data::bionic_data() : name( "bad bionic" ), |
Same for the other member.
There was a problem hiding this comment.
It is necessary for extracting the strings for translation.
There was a problem hiding this comment.
Do those strings really need to be translatable? They should never appear, and if they appear it indicates a bug and should stand out.
Anyway, if you keep it as it is now, you should add a comment. Otherwise someone might remove it as it appears to be redundant.
There was a problem hiding this comment.
Alright, I made it no_translation so it will properly ignore the string during translation and not appear redundant.
ZhilkinSerg
added
<Documentation>
misterprimus
pushed a commit
to misterprimus/Cataclysm-DDA
that referenced
this pull request
Sep 21, 2019
* Fix translation update - skill names * Fix translation update - bionic names/descriptions * Remove some explicit `translated` calls * Fix translation update - recipe category names * Fix translation update - terrain bash sound descriptions * Fix translation - trap-vehicle collision sound description * Convert .pot file line endings to Unix on Windows * Suppress warning when nothing translatable is found in objects copying from other objects * Update translation documentation * Mark a string for translation * Fix translation update - vehicle part names * Fix translation update - text snippets * Update translation documentation * Use no_translation for debug text
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
SUMMARY: Bugfixes "Fix more translation and translation updating issues"
Purpose of change
Describe the solution
Used
translationclass for most of the fixed text except recipe category names and text snippets: recipe category was translating the unprefixed category id to category name, and I didn't change it. Text snippets was using string hash as indices to the snippets, and I decided it was too much hassle to change it to usetranslation.The hash of a text snippet is now computed using the untranslated text, to ensure the snippets are properly loaded when opening the game with a different language.
The CBM name parameters in bionic installation/uninstallation activity is now deprecated, and the names are retrieved using bionic id instead. This ensures that the bionic name is always updated if the language is changed before the activity ends.
The trap-vehicle collision sound descriptions are now extracted for translation. I also updated the string extraction scripts to output Unix line endings on Windows, as
msgmergeoccassionally glitches and gobbles a character at line start if the .pot file and .po files have different line endings. Also suppressed the warning about nothing translatable in json objects if the object contains "copy-from" values, since it's entirely plausible for objects using "copy-from" to not specify any overriding text.The translation documentation is also updated to reflect the changes.
Additional context
I'm not sure if the currently used hash function for indexing text snippets is suitable for indexing purposes, since it uses a simple shfit-and-add algorithm. If there are hash clashes, weird sh*t might happen. But if it needs fixing, it is beyond the scope of this PR.