From a2a7dfa02842f1a48af5df48d9f6fab8efa08b85 Mon Sep 17 00:00:00 2001 From: kervala Date: Fri, 4 Nov 2016 20:20:39 +0100 Subject: [PATCH] Changed: Minor changes --HG-- branch : develop --- code/nel/src/misc/app_context.cpp | 1 - code/nel/src/misc/diff_tool.cpp | 1 + code/nel/src/misc/i18n.cpp | 2 ++ code/ryzom/tools/translation_tools/main.cpp | 6 ++---- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/code/nel/src/misc/app_context.cpp b/code/nel/src/misc/app_context.cpp index 6bf2d10e1..5206681f9 100644 --- a/code/nel/src/misc/app_context.cpp +++ b/code/nel/src/misc/app_context.cpp @@ -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 diff --git a/code/nel/src/misc/diff_tool.cpp b/code/nel/src/misc/diff_tool.cpp index 64d5a52c1..cd1a74ddf 100644 --- a/code/nel/src/misc/diff_tool.cpp +++ b/code/nel/src/misc/diff_tool.cpp @@ -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", diff --git a/code/nel/src/misc/i18n.cpp b/code/nel/src/misc/i18n.cpp index 82f5c9a19..b511197c8 100644 --- a/code/nel/src/misc/i18n.cpp +++ b/code/nel/src/misc/i18n.cpp @@ -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'); diff --git a/code/ryzom/tools/translation_tools/main.cpp b/code/ryzom/tools/translation_tools/main.cpp index 6dadc8a4c..04ea60f61 100644 --- a/code/ryzom/tools/translation_tools/main.cpp +++ b/code/ryzom/tools/translation_tools/main.cpp @@ -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 &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; }