From b2230fb220e9a34b2f6a5c1e299d6bfbf1b1c3f5 Mon Sep 17 00:00:00 2001 From: Kuro Date: Thu, 24 Dec 2020 06:24:42 +0800 Subject: [PATCH 1/4] Update copyright in LicenseInfo --- src/init.cpp | 11 +++++++++-- src/util.cpp | 16 ++++++++++------ 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/src/init.cpp b/src/init.cpp index 3215bc0186..e217120481 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -613,8 +613,15 @@ std::string LicenseInfo() { const std::string URL_SOURCE_CODE = ""; const std::string URL_WEBSITE = ""; - // todo: remove urls from translations on next change - return CopyrightHolders(strprintf(_("Copyright (C) %i-%i"), 2009, COPYRIGHT_YEAR) + " ") + "\n" + + + std::string copyright = CopyrightHolders(strprintf(_("Copyright (C) %i-%i"), 2016, COPYRIGHT_YEAR) + " "); + + const std::string bitcoinStr = strprintf("%i-%i The Bitcoin Core", 2016, COPYRIGHT_YEAR); + if (copyright.find(bitcoinStr) != std::string::npos) { + copyright.replace(copyright.find(bitcoinStr), sizeof("2016") - 1, "2009"); + } + + return copyright + "\n" + "\n" + strprintf(_("Please contribute if you find %s useful. " "Visit %s for further information about the software."), diff --git a/src/util.cpp b/src/util.cpp index 68a1b8276c..bb4b630b81 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -1018,13 +1018,17 @@ int GetNumCores() std::string CopyrightHolders(const std::string& strPrefix) { - std::string strCopyrightHolders = strPrefix + strprintf(_(COPYRIGHT_HOLDERS), _(COPYRIGHT_HOLDERS_SUBSTITUTION)); + const auto copyright_devs = strprintf(_(COPYRIGHT_HOLDERS), _(COPYRIGHT_HOLDERS_SUBSTITUTION)); + std::string strCopyrightHolders = strPrefix + copyright_devs; - // Check for untranslated substitution to make sure Bitcoin Core copyright is not removed by accident - if (strprintf(COPYRIGHT_HOLDERS, COPYRIGHT_HOLDERS_SUBSTITUTION).find("Bitcoin Core") == std::string::npos) { - strCopyrightHolders - += '\n' + strPrefix + "The Bitcoin Core developers" - + '\n' + strPrefix + "The Firo Core developers"; + // Make sure Firo Core copyright is not removed by accident + if (copyright_devs.find(_("Firo Core")) == std::string::npos) { + strCopyrightHolders += '\n' + strPrefix + "The Firo Core developers"; } + // Make sure Bitcoin Core copyright is not removed by accident + if (copyright_devs.find("Bitcoin Core") == std::string::npos) { + strCopyrightHolders += '\n' + strPrefix + "The Bitcoin Core developers"; + } + return strCopyrightHolders; } From 63f5312809ab22f2ec0c5a1bc6f8427c3aa18dbf Mon Sep 17 00:00:00 2001 From: Kuro Date: Thu, 24 Dec 2020 18:17:39 +0800 Subject: [PATCH 2/4] Update COPYING --- COPYING | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/COPYING b/COPYING index c6203c0f76..4f0a95aebb 100644 --- a/COPYING +++ b/COPYING @@ -1,6 +1,7 @@ The MIT License (MIT) -Copyright (c) 2009-2017 The Bitcoin Core developers +Copyright (c) 2016-2020 The Firo Core developers +Copyright (c) 2009-2020 The Bitcoin Core developers Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal From ac5591243addf3bb10ab41235a64ff3cd288f471 Mon Sep 17 00:00:00 2001 From: Kuro Date: Thu, 24 Dec 2020 18:20:39 +0800 Subject: [PATCH 3/4] Add Dash's Masternodes in LicenseInfo --- src/init.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/init.cpp b/src/init.cpp index e217120481..8c2bebff74 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -634,7 +634,9 @@ std::string LicenseInfo() _("This is experimental software.") + "\n" + strprintf(_("Distributed under the MIT software license, see the accompanying file %s or %s"), "COPYING", "") + "\n" + "\n" + - strprintf(_("This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit %s and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard."), "") + + strprintf(_("This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit %s and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard."), "") + "\n" + + "\n" + + strprintf(_("This product includes Masternodes software developed by the Dash Core developers %s."), "") + "\n"; } From ab7363fa7b8dd34e1a1b93e64d06da5ee58bad7c Mon Sep 17 00:00:00 2001 From: Kuro Date: Thu, 7 Jan 2021 04:05:31 +0800 Subject: [PATCH 4/4] Update license year range to 2021 --- COPYING | 4 ++-- configure.ac | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/COPYING b/COPYING index 4f0a95aebb..b53ebd2551 100644 --- a/COPYING +++ b/COPYING @@ -1,7 +1,7 @@ The MIT License (MIT) -Copyright (c) 2016-2020 The Firo Core developers -Copyright (c) 2009-2020 The Bitcoin Core developers +Copyright (c) 2016-2021 The Firo Core developers +Copyright (c) 2009-2021 The Bitcoin Core developers Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/configure.ac b/configure.ac index 157f0dbd2b..00d3bc10b5 100644 --- a/configure.ac +++ b/configure.ac @@ -5,7 +5,7 @@ define(_CLIENT_VERSION_MINOR, 14) define(_CLIENT_VERSION_REVISION, 1) define(_CLIENT_VERSION_BUILD, 2) define(_CLIENT_VERSION_IS_RELEASE, true) -define(_COPYRIGHT_YEAR, 2020) +define(_COPYRIGHT_YEAR, 2021) define(_COPYRIGHT_HOLDERS,[The %s developers]) define(_COPYRIGHT_HOLDERS_SUBSTITUTION,[[Firo Core]]) AC_INIT([Firo Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[https://github.com/firoorg/firo/issues],[firo],[https://firo.org/])