diff options
| author | Tor Norbye <tnorbye@google.com> | 2015-01-29 02:58:42 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-01-29 02:58:42 +0000 |
| commit | d4f069cdc3d5e47649f14c8185e47b4ebc06a2c0 (patch) | |
| tree | ed2f40a95afc2d60b6237d776b040f3ac6a5ef35 | |
| parent | 22aad096f8122b6cbce7b40629fe172037620c9b (diff) | |
| parent | c28568ce08c7709f2b2b56eef9a4a0e1bddcd53d (diff) | |
| download | base-master-soong.tar.gz | |
Merge "Fix lint error message (parameters were reversed)" into studio-1.1-dev automerge: 7b61f49 automerge: 57e2b9b automerge: 4b4f1cfmaster-soong
automerge: c28568c
* commit 'c28568ce08c7709f2b2b56eef9a4a0e1bddcd53d':
Fix lint error message (parameters were reversed)
| -rw-r--r-- | lint/cli/src/test/java/com/android/tools/lint/checks/LocaleFolderDetectorTest.java | 4 | ||||
| -rw-r--r-- | lint/libs/lint-checks/src/main/java/com/android/tools/lint/checks/LocaleFolderDetector.java | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lint/cli/src/test/java/com/android/tools/lint/checks/LocaleFolderDetectorTest.java b/lint/cli/src/test/java/com/android/tools/lint/checks/LocaleFolderDetectorTest.java index 91c0c1fc10..73d958e2e7 100644 --- a/lint/cli/src/test/java/com/android/tools/lint/checks/LocaleFolderDetectorTest.java +++ b/lint/cli/src/test/java/com/android/tools/lint/checks/LocaleFolderDetectorTest.java @@ -65,8 +65,8 @@ public class LocaleFolderDetectorTest extends AbstractCheckTest { public void testAlpha3() throws Exception { assertEquals("" - + "res/values-b+nor+NOR: Warning: For compatibility, should use 2-letter language codes when available; use nor instead of no [UseAlpha2]\n" - + "res/values-b+nor+NOR: Warning: For compatibility, should use 2-letter region codes when available; use NOR instead of NO [UseAlpha2]\n" + + "res/values-b+nor+NOR: Warning: For compatibility, should use 2-letter language codes when available; use no instead of nor [UseAlpha2]\n" + + "res/values-b+nor+NOR: Warning: For compatibility, should use 2-letter region codes when available; use NO instead of NOR [UseAlpha2]\n" + "0 errors, 2 warnings\n", lintProject( diff --git a/lint/libs/lint-checks/src/main/java/com/android/tools/lint/checks/LocaleFolderDetector.java b/lint/libs/lint-checks/src/main/java/com/android/tools/lint/checks/LocaleFolderDetector.java index 32e08251a9..a3b047744e 100644 --- a/lint/libs/lint-checks/src/main/java/com/android/tools/lint/checks/LocaleFolderDetector.java +++ b/lint/libs/lint-checks/src/main/java/com/android/tools/lint/checks/LocaleFolderDetector.java @@ -185,7 +185,7 @@ public class LocaleFolderDetector extends Detector implements Detector.ResourceF if (languageAlpha2 != null) { String message = String.format("For compatibility, should use 2-letter " + "language codes when available; use `%1$s` instead of `%2$s`", - language, languageAlpha2); + languageAlpha2, language); context.report(USE_ALPHA_2, Location.create(context.file), message); } } @@ -196,7 +196,7 @@ public class LocaleFolderDetector extends Detector implements Detector.ResourceF if (regionAlpha2 != null) { String message = String.format("For compatibility, should use 2-letter " + "region codes when available; use `%1$s` instead of `%2$s`", - region, regionAlpha2); + regionAlpha2 , region); context.report(USE_ALPHA_2, Location.create(context.file), message); } |