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

Added support for %0 type syntax in StringUtils::insertValue, since tools that verify translations integrity don't all like the older %0 syntax I used

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@7199 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
auria
2010-12-31 01:29:04 +00:00
parent 6129cfaa39
commit e7734931f2
2 changed files with 164 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/utils/string_utils.cpp
+17 -5
View File
@@ -329,9 +329,12 @@ namespace StringUtils
{
unsigned int insertValID = 0;
std::vector<irr::core::stringw> sv = StringUtils::split(s, '%', true);
const std::vector<irr::core::stringw> sv = StringUtils::split(s, '%', true);
irr::core::stringw new_string="";
for (unsigned int i=0; i<sv.size(); i++)
const unsigned int size = sv.size();
for (unsigned int i=0; i<size; i++)
{
if(sv[i][0] != '%')
{
@@ -357,17 +360,26 @@ namespace StringUtils
}
else if(irr::core::isdigit(sv[i][1]))
{
const unsigned int index = irr::core::stringc(sv[i].c_str()).c_str()[1] - '0';
irr::core::stringw rest = sv[i].subString(2, sv[i].size()-2);
int delta = 0;
if (sv[i].size() >= 4 && sv[i][2]=='$')
{
rest = sv[i].subString(4, sv[i].size()-4);
delta = -1;
}
const unsigned int index = irr::core::stringc(sv[i].c_str()).c_str()[1] - '0' + delta;
if (index >= all_vals.size())
{
fprintf(stderr, "[StringUtils::insertValues] ERROR: Invalid argument ID in '%s' : %i\n",
irr::core::stringc(s.c_str()).c_str(), index);
new_string += "??";
new_string += sv[i].subString(2, sv[i].size()-2);
new_string += rest;
}
else
{
new_string += all_vals[index] + sv[i].subString(2, sv[i].size()-2);
new_string += all_vals[index] + rest;
}
}
else