aboutsummaryrefslogtreecommitdiff
path: root/src/util
diff options
context:
space:
mode:
authorHennadii Stepanov <32963518+hebasto@users.noreply.github.com>2019-06-28 21:09:58 +0300
committerHennadii Stepanov <32963518+hebasto@users.noreply.github.com>2019-07-24 16:33:20 +0300
commit753f7cccce83084f4b18cf4bdf3225183179508c (patch)
tree9efb597566399ccb2bd3d44ad6add039e66a353a /src/util
parent7c45e14f2f682eddcc853c0f6051c7c8c6387289 (diff)
scripted-diff: Make translation bilingual
-BEGIN VERIFY SCRIPT- sed -i 's/inline std::string _(const char\* psz)/inline bilingual_str _(const char\* psz)/' src/util/translation.h sed -i 's/return G_TRANSLATION_FUN ? (G_TRANSLATION_FUN)(psz) : psz;/return bilingual_str{psz, G_TRANSLATION_FUN ? (G_TRANSLATION_FUN)(psz) : psz};/' src/util/translation.h sed -i 's/\b_("\([^"]\|\\"\)*")/&.translated/g' $(git grep --files-with-matches '\b_("' src) echo Hard cases - multiline strings. sed -i 's/"Visit %s for further information about the software.")/&.translated/g' src/init.cpp sed -i "s/\"Only rebuild the block database if you are sure that your computer's date and time are correct\")/&.translated/g" src/init.cpp sed -i 's/" restore from a backup.")/&.translated/g' src/wallet/db.cpp sed -i 's/" or address book entries might be missing or incorrect.")/&.translated/g' src/wallet/wallet.cpp echo Special case. sed -i 's/_(COPYRIGHT_HOLDERS)/&.translated/' src/util/system.cpp test/lint/lint-format-strings.py -END VERIFY SCRIPT-
Diffstat (limited to 'src/util')
-rw-r--r--src/util/error.cpp4
-rw-r--r--src/util/system.cpp2
-rw-r--r--src/util/translation.h4
3 files changed, 5 insertions, 5 deletions
diff --git a/src/util/error.cpp b/src/util/error.cpp
index 1b662d3700..9edb7dc533 100644
--- a/src/util/error.cpp
+++ b/src/util/error.cpp
@@ -38,10 +38,10 @@ std::string TransactionErrorString(const TransactionError err)
std::string AmountHighWarn(const std::string& optname)
{
- return strprintf(_("%s is set very high!"), optname);
+ return strprintf(_("%s is set very high!").translated, optname);
}
std::string AmountErrMsg(const char* const optname, const std::string& strValue)
{
- return strprintf(_("Invalid amount for -%s=<amount>: '%s'"), optname, strValue);
+ return strprintf(_("Invalid amount for -%s=<amount>: '%s'").translated, optname, strValue);
}
diff --git a/src/util/system.cpp b/src/util/system.cpp
index 2a069c554f..c27b0cc105 100644
--- a/src/util/system.cpp
+++ b/src/util/system.cpp
@@ -1185,7 +1185,7 @@ int GetNumCores()
std::string CopyrightHolders(const std::string& strPrefix)
{
- const auto copyright_devs = strprintf(_(COPYRIGHT_HOLDERS), COPYRIGHT_HOLDERS_SUBSTITUTION);
+ const auto copyright_devs = strprintf(_(COPYRIGHT_HOLDERS).translated, COPYRIGHT_HOLDERS_SUBSTITUTION);
std::string strCopyrightHolders = strPrefix + copyright_devs;
// Make sure Bitcoin Core copyright is not removed by accident
diff --git a/src/util/translation.h b/src/util/translation.h
index c70508c01e..f100dab20d 100644
--- a/src/util/translation.h
+++ b/src/util/translation.h
@@ -34,9 +34,9 @@ const extern std::function<std::string(const char*)> G_TRANSLATION_FUN;
* Translation function.
* If no translation function is set, simply return the input.
*/
-inline std::string _(const char* psz)
+inline bilingual_str _(const char* psz)
{
- return G_TRANSLATION_FUN ? (G_TRANSLATION_FUN)(psz) : psz;
+ return bilingual_str{psz, G_TRANSLATION_FUN ? (G_TRANSLATION_FUN)(psz) : psz};
}
#endif // BITCOIN_UTIL_TRANSLATION_H