Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 66c70e13 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 23529 into eclair 

* changes:
  Make it an error to use a bare apostrophe in aapt, and adjust warnings/errors.
parents 040571aa c87d2521

core/res/res/values-en-rUS/donottranslate-names.xml

+1 −1
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ 
        MD, MS, PH.D., PHD, SR, V, VI, VII, VIII, X

    </string>

    <string name="common_last_name_prefixes">

        D', DE, DEL, DI, LA, LE, MC, SAN, ST, TER, VAN, VON

        D\', DE, DEL, DI, LA, LE, MC, SAN, ST, TER, VAN, VON

    </string>

    <string name="common_name_conjunctions">

        &amp;, AND, OR

libs/utils/ResourceTypes.cpp

+10 −1
Original line number Diff line number Diff line
@@ -3284,7 +3284,16 @@ bool ResTable::collectString(String16* outString, 
                    break;

                }

                if (c == '\'' && (quoted == 0 || quoted == '\'')) {

                    break;

                    /*

                     * In practice, when people write ' instead of \'

                     * in a string, they are doing it by accident

                     * instead of really meaning to use ' as a quoting

                     * character.  Warn them so they don't lose it.

                     */

                    if (outErrorMsg) {

                        *outErrorMsg = "Apostrophe not preceded by \\";

                    }

                    return false;

                }

            }

            p++;

tools/aapt/ResourceTable.cpp

+1 −2
Original line number Diff line number Diff line
@@ -2364,13 +2364,12 @@ ResourceTable::validateLocalizations(void) 
                        String8 region(config.string(), 2);

                        if (configSet.find(region) == configSet.end()) {

                            if (configSet.count(defaultLocale) == 0) {

                                fprintf(stdout, "aapt: error: "

                                fprintf(stdout, "aapt: warning: "

                                        "*** string '%s' has no default or required localization "

                                        "for '%s' in %s\n",

                                        String8(nameIter->first).string(),

                                        config.string(),

                                        mBundle->getResourceSourceDirs()[0]);

                                err = UNKNOWN_ERROR;

                            }

                        }

                    }

tools/aapt/XMLNode.cpp

+6 −1
Original line number Diff line number Diff line
@@ -219,7 +219,12 @@ moveon: 
            }

            spanStack.pop();



            if (empty) {

            /*

             * This warning seems to be just an irritation to most people,

             * since it is typically introduced by translators who then never

             * see the warning.

             */

            if (0 && empty) {

                fprintf(stderr, "%s:%d: warning: empty '%s' span found in text '%s'\n",

                        fileName, inXml->getLineNumber(),

                        String8(spanTag).string(), String8(*outString).string());