aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Moore <dooglus@gmail.com>2011-01-21 12:14:20 -0800
committerChris Moore <dooglus@gmail.com>2011-01-21 12:14:20 -0800
commitfdec7fe2035f118237d30c314a27dae0624822b6 (patch)
tree1760775b8b7416edc1c7e18ea5145bcb9972764d
parent18cb92ab184d0864af3fd9ff6423536333820c3b (diff)
parent5284e1b60e79bd535e808fb1d9968f22d565f9c2 (diff)
downloadbitcoin-fdec7fe2035f118237d30c314a27dae0624822b6.tar.xz
Merge branch show-version-in-help-2 of https://github.com/dooglus/bitcoin
-rw-r--r--init.cpp5
-rw-r--r--serialize.h1
2 files changed, 4 insertions, 2 deletions
diff --git a/init.cpp b/init.cpp
index 92a428dd00..04bdd68cde 100644
--- a/init.cpp
+++ b/init.cpp
@@ -158,8 +158,9 @@ bool AppInit2(int argc, char* argv[])
if (mapArgs.count("-?") || mapArgs.count("--help"))
{
+ string beta = VERSION_IS_BETA ? _(" beta") : "";
string strUsage = string() +
- "bitcoin version " + FormatVersion(VERSION).c_str() + " beta\n" +
+ _("Bitcoin version") + " " + FormatVersion(VERSION) + pszSubVer + beta + "\n\n" +
_("Usage:") + "\t\t\t\t\t\t\t\t\t\t\n" +
" bitcoin [options] \t " + "\n" +
" bitcoin [options] <command> [params]\t " + _("Send command to -server or bitcoind\n") +
@@ -228,7 +229,7 @@ bool AppInit2(int argc, char* argv[])
if (!fDebug && !pszSetDataDir[0])
ShrinkDebugFile();
printf("\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n");
- printf("Bitcoin version %s%s beta\n", FormatVersion(VERSION).c_str(), pszSubVer);
+ printf("Bitcoin version %s%s%s\n", FormatVersion(VERSION).c_str(), pszSubVer, VERSION_IS_BETA ? _(" beta") : "");
#ifdef GUI
printf("OS version %s\n", ((string)wxGetOsDescription()).c_str());
printf("System default language is %d %s\n", g_locale.GetSystemLanguage(), ((string)g_locale.GetSysName()).c_str());
diff --git a/serialize.h b/serialize.h
index 8153382ea1..f434b04ca6 100644
--- a/serialize.h
+++ b/serialize.h
@@ -27,6 +27,7 @@ static const unsigned int MAX_SIZE = 0x02000000;
static const int VERSION = 31902;
static const char* pszSubVer = "";
+static const bool VERSION_IS_BETA = true;