From 1fe26ccb6c5c84ef5c1ef1b1e4b3b01b0c650e8a Mon Sep 17 00:00:00 2001 From: Koichiro IWAO Date: Tue, 28 Feb 2023 22:06:49 +0900 Subject: [PATCH] Cedar: Trim contiguous whitespaces in version string Before change, contiguous whitespaces appeared in version string. This room is for beta string (such as Alpha, Beta) and beta number but it looks a bit odd if the build is not alpha/beta/RC. > Version 5.02 Build 5180 Alpha 3 (Japanese) > Version 5.02 Build 5180 Beta 3 (Japanese) > Version 5.02 Build 5180 Release Candidate 3 (Japanese) > Version 5.02 Build 5180 (Japanese) > ^^^ Now version string looks neat like this: > Version 5.02 Build 5180 (Japanese) > Version 5.02 Build 5180 Release Candidate 3 (Japanese) --- src/Cedar/Cedar.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/Cedar/Cedar.c b/src/Cedar/Cedar.c index fc234217..02b4ee2b 100644 --- a/src/Cedar/Cedar.c +++ b/src/Cedar/Cedar.c @@ -1564,11 +1564,14 @@ CEDAR *NewCedar(X *server_x, K *server_k) #endif // ALPHA_VERSION ToStr(tmp2, c->Beta); + Format(tmp2, sizeof(tmp2), " %s %s ", beta_str, tmp2); - Format(tmp, sizeof(tmp), "Version %u.%02u Build %u %s %s (%s)", + Format(tmp, sizeof(tmp), + "Version %u.%02u Build %u" + "%s" // Alpha, Beta, Release Candidate or nothing + "(%s)", // Language CEDAR_VERSION_MAJOR, CEDAR_VERSION_MINOR, CEDAR_VERSION_BUILD, - c->Beta == 0 ? "" : beta_str, - c->Beta == 0 ? "" : tmp2, + c->Beta == 0 ? " " : tmp2, _SS("LANGSTR")); Trim(tmp);