Remove most uses of StringFromFormat in favor of fmt

This commit is contained in:
Pokechu22
2022-10-11 19:21:51 -07:00
parent a5fa95adfd
commit f9fe25291d
12 changed files with 105 additions and 89 deletions

View File

@ -3,14 +3,17 @@
#include "DolphinQt/Translation.h"
#include <QApplication>
#include <QLocale>
#include <QTranslator>
#include <algorithm>
#include <cstring>
#include <iterator>
#include <string>
#include <fmt/format.h>
#include <QApplication>
#include <QLocale>
#include <QTranslator>
#include "Common/FileUtil.h"
#include "Common/IOFile.h"
#include "Common/Logging/Log.h"
@ -275,15 +278,14 @@ static bool TryInstallTranslator(const QString& exact_language_code)
std::string lang = qlang.toStdString();
auto filename =
#if defined _WIN32
File::GetExeDirectory() + StringFromFormat("/Languages/%s.mo", lang.c_str())
fmt::format("{}/Languages/{}.mo", File::GetExeDirectory(), lang)
#elif defined __APPLE__
File::GetBundleDirectory() +
StringFromFormat("/Contents/Resources/%s.lproj/dolphin-emu.mo", lang.c_str())
fmt::format("{}/Contents/Resources/{}.lproj/dolphin-emu.mo", File::GetBundleDirectory(),
lang)
#elif defined LINUX_LOCAL_DEV
File::GetExeDirectory() +
StringFromFormat("/../Source/Core/DolphinQt/%s/dolphin-emu.mo", lang.c_str())
fmt::format("{}/../Source/Core/DolphinQt/{}/dolphin-emu.mo", File::GetExeDirectory(), lang)
#else
StringFromFormat(DATA_DIR "/../locale/%s/LC_MESSAGES/dolphin-emu.mo", lang.c_str())
fmt::format("{}/../locale/{}/LC_MESSAGES/dolphin-emu.mo", DATA_DIR, lang)
#endif
;