Port r8985 to 3.4 branch. Fix regression introduced by previous patch.

src/messages.js

Index: src/messages.js
diff --git a/src/messages.js b/src/messages.js
index 65bda7c94251e93938245368b176a6abbac59345..e93f71c0626a78d64b083e712643caa25385ea5e 100644
--- a/src/messages.js
+++ b/src/messages.js
@@ -57,11 +57,13 @@ function FormatString(format, message) {
   for (var i = 0; i < format.length; i++) {
     var str = format[i];
     for (arg_num = 0; arg_num < kReplacementMarkers.length; arg_num++) {
-      if (str !== kReplacementMarkers[arg_num]) continue;
-      try {
-        str = ToDetailString(args[arg_num]);
-      } catch (e) {
-        str = "#<error>";
+      if (str == kReplacementMarkers[arg_num]) {
+        try {
+          str = ToDetailString(args[arg_num]);
+        } catch (e) {
+          str = "#<error>";
+        }
+        break;
       }
     }
     result += str;