mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-30 08:15:37 +00:00
Code Issues Releases Wiki Activity

coverity fixes and other bits

Browse source
This commit is contained in:
Bret Curtis 2022-04-11 14:37:22 +02:00
parent 5820e5701a
commit db3f9da08a
2 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
components/l10n/messagebundles.cpp
View file

@ -22,19 +22,19 @@ namespace l10n
for (const icu::Locale &loc: preferredLocales)
{
mPreferredLocales.push_back(loc);
mPreferredLocaleStrings.push_back(loc.getName());
mPreferredLocaleStrings.emplace_back(loc.getName());
// Try without variant or country if they are specified, starting with the most specific
if (strcmp(loc.getVariant(), "") != 0)
{
icu::Locale withoutVariant(loc.getLanguage(), loc.getCountry());
mPreferredLocales.push_back(withoutVariant);
mPreferredLocaleStrings.push_back(withoutVariant.getName());
mPreferredLocaleStrings.emplace_back(withoutVariant.getName());
}
if (strcmp(loc.getCountry(), "") != 0)
{
icu::Locale withoutCountry(loc.getLanguage());
mPreferredLocales.push_back(withoutCountry);
mPreferredLocaleStrings.push_back(withoutCountry.getName());
mPreferredLocaleStrings.emplace_back(withoutCountry.getName());
}
}
}
@ -53,7 +53,7 @@ namespace l10n
if (status.isFailure())
{
std::string errorText = getErrorText(parseError);
if (errorText.size())
if (!errorText.empty())
{
Log(Debug::Error) << message << ": " << status.errorName() << " in \"" << errorText << "\"";
}
@ -73,8 +73,8 @@ namespace l10n
std::string localeName = lang.getName();
for (const auto& it: data)
{
std::string key = it.first.as<std::string>();
std::string value = it.second.as<std::string>();
auto key = it.first.as<std::string>();
auto value = it.second.as<std::string>();
icu::UnicodeString pattern = icu::UnicodeString::fromUTF8(value);
icu::ErrorCode status;
UParseError parseError;
@ -110,10 +110,10 @@ namespace l10n
{
std::vector<icu::UnicodeString> argNames;
std::vector<icu::Formattable> argValues;
for (auto& [key, value] : args)
for (auto& [k, v] : args)
{
argNames.push_back(icu::UnicodeString::fromUTF8(key));
argValues.push_back(value);
argNames.push_back(icu::UnicodeString::fromUTF8(k));
argValues.push_back(v);
}
return formatMessage(key, argNames, argValues);
}
@ -137,7 +137,7 @@ namespace l10n
if (message)
{
if (args.size() > 0 && argNames.size() > 0)
if (!args.empty() && !argNames.empty())
message->format(&argNames[0], &args[0], args.size(), result, success);
else
message->format(nullptr, nullptr, args.size(), result, success);
@ -145,8 +145,8 @@ namespace l10n
result.toUTF8String(resultString);
return resultString;
}
icu::Locale defaultLocale(NULL);
if (mPreferredLocales.size() > 0)
icu::Locale defaultLocale(nullptr);
if (!mPreferredLocales.empty())
{
defaultLocale = mPreferredLocales[0];
}
@ -156,7 +156,7 @@ namespace l10n
// If we can't parse the key as a pattern, just return the key
return std::string(key);
if (args.size() > 0 && argNames.size() > 0)
if (!args.empty() && !argNames.empty())
defaultMessage.format(&argNames[0], &args[0], args.size(), result, success);
else
defaultMessage.format(nullptr, nullptr, args.size(), result, success);

2
components/l10n/messagebundles.hpp
View file

@ -38,7 +38,7 @@ namespace l10n
void setPreferredLocales(const std::vector<icu::Locale> &preferredLocales);
const std::vector<icu::Locale> & getPreferredLocales() const { return mPreferredLocales; }
void load(std::istream &input, const icu::Locale &lang, const std::string &path);
bool isLoaded(icu::Locale loc) const { return mBundles.find(loc.getName()) != mBundles.end(); }
bool isLoaded(const icu::Locale& loc) const { return mBundles.find(loc.getName()) != mBundles.end(); }
const icu::Locale & getFallbackLocale() const { return mFallbackLocale; }
private: