X-Git-Url: https://git.saurik.com/android/aapt.git/blobdiff_plain/f68488ad414c4e47e47c66c4041a8178dbbaff16..8583f5e1725b84c60e501cbc2f579d13ce65a51d:/XMLNode.cpp?ds=sidebyside diff --git a/XMLNode.cpp b/XMLNode.cpp index 452549b..8551b0f 100644 --- a/XMLNode.cpp +++ b/XMLNode.cpp @@ -166,7 +166,7 @@ status_t hasSubstitutionErrors(const char* fileName, if (argCount > 1 && nonpositional) { SourcePos(String8(fileName), inXml->getLineNumber()).error( "Multiple substitutions specified in non-positional format; " - "did you mean to add the formatted=\"true\" attribute?\n"); + "did you mean to add the formatted=\"false\" attribute?\n"); return NOT_ENOUGH_DATA; } @@ -203,13 +203,9 @@ status_t parseStyledString(Bundle* bundle, } } if (xliffDepth == 0 && pseudolocalize) { -#ifdef ENABLE_PSEUDOLOCALIZE std::string orig(String8(text).string()); std::string pseudo = pseudolocalize_string(orig); curString.append(String16(String8(pseudo.c_str()))); -#else - assert(false); -#endif } else { if (isFormatted && hasSubstitutionErrors(fileName, inXml, text) != NO_ERROR) { return UNKNOWN_ERROR;