[haiku-commits] r41629 - in haiku/trunk/src: kits/locale tools/locale
- From: ingo_weinhold@xxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Sat, 21 May 2011 16:24:08 +0200 (CEST)
Author: bonefish
Date: 2011-05-21 16:24:07 +0200 (Sat, 21 May 2011)
New Revision: 41629
Changeset: https://dev.haiku-os.org/changeset/41629
Ticket: https://dev.haiku-os.org/ticket/7543
Modified:
haiku/trunk/src/kits/locale/HashMapCatalog.cpp
haiku/trunk/src/tools/locale/PlainTextCatalog.cpp
Log:
* BHashMapCatalog::SetString(): Also process escaped characters in the comment.
Fixes #7543 (ReadOnlyBootPrompt only showing English welcome text).
* Disabled fingerprint check in linkcatkeys. Fingerprints change due to the
BHashMapCatalog::SetString() change.
+alpha 3
Modified: haiku/trunk/src/kits/locale/HashMapCatalog.cpp
===================================================================
--- haiku/trunk/src/kits/locale/HashMapCatalog.cpp 2011-05-21 13:15:46 UTC
(rev 41628)
+++ haiku/trunk/src/kits/locale/HashMapCatalog.cpp 2011-05-21 14:24:07 UTC
(rev 41629)
@@ -206,13 +206,19 @@
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
}
Modified: haiku/trunk/src/tools/locale/PlainTextCatalog.cpp
===================================================================
--- haiku/trunk/src/tools/locale/PlainTextCatalog.cpp 2011-05-21 13:15:46 UTC
(rev 41628)
+++ haiku/trunk/src/tools/locale/PlainTextCatalog.cpp 2011-05-21 14:24:07 UTC
(rev 41629)
@@ -228,6 +228,7 @@
catalogFile.close();
+#if 0
uint32 checkFP = ComputeFingerprint();
if (fFingerprint != checkFP) {
fprintf(stderr, "plaintext-catalog(sig=%s, lang=%s) "
@@ -238,6 +239,7 @@
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
Other related posts:
- » [haiku-commits] r41629 - in haiku/trunk/src: kits/locale tools/locale - ingo_weinhold
