Remove excessive usage of string_format
#33430
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
… do it. The called functions do string formatting on their own.
The format string does not contain any format specifier so the output will be the same as the input anyway, so why even call the function?
No comment. Really: none. I have no words for this. Why? And ... Just: no.
especially as there are no further arguments there to be formatted.
Translate the raw string literal, not the formatted string. Use `to_string( time_duration )` instead of replicating the code.
KorGgenT
reviewed
Aug 21, 2019
| } else { | ||
| return _( string_format( "%d %s", to_hours<int>( turns * 1_turns ), "hours" ) ); | ||
| return to_string( time_duration::from_turns( moves / 100 ) ); |
There was a problem hiding this comment.
does this round the time duration string like in the previous code, or does this give you an exact number?
There was a problem hiding this comment.
It yields a string with up to two units (e.g. "2 hours and 5 minutes" - remaining seconds are ignored here).
KorGgenT
added
[C++]
Qrox
reviewed
Aug 21, 2019
| @@ -909,13 +909,14 @@ std::string spell::enumerate_targets() const | |||
| return all_valid_targets[0]; | |||
| } | |||
| std::string ret; | |||
| // @todo if only we had a function to enumerate strings and concatenate them... | |||
There was a problem hiding this comment.
enumerate_as_string in output.h?
There was a problem hiding this comment.
Yes, I was ironically referring to that one. As of now, I leave it to someone else to actually implement it.
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: NoneRemoves usage when calling functions that do string formatting on their own (e.g.
add_msg).Removes it when called on a string without any formatting specifiers.
Removes it when called with the format string "%s" (as it just passes the next argument through).
Fix some missing / incorrect translation code.