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

Fix message in ter_furn_data don't be translated #66985

Merged
merged 16 commits into from
Jul 20, 2023

Conversation

lispcoc
Copy link
Contributor

@lispcoc lispcoc commented Jul 18, 2023

Summary

Bugfixes "Fix message in ter_furn_data don't be translated"

Purpose of change

Message in ter_furn_data is not translated, in spite of translation exists.

Describe the solution

convert type of message from std::string to translation.

Describe alternatives you've considered

Testing

Game runs, message is translated actually.

Additional context

@github-actions github-actions bot added the [C++] Changes (can be) made in C++. Previously named `Code` label Jul 18, 2023
@github-actions github-actions bot requested a review from KorGgenT July 18, 2023 09:11
@github-actions github-actions bot added the <Bugfix> This is a fix for a bug (or closes open issue) label Jul 18, 2023
@lispcoc lispcoc changed the title Fix message in ter_furn_data don't translated Fix message in ter_furn_data don't be translated Jul 18, 2023
src/magic_ter_fur_transform.cpp Outdated Show resolved Hide resolved
src/magic_ter_fur_transform.cpp Outdated Show resolved Hide resolved
src/magic_ter_fur_transform.cpp Outdated Show resolved Hide resolved
src/magic_ter_fur_transform.cpp Outdated Show resolved Hide resolved
src/magic_ter_fur_transform.cpp Outdated Show resolved Hide resolved
src/magic_ter_fur_transform.cpp Outdated Show resolved Hide resolved
src/magic_ter_fur_transform.cpp Outdated Show resolved Hide resolved
src/magic_ter_fur_transform.cpp Outdated Show resolved Hide resolved
src/magic_ter_fur_transform.cpp Outdated Show resolved Hide resolved
src/magic_ter_furn_transform.h Outdated Show resolved Hide resolved
lispcoc and others added 3 commits July 18, 2023 18:12
astyle

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
@github-actions github-actions bot added the json-styled JSON lint passed, label assigned by github actions label Jul 18, 2023
lispcoc and others added 10 commits July 18, 2023 18:13
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
src/magic_ter_fur_transform.cpp Outdated Show resolved Hide resolved
src/magic_ter_fur_transform.cpp Outdated Show resolved Hide resolved
src/magic_ter_fur_transform.cpp Outdated Show resolved Hide resolved
src/magic_ter_fur_transform.cpp Outdated Show resolved Hide resolved
src/magic_ter_fur_transform.cpp Outdated Show resolved Hide resolved
src/magic_ter_fur_transform.cpp Outdated Show resolved Hide resolved
src/magic_ter_fur_transform.cpp Outdated Show resolved Hide resolved
src/magic_ter_fur_transform.cpp Outdated Show resolved Hide resolved
src/magic_ter_fur_transform.cpp Outdated Show resolved Hide resolved
src/magic_ter_fur_transform.cpp Outdated Show resolved Hide resolved
@github-actions github-actions bot added the astyled astyled PR, label is assigned by github actions label Jul 18, 2023
lispcoc added 2 commits July 18, 2023 18:44
…pcoc/Cataclysm-DDA into translate_ter_furn_transform

# Conflicts:
#	src/magic_ter_fur_transform.cpp
#	src/magic_ter_furn_transform.h
Copy link
Contributor

@Qrox Qrox left a comment

Choose a reason for hiding this comment

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

Thanks!

@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Jul 18, 2023
@dseguin dseguin merged commit cfdb9d3 into CleverRaven:master Jul 20, 2023
@lispcoc lispcoc deleted the translate_ter_furn_transform branch July 25, 2023 17:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions <Bugfix> This is a fix for a bug (or closes open issue) [C++] Changes (can be) made in C++. Previously named `Code` json-styled JSON lint passed, label assigned by github actions
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants