Skip to content

Commit ed5e52c

Browse files
undo offensive automated reformatting of biblesync code.
1 parent 85e84e1 commit ed5e52c

File tree

1 file changed

+23
-7
lines changed

1 file changed

+23
-7
lines changed

src/main/biblesync_glue.cc

Lines changed: 23 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -101,12 +101,18 @@ biblesync_navigate(char cmd, string speaker_uuid,
101101
// mismatch
102102
case 'M':
103103
if (settings.bs_mismatch) {
104-
message = BSP + (string)_("Mismatched packet\n\n") + info + ((info.substr(0, 8) == "announce")
105-
? ("\nMessage: " + presence)
106-
: ("\nBible: " + bible + "; Ref: " + ref + "; Alt: " + alt + "\nGroup: " + group + "; Domain: " + domain)) +
107-
(settings.bs_debug
108-
? ("\n\n" + (string)dump)
109-
: "");
104+
message = BSP + (string)_("Mismatched packet\n\n")
105+
+ info
106+
+ ((info.substr(0, 8) == "announce")
107+
? ("\nMessage: " + presence)
108+
: ("\nBible: " + bible
109+
+ "; Ref: " + ref
110+
+ "; Alt: " + alt
111+
+ "\nGroup: " + group
112+
+ "; Domain: " + domain))
113+
+ (settings.bs_debug
114+
? ("\n\n" + (string)dump)
115+
: "");
110116
gui_generic_warning((char *)message.c_str());
111117
}
112118
break;
@@ -252,7 +258,17 @@ biblesync_navigate(char cmd, string speaker_uuid,
252258
break;
253259

254260
default:
255-
message = _("ERROR: unknown BibleSync indicator: ") + cmd + (string) ".\n" + (string)_("Other indications are:") + "\nbible: " + bible + "\nref: " + ref + "\nalt: " + alt + "\ngroup: " + group + "\ndomain: " + domain + "\ninfo: " + info + "\ndump:\n" + dump;
261+
message = _("ERROR: unknown BibleSync indicator: ")
262+
+ cmd
263+
+ (string) ".\n"
264+
+ (string)_("Other indications are:")
265+
+ "\nbible: " + bible
266+
+ "\nref: " + ref
267+
+ "\nalt: " + alt
268+
+ "\ngroup: " + group
269+
+ "\ndomain: " + domain
270+
+ "\ninfo: " + info
271+
+ "\ndump:\n" + dump;
256272
gui_generic_warning((char *)message.c_str());
257273
break;
258274
}

0 commit comments

Comments
 (0)