Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* BHashMapCatalog::SetString(): Also process escaped characters in the comment.

Browse Source 
Fixes #7543 (ReadOnlyBootPrompt only showing English welcome text).
* Disabled fingerprint check in linkcatkeys. Fingerprints change due to the
  BHashMapCatalog::SetString() change.

+alpha 3


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41629 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold 2011-05-21 14:24:07 +00:00
parent db61366a55
commit ee3d8836e7
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/kits/locale/HashMapCatalog.cpp
View File

@ -206,13 +206,19 @@ BHashMapCatalog::SetString(const char *string, const char *translated,
const char *context, const char *comment)
{
BString stringCopy(string);
BString translatedCopy(translated);
status_t result = parseQuotedChars(stringCopy);
if (result != B_OK)
return result;
BString translatedCopy(translated);
if ((result = parseQuotedChars(translatedCopy)) != B_OK)
return result;
CatKey key(stringCopy.String(), context, comment);
BString commentCopy(comment);
if ((result = parseQuotedChars(commentCopy)) != B_OK)
return result;
CatKey key(stringCopy.String(), context, commentCopy.String());
return fCatMap.Put(key, translatedCopy.String());
// overwrite existing element
}

2
src/tools/locale/PlainTextCatalog.cpp
View File

@ -228,6 +228,7 @@ PlainTextCatalog::ReadFromFile(const char *path)
catalogFile.close();
#if 0
uint32 checkFP = ComputeFingerprint();
if (fFingerprint != checkFP) {
fprintf(stderr, "plaintext-catalog(sig=%s, lang=%s) "
@ -238,6 +239,7 @@ PlainTextCatalog::ReadFromFile(const char *path)
fFingerprint);
return B_BAD_DATA;
}
#endif
// some information living in member variables needs to be copied
// to attributes. Although these attributes should have been written