mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-03-31 16:36:41 +00:00
Code Issues Releases Wiki Activity

Build localization path using VFS::Path::Normalized

Browse source
This commit is contained in:
elsid 2024-03-01 18:00:35 +01:00
parent 84adb0a148
commit ffbeb5ab98
No known key found for this signature in database
GPG key ID: 4DE04C198CBA7625
3 changed files with 24 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
apps/openmw_test_suite/vfs/testpathutil.cpp
View file

@ -72,6 +72,13 @@ namespace VFS::Path
EXPECT_EQ(value.value(), "foo/bar/baz"); EXPECT_EQ(value.value(), "foo/bar/baz");
} }
TEST(NormalizedTest, shouldSupportOperatorDivEqualWithStringView)
{
Normalized value("foo/bar");
value /= std::string_view("BAZ");
EXPECT_EQ(value.value(), "foo/bar/baz");
}
TEST(NormalizedTest, changeExtensionShouldReplaceAfterLastDot) TEST(NormalizedTest, changeExtensionShouldReplaceAfterLastDot)
{ {
Normalized value("foo/bar.a"); Normalized value("foo/bar.a");

12
components/l10n/manager.cpp
View file

@ -36,11 +36,13 @@ namespace l10n
void Manager::readLangData(const std::string& name, MessageBundles& ctx, const icu::Locale& lang) void Manager::readLangData(const std::string& name, MessageBundles& ctx, const icu::Locale& lang)
{ {
std::string path = "l10n/"; std::string langName(lang.getName());
path.append(name); langName += ".yaml";
path.append("/");
path.append(lang.getName()); VFS::Path::Normalized path("l10n");
path.append(".yaml"); path /= name;
path /= langName;
if (!mVFS->exists(path)) if (!mVFS->exists(path))
return; return;

10
components/vfs/pathutil.hpp
View file

@ -187,6 +187,16 @@ namespace VFS::Path
return *this; return *this;
} }
Normalized& operator/=(std::string_view value)
{
mValue.reserve(mValue.size() + value.size() + 1);
mValue += separator;
const std::size_t offset = mValue.size();
mValue += value;
normalizeFilenameInPlace(mValue.begin() + offset, mValue.end());
return *this;
}
friend bool operator==(const Normalized& lhs, const Normalized& rhs) = default; friend bool operator==(const Normalized& lhs, const Normalized& rhs) = default;
friend bool operator==(const Normalized& lhs, const auto& rhs) { return lhs.mValue == rhs; } friend bool operator==(const Normalized& lhs, const auto& rhs) { return lhs.mValue == rhs; }