Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Changed: Minor changes

Browse source
This commit is contained in:
kervala 2016-11-04 20:20:39 +01:00
parent 2a0b6086ab
commit 5a7d6b43e4
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
code/nel/src/misc/app_context.cpp
View file

@ -18,7 +18,6 @@
#include "nel/misc/app_context.h"
#include "nel/misc/dynloadlib.h"
#include "nel/misc/command.h"
#include "nel/misc/system_utils.h"
#include <locale.h>

1
code/nel/src/misc/diff_tool.cpp
View file

@ -419,6 +419,7 @@ bool readPhraseFileFromString(ucstring const& doc, const std::string &filename,
clause.Conditions += "(" + cond + ") ";
CI18N::skipWhiteSpace(first, last, &clause.Comments);
}
if (first == last)
{
nlwarning("DT: in '%s': Found end of file in non closed block for phrase %s\n",

2
code/nel/src/misc/i18n.cpp
View file

@ -516,9 +516,11 @@ void CI18N::skipWhiteSpace(ucstring::const_iterator &it, ucstring::const_iterato
// store the final '*'
if (it != last)
storeComments->push_back(*it++);
// store the final '/'
if (it != last)
storeComments->push_back(*it++);
// and a new line.
storeComments->push_back('\r');
storeComments->push_back('\n');

6
code/ryzom/tools/translation_tools/main.cpp
View file

@ -151,8 +151,6 @@ void showUsage(char *exeName)
LOG("Reference language is always the first language in languages.txt\n");
}
void verifyVersion(ucstring& doc, int versionId)
{
ucstring version1("// DIFF_VERSION 1\r\n");
@ -2218,7 +2216,6 @@ ucstring preparePhraseFile2(const vector<TPhrase> &phrases, bool removeDiffComme
ret += cond + nl;
}
ret += '\t';
// ucstring text = CI18N::makeMarkedString('[', ']', c.Text);
ucstring text = CI18N::makeMarkedString('[', ']', c.Text);;
ucstring text2;
@ -2340,6 +2337,7 @@ bool sortTransPhrase()
CFile::createDirectoryTree( CFile::getPath(pharseName) );
CI18N::writeTextFile(pharseName, str);
}
return true;
}
@ -2471,7 +2469,7 @@ int updatePhraseWork()
}
updatePhraseHashValue(validPhraseHashValue, saveDir);
updateClauseHashValue(validClauseHashValue, saveDir);
updateClauseHashValue(validClauseHashValue, saveDir);
return 0;
}