ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'origin/master' into fixes

Browse Source
This commit is contained in:
Flakebi
2015-03-08 01:16:51 +01:00
parent f386f05749 33feb60d7a
commit e5abf4cec3
160 changed files with 2204 additions and 1943 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/tinygettext/language.cpp
View File

@@ -17,6 +17,8 @@
#include "language.hpp"
#include "utils/string_utils.hpp"
#include <map>
#include <assert.h>
#include <vector>
@@ -430,7 +432,9 @@ Language::from_env(const std::string& env)
if (ln != std::string::npos && ln+1 < env.size()) // _
{
country = env.substr(ln+1, (std::min(dt, at) == std::string::npos) ? std::string::npos : std::min(dt, at) - (ln+1));
country = env.substr(ln+1, (std::min(dt, at) == std::string::npos)
? std::string::npos : std::min(dt, at) - (ln+1));
country = StringUtils::toUpperCase(country);
}
if (dt != std::string::npos && dt+1 < env.size()) // .