mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

genlang keygen with newline changed

Browse Source 
when generating the keyid for text, all newlines
\n must be converted to 0x0A

Change-Id: I626776e94a6573d044522990a7f9ccc3d52b825b
This commit is contained in:
jan Iversen
2016-05-04 11:11:43 +00:00
parent 7031189b9c
commit e8fb6ae467
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
l10ntools/source/gConvPo.cxx
View File

@@ -206,7 +206,7 @@ void convert_po::save(const string& sFileName,
{ {
string sName; string sName;
ostream outFile(&mfOutBuffer); ostream outFile(&mfOutBuffer);
int newPos; int newPos, oldPos;
// isolate filename // isolate filename
newPos = sFileName.find_last_of("/\\", sFileName.length()); newPos = sFileName.find_last_of("/\\", sFileName.length());
@@ -224,7 +224,16 @@ void convert_po::save(const string& sFileName,
outFile << "\"" << sResource << ".text\"" << endl; outFile << "\"" << sResource << ".text\"" << endl;
if (bFuzzy) if (bFuzzy)
outFile << "#, fuzzy" << endl; outFile << "#, fuzzy" << endl;
outFile << "msgid \"" << sENUStext << "\"" << endl outFile << "msgid \"";
newPos = oldPos = 0;
while ((newPos = sENUStext.find("\\n", oldPos)) > 0) {
newPos += 2;
outFile << "\"" << endl
<< "\"" << sENUStext.substr(oldPos, newPos - oldPos);
oldPos = newPos;
}
outFile << "\"" << endl
<< "\"" << sENUStext.substr(oldPos) << "\"" << endl
<< "msgstr \"" << sText << "\"" << endl; << "msgstr \"" << sText << "\"" << endl;
} }
@@ -249,6 +258,10 @@ string convert_po::genKeyId(const string& text)
for (i = 0; (i = newText.find("\\\"", 0)) != (int)string::npos;) { for (i = 0; (i = newText.find("\\\"", 0)) != (int)string::npos;) {
newText.erase(i, 1); newText.erase(i, 1);
} }
for (i = 0; (i = newText.find("\\n", 0)) != (int)string::npos;) {
newText.erase(i, 1);
newText[i] = 0x0A;
}
aCRC32.process_bytes(newText.c_str(), newText.length()); aCRC32.process_bytes(newText.c_str(), newText.length());
unsigned int nCRC = aCRC32.checksum(); unsigned int nCRC = aCRC32.checksum();
string key; string key;