diff options
| author | Tor Norbye <tnorbye@google.com> | 2014-04-25 08:40:20 -0700 |
|---|---|---|
| committer | Tor Norbye <tnorbye@google.com> | 2014-04-25 08:40:20 -0700 |
| commit | 989c7917f92d5f9c7541d90fb250733919b2ad30 (patch) | |
| tree | f6bb67212f685c7a1c0bd3fc11db294e756d616e /resources-en | |
| parent | f5bfe758e7fe26a44e94cb91f2abeceb039932c0 (diff) | |
| parent | 0f831a730c50607e2ffd95020875af6185e17734 (diff) | |
| download | idea-989c7917f92d5f9c7541d90fb250733919b2ad30.tar.gz | |
Merge remote-tracking branch 'aosp/upstream-master' into merge
Conflicts:
.idea/modules.xml
Change-Id: I1c543bf1780b54245d29d8e2e90a1717ba3d1766
Diffstat (limited to 'resources-en')
| -rw-r--r-- | resources-en/src/inspectionDescriptions/InconsistentResourceBundle.html | 43 | ||||
| -rw-r--r-- | resources-en/src/inspectionDescriptions/WrongPackageStatement.html | 3 |
2 files changed, 43 insertions, 3 deletions
diff --git a/resources-en/src/inspectionDescriptions/InconsistentResourceBundle.html b/resources-en/src/inspectionDescriptions/InconsistentResourceBundle.html index d8d5003ec066..edd04cded600 100644 --- a/resources-en/src/inspectionDescriptions/InconsistentResourceBundle.html +++ b/resources-en/src/inspectionDescriptions/InconsistentResourceBundle.html @@ -22,8 +22,8 @@ option controls invalid resource bundle structure inspection.<br> It reports properties contained in inherited properties file that are missing in parent (or in sibling if there is no parent).<br> E.g. having this resource bundle:<br> - <b>messages_fr.properties</b>: <font color="#000080"><b>abc=xxx</b></font><br> <b>messages.properties</b>: empty<br> + <b>messages_fr.properties</b>: <font color="#000080"><b>abc=xxx</b></font><br> Property <font color="#000080"><b>abc</b></font> translation here is not available for any language except French, and, thus, will be reported as missing in the (default) properties file <b>messages.properties</b>. @@ -36,11 +36,50 @@ </ul> option checks for properties which are copy-pasted into several properties files verbatim.<br> E.g. in this resource bundle:<br> - <b>messages_fr.properties</b>: <font color="#000080"><b>abc=xxx</b></font><br> <b>messages.properties</b>: <font color="#000080"><b>abc=xxx</b></font><br> + <b>messages_fr.properties</b>: <font color="#000080"><b>abc=xxx</b></font><br> Property <font color="#000080"><b>abc</b></font> will be reported as unnecessarily inherited in the file <b>messages_fr.properties</b>. <br> + +<ul> + <li> + + <b>Report properties overridden with different placeholders</b> + </li> + </ul> + option checks for properties which are overridden for placeholders consistency.<br> + E.g. in this resource bundle:<br> + <b>messages.properties</b>:<br> + <font color="#000080"><b>qwe={0}xxx{1}</b></font><br> + <font color="#000080"><b>abc={0}yyy{1}</b></font><br> + <b>messages_fr.properties</b>:<br> + <font color="#000080"><b>qwe={0}xxx{0}xxx{1}</b></font><br> + <font color="#000080"><b>abc={0}yyy</b></font><br> + + + Property <font color="#000080"><b>abc</b></font> will be reported as property contains message format placeholders + with value not corresponding to <b>messages.properties</b>. + <br> + +<ul> + <li> + + <b>Report properties overridden with different values endings</b> + </li> + </ul> + option checks for properties which are overridden for endings consistency.<br> + E.g. in this resource bundle:<br> + <b>messages.properties</b>:<br> + <font color="#000080"><b>abc=xxxzzz</b></font><br> + <b>messages_fr.properties</b>:<br> + <font color="#000080"><b>abc=xxx;</b></font><br> + + + Property <font color="#000080"><b>abc</b></font> will be reported as property contains special signs + (<b>'!'</b>, <b>'?'</b>, <b>'.'</b>, <b>':'</b> or <b>';'</b>) at the end of value but + value in <b>messages.properties</b> doesn't. + <br> </font> </body> diff --git a/resources-en/src/inspectionDescriptions/WrongPackageStatement.html b/resources-en/src/inspectionDescriptions/WrongPackageStatement.html index 01fb18e9f597..78ff05272bfe 100644 --- a/resources-en/src/inspectionDescriptions/WrongPackageStatement.html +++ b/resources-en/src/inspectionDescriptions/WrongPackageStatement.html @@ -1,5 +1,6 @@ <html> <body> -<font face="verdana" size="-1">Detects package statements that do not correspond to the project directory structure.</font> +<font face="verdana" size="-1">Detects <b>package</b> statements that do not correspond to the project directory structure + and reports classes without <b>package</b> statements.</font> </body> </html>
\ No newline at end of file |