646b892680
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s
18 lines
528 B
Diff
18 lines
528 B
Diff
diff --git a/src/translations.cpp b/src/translations.cpp
|
|
--- a/src/translations.cpp
|
|
+++ b/src/translations.cpp
|
|
@@ -52,13 +52,11 @@ std::string locale_dir()
|
|
#define CATA_IS_ON_BSD
|
|
#endif
|
|
|
|
-#if !defined(__ANDROID__) && ((defined(__linux__) || defined(CATA_IS_ON_BSD) || (defined(MACOSX) && !defined(TILES))))
|
|
if( !PATH_INFO::base_path().empty() ) {
|
|
loc_dir = PATH_INFO::base_path() + "share/locale";
|
|
} else {
|
|
loc_dir = PATH_INFO::langdir();
|
|
}
|
|
-#endif
|
|
#endif // LOCALIZE
|
|
return loc_dir;
|
|
}
|