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
cataclysm-dda-git: 2019-05-03 -> 2019-11-22 #74064
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Checked with nix-review
on NixOS x86_64. Works fine.
@shazow Did you test console build with translations? Without the deleted patch, it should be broken as far as I remember. |
Good call. I'm away right now but I can give it a try in a few days unless
someone beats me to it. :)
|
@mnacamura I tried changing the language with the tiles build, it works fine. Haven't had a chance to try it without tiles yet, got |
Confirmed that no tiles with non-English language also works. Anything else needs checking? |
@shazow Thank you for checking and sorry my memory was incorrect. diff --git a/src/translations.cpp b/src/translations.cpp
index 067e2cd77d..5660d18b3d 100644
--- a/src/translations.cpp
+++ b/src/translations.cpp
@@ -211,14 +211,12 @@ void set_language()
auto env = getenv( "LANGUAGE" );
locale_dir = std::string( FILENAMES["base_path"] + "lang/mo/" + ( env ? env : "none" ) +
"/LC_MESSAGES/cataclysm-dda.mo" );
-#elif (defined(__linux__) || (defined(MACOSX) && !defined(TILES)))
+#else
if( !FILENAMES["base_path"].empty() ) {
locale_dir = FILENAMES["base_path"] + "share/locale";
} else {
locale_dir = "lang/mo";
}
-#else
- locale_dir = "lang/mo";
#endif
const char *locale_dir_char = locale_dir.c_str(); |
@shazow Ah you've already prepared the backport patch. Thanks. |
@mnacamura Force-pushed the change, can you confirm it works for you on Darwin now? I don't have access to a Darwin machine. :) Thanks! |
@GrahamcOfBorg build cataclysm-dda-git |
Looks like my patch wasn't applying cleanly, switched to using your patch. |
@GrahamcOfBorg build cataclysm-dda-git |
Works for me on Darwin. Thanks. |
Great. :) Do we need to do anything else before merging? |
Ping. 🔔 |
Another friendly ping. |
I think this is ready to be merged. |
LGTM, thanks! |
Motivation for this change
The cataclysm-dda-git package is pinned to a specific version, and the previous version was bumped more than 6 months ago. There has been some substantial work done on the game, so it's good to keep it bumped occasionally.
I built the newest version without the locale patch (since it didn't apply cleanly) and it built/ran fine. I'm not sure if there was a reason why it was needed originally that I missed (didn't find any relevant comments in the old commits), so I removed it for now.
Played the game for a while, seems to work great.
If it is needed, here's a new backported verison of the patch that we can add back in:
Things done
sandbox
innix.conf
on non-NixOS linux)nix-shell -p nix-review --run "nix-review wip"
./result/bin/
)nix path-info -S
before and after)Notify maintainers
cc @mnacamura @rardiol