Join GitHub today
GitHub is home to over 20 million developers working together to host and review code, manage projects, and build software together.
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
Already on GitHub? Sign in to your account
Unify product name to as few places as possible #7192
Conversation
|
Good. utACK |
MarcoFalke
and 1 other
commented on an outdated diff
Dec 9, 2015
| @@ -500,7 +500,7 @@ std::string HelpMessage(HelpMessageMode mode) | ||
| std::string LicenseInfo() | ||
| { | ||
| // todo: remove urls from translations on next change | ||
| - return FormatParagraph(strprintf(_("Copyright (C) 2009-%i The Bitcoin Core Developers"), COPYRIGHT_YEAR)) + "\n" + | ||
| + return FormatParagraph(strprintf(_("Copyright (C) 2009-%i The %s Developers"), COPYRIGHT_YEAR, _(PACKAGE_NAME))) + "\n" + |
MarcoFalke
Member
|
jonasschnelli
and 4 others
commented on an outdated diff
Dec 9, 2015
| @@ -38,7 +38,7 @@ | ||
| #define DO_STRINGIZE(X) #X | ||
| //! Copyright string used in Windows .rc files | ||
| -#define COPYRIGHT_STR "2009-" STRINGIZE(COPYRIGHT_YEAR) " The Bitcoin Core Developers" | ||
| +#define COPYRIGHT_STR "2009-" STRINGIZE(COPYRIGHT_YEAR) " The " PACKAGE_NAME " Developers" |
jonasschnelli
Member
|
|
Nice! |
|
Currently fails windows: https://bitcoin.jonasschnelli.ch/pulls/7192/build-win.log i'm happy to test this if windows issues are solved. |
jonasschnelli
added
the
Refactoring
label
Dec 10, 2015
laanwj
commented on the diff
Dec 10, 2015
| @@ -104,7 +108,7 @@ BitcoinGUI::BitcoinGUI(const PlatformStyle *platformStyle, const NetworkStyle *n | ||
| { | ||
| GUIUtil::restoreWindowGeometry("nWindow", QSize(850, 550), this); | ||
| - QString windowTitle = tr("Bitcoin Core") + " - "; | ||
| + QString windowTitle = tr(PACKAGE_NAME) + " - "; |
laanwj
Owner
|
|
Concept ACK (for 0.13 - due to translation changes this is too late for 0.12) |
MarcoFalke
commented on an outdated diff
Dec 10, 2015
| @@ -357,7 +357,7 @@ | ||
| <item row="16" column="0"> | ||
| <widget class="QPushButton" name="openDebugLogfileButton"> | ||
| <property name="toolTip"> | ||
| - <string>Open the Bitcoin Core debug log file from the current data directory. This can take a few seconds for large log files.</string> | ||
| + <string>Open the %1 debug log file from the current data directory. This can take a few seconds for large log files.</string> |
|
|
|
Added a second commit reworking the binary blobs used for Mac-deploy. Haven't rebased yet pending completion/testing. @laanwj I am probably going to need to do the translation updates for Bitcoin LJR anyway, so let me know and I can see about doing it in Transifex for 0.12 if that'd be preferable. |
|
concept ACK 0898436e860f695028b3fc6b612074712bbdcbc6 |
|
Ok, I believe I have addressed all previous requests, but also introduced a packaging FIXME which I hope @theuni can help out with... |
|
Travis is happy with it now, and I've confirmed the Mac DMG background image is rendered correctly in gitian. Only thing left is the depends/ stuff I need @theuni 's guidance on... But this is possibly "good enough to merge" without that, even if not perfect (which is the enemy of the good). |
|
Looks like there are current binaries for testing at https://bitcoin.jonasschnelli.ch/pulls/7192/ Had a quick look at the linux binaries and it looks ok. Haven't checked OS X, though. |
Yes. Just built. @luke-jr: Somethings wrong with the background. I don't get one. Did you made sure, that both resolutions are in the tiff file? Needs to be a @2x (HiDPI) and a normal? |
|
On linux, you probably need a tool like this: http://linux.die.net/man/1/tiffcp |
|
Ok, try this one. |
|
Build error on osx: /usr/bin/tiffcp -c none dpi36.background.tiff dpi72.background.tiff dist/Bitcoin-Qt.app/Contents/MacOS/Bitcoin-Qt dist/.background/background.tiff
dist/Bitcoin-Qt.app/Contents/MacOS/Bitcoin-Qt: Not a TIFF or MDI file, bad magic number 64207 (0xfacf).
make: *** [dist/.background/background.tiff] Error 253I guess the output file is wrong: |
|
@jonasschnelli Can you minimally modify the generated DS_Store to work, and post me the working file? (Not on your broken SSL server...) |
theuni
and 1 other
commented on an outdated diff
Dec 17, 2015
| @@ -52,6 +52,7 @@ install: | ||
| before_script: | ||
| - unset CC; unset CXX | ||
| - mkdir -p depends/SDKs depends/sdk-sources | ||
| + - if [ -n "$OSX_SDK" ]; then pip install --user cairosvg mac_alias ds_store; export PATH="$HOME/.local/bin:$PATH"; ( wget 'https://bitbucket.org/al45tair/ds_store/get/c80c23706eae.tar.gz' && tar -xzvpf c80c23706eae.tar.gz && cd al45tair-ds_store-c80c23706eae/ && python setup.py install --user; ) fi |
theuni
Member
|
luke-jr
and others
added some commits
Dec 13, 2015
|
I believe this is ready for merging. @laanwj Let me know if you would like me to prepare a 0.12 backport. Again, I am willing to fixup the translations for it. I will need to make it anyway for Bitcoin LJR, so might as well benefit Core in the process. |
|
Nice! Concept ACK. I was just about to implement the same thing when I figured I'd check the PR history and found this pleasant surprise :) Will test soon. |
MarcoFalke
commented on an outdated diff
Dec 22, 2015
| @@ -17,7 +17,7 @@ | ||
| <string>APPL</string> | ||
| <key>CFBundleGetInfoString</key> | ||
| - <string>@CLIENT_VERSION_MAJOR@.@CLIENT_VERSION_MINOR@.@CLIENT_VERSION_REVISION@, Copyright © 2009-@COPYRIGHT_YEAR@ The Bitcoin Core developers</string> | ||
| + <string>@CLIENT_VERSION_MAJOR@.@CLIENT_VERSION_MINOR@.@CLIENT_VERSION_REVISION@, Copyright © 2009-@COPYRIGHT_YEAR@ The @PACKAGE_NAME@ developers</string> |
MarcoFalke
Member
|
MarcoFalke
commented on an outdated diff
Dec 22, 2015
| @@ -513,7 +513,7 @@ std::string HelpMessage(HelpMessageMode mode) | ||
| std::string LicenseInfo() | ||
| { | ||
| // todo: remove urls from translations on next change | ||
| - return FormatParagraph(strprintf(_("Copyright (C) 2009-%i The Bitcoin Core Developers"), COPYRIGHT_YEAR)) + "\n" + | ||
| + return FormatParagraph(strprintf(_("Copyright (C) %i-%i The %s Developers"), 2009, COPYRIGHT_YEAR, _(PACKAGE_NAME))) + "\n" + |
MarcoFalke
and 1 other
commented on an outdated diff
Dec 22, 2015
| QString versionText = QString("Version %1").arg(QString::fromStdString(FormatFullVersion())); | ||
| - QString copyrightText = QChar(0xA9)+QString(" 2009-%1 ").arg(COPYRIGHT_YEAR) + QString(tr("The Bitcoin Core developers")); | ||
| + QString copyrightText = QChar(0xA9)+QString(" %1-%2 ").arg(2009).arg(COPYRIGHT_YEAR) + QString(tr("The %1 developers").arg(tr(PACKAGE_NAME))); |
jonasschnelli
Member
|
luke-jr
changed the title from
Unify product name to as few places as possible without major changes
to
Unify product name to as few places as possible
Dec 22, 2015
jonasschnelli
commented on an outdated diff
Dec 22, 2015
| @@ -0,0 +1,34 @@ | ||
| +<?xml version="1.0" standalone="no"?> | ||
| +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN" | ||
| + "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd"> | ||
| +<svg version="1.0" xmlns="http://www.w3.org/2000/svg" width="1000pt" height="640pt" viewBox="0 0 1000 640" preserveAspectRatio="xMidYMid meet"> | ||
| + <!-- kate: space-indent off; | ||
| + Copyright (c) 2011-2013 The Bitcoin Core developers |
|
|
jonasschnelli
commented on the diff
Dec 22, 2015
| + 'textSize': 12.0, | ||
| + 'viewOptionsVersion': 1, | ||
| + 'backgroundImageAlias': '\x00\x00\x00\x00\x02\x1e\x00\x02\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xd1\x94\\\xb0H+\x00\x05\x00\x00\x00\x98\x0fbackground.tiff\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x99\xd19\xb0\xf8\x00\x00\x00\x00\x00\x00\x00\x00\xff\xff\xff\xff\x00\x00\r\x02\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x0b.background\x00\x00\x10\x00\x08\x00\x00\xd1\x94\\\xb0\x00\x00\x00\x11\x00\x08\x00\x00\xd19\xb0\xf8\x00\x00\x00\x01\x00\x04\x00\x00\x00\x98\x00\x0e\x00 \x00\x0f\x00b\x00a\x00c\x00k\x00g\x00r\x00o\x00u\x00n\x00d\x00.\x00t\x00i\x00f\x00f\x00\x0f\x00\x02\x00\x00\x00\x12\x00\x1c/.background/background.tiff\x00\x14\x01\x06\x00\x00\x00\x00\x01\x06\x00\x02\x00\x00\x0cMacintosh HD\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xce\x97\xab\xc3H+\x00\x00\x01\x88[\x88\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02u\xab\x8d\xd1\x94\\\xb0devrddsk\xff\xff\xff\xff\x00\x00\t \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x07bitcoin\x00\x00\x10\x00\x08\x00\x00\xce\x97\xab\xc3\x00\x00\x00\x11\x00\x08\x00\x00\xd1\x94\\\xb0\x00\x00\x00\x01\x00\x14\x01\x88[\x88\x00\x16\xa9\t\x00\x08\xfaR\x00\x08\xfaQ\x00\x02d\x8e\x00\x0e\x00\x02\x00\x00\x00\x0f\x00\x1a\x00\x0c\x00M\x00a\x00c\x00i\x00n\x00t\x00o\x00s\x00h\x00 \x00H\x00D\x00\x13\x00\x01/\x00\x00\x15\x00\x02\x00\x14\xff\xff\x00\x00\xff\xff\x00\x00', | ||
| + 'backgroundColorBlue': 1.0, | ||
| + 'iconSize': 96.0, | ||
| + 'backgroundColorGreen': 1.0, | ||
| + 'arrangeBy': 'none', | ||
| + 'showIconPreview': True, | ||
| + 'gridSpacing': 100.0, | ||
| + 'gridOffsetY': 0.0, | ||
| + 'showItemInfo': False, | ||
| + 'labelOnBottom': True, | ||
| + 'backgroundType': 2, | ||
| + 'backgroundColorRed': 1.0 | ||
| +} | ||
| +alias = Alias.from_bytes(icvp['backgroundImageAlias']) |
jonasschnelli
Member
|
luke-jr
added some commits
Dec 22, 2015
|
Following further discussion of the copyright notice matter on IRC, I have separated the copyright notice code so that it instead uses independent COPYRIGHT_HOLDERS and COPYRIGHT_HOLDERS_SUBSTITUTION variables, so it is harder to accidentally modify them, yet when modified, translations get preserved as much as possible. (also fixed the incorrect copyright years on the DMG background image template) |
|
Tested ACK 4d5a3df |
|
Concept ACK |
|
Tested ACK 4d5a3df |
|
Tested ACK
|
fanquake
commented on the diff
Dec 25, 2015
| @@ -0,0 +1,34 @@ | ||
| +<?xml version="1.0" standalone="no"?> | ||
| +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN" | ||
| + "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd"> | ||
| +<svg version="1.0" xmlns="http://www.w3.org/2000/svg" width="1000pt" height="640pt" viewBox="0 0 1000 640" preserveAspectRatio="xMidYMid meet"> | ||
| + <!-- kate: space-indent off; |
|
|
|
Update on 0.12: Too many languages unfortunately do not have common translations of "Bitcoin Core", so it is impractical to try to include this for 0.12.0. |
|
I still don't see why "Bitcoin Core" needs to be translated in the first place: it's a proper name. |
|
I think we wanted to keep it because it was already translated in some places... What about not translating it after 0.13? |
|
What about not translating it from 0.12? |
Product names are not translated. "Windows" is "Windows", even in China, Japan and Korea. Look at this as an example http://www.microsoft.com/zh-cn |
|
This may be a cultural thing, but I would personally find a translation of
"Bitcoin Core" to Dutch quite silly.
|
|
No opinion on whether Bitcoin Core ought to be translated or not, but it would de facto be a change in translations, which is too late for 0.12.0 as I understand it. I would think at the very least, however, transliteration would be desirable for non-Latin languages. |
|
@luke-jr Even for non-Latin languages, the practice is not to translate/transliterate. |
|
It would make sense to translate if we had some different flavors to offer like Ubuntu Kylin for instance but I can't see where this happens. |
|
Anyhow, whether or not to translate the name is out-of-scope for this PR. |
|
Translation is complicated. I'm not 100% sure that that Luke-Jr meant the But as mentioned it is out of scope for this PR anyway. On Dec 26, 2015 6:13 PM, "MarcoFalke" notifications@github.com wrote:
|
|
utACK -- this seems very useful for "customized" Bitcoin Core versions. |
|
Concept ACK 4d5a3df |
luke-jr
referenced this pull request
Dec 30, 2015
Closed
setup.nsi.in has "bitcoin" and "Bitcoin Core" hardcoded a lot #7265
MarcoFalke
commented on an outdated diff
Jan 6, 2016
| - "libcap-dev" | ||
| - "libz-dev" | ||
| - "libbz2-dev" | ||
| +- "python-dev" | ||
| +- "python-setuptools" | ||
| +- "fonts-tuffy" | ||
| reference_datetime: "2015-06-01 00:00:00" |
MarcoFalke
Member
|
|
Isn't the "whether to translate Bitcoin Core" discussion irrelevant to this pull? It just factors it out, doesn't make it untranslatable right? Also: needs conflicts resolved |
Right, it's a tangent discussion. If it's decided to make it untranslatable, someone would need to open a new PR - it's outside the scope of this one, which maintains the status quo of "translatable". Merged master (conflicts resolved). |
|
@laanwj I thought this was out of 0.12 because of the translation (and things like "bitcoin kern" sound incredibly stupid as translations to me), but I didn't thought about languages that don't use the latin alphabet. |
|
This was left out of 0.12 because it would change some translations after translation freeze. The changes are necessary due to the refactoring and I think @luke-jr already applied the refactoring to the translations on trasifex accordingly? (If so, this could go into 0.12.1) |
|
This gives me an empty translation string in
I'm not sure where it comes from - I can't find any direct *Note: * after merging this, need to re-run |
|
@luke-jr It had nothing to do with what I thought above. You can apply the following diff to prevent adding an empty translation string: diff --git a/share/qt/extract_strings_qt.py b/share/qt/extract_strings_qt.py
index 2a6e4b9..cd76fab 100755
--- a/share/qt/extract_strings_qt.py
+++ b/share/qt/extract_strings_qt.py
@@ -72,7 +72,7 @@ f.write("""
f.write('static const char UNUSED *bitcoin_strings[] = {\n')
f.write('QT_TRANSLATE_NOOP("bitcoin-core", "%s"),\n' % (os.getenv('PACKAGE_NAME'),))
f.write('QT_TRANSLATE_NOOP("bitcoin-core", "%s"),\n' % (os.getenv('COPYRIGHT_HOLDERS'),))
-if os.getenv('COPYRIGHT_HOLDERS_SUBSTITUTION') != os.getenv('PACKAGE_NAME'):
+if os.getenv('COPYRIGHT_HOLDERS_SUBSTITUTION') and os.getenv('COPYRIGHT_HOLDERS_SUBSTITUTION') != os.getenv('PACKAGE_NAME'):
f.write('QT_TRANSLATE_NOOP("bitcoin-core", "%s"),\n' % (os.getenv('COPYRIGHT_HOLDERS_SUBSTITUTION'),))
messages.sort(key=operator.itemgetter(0))
for (msgid, msgstr) in messages:(probably makes sense to do this for the other getenvs as well, thinking of it) |
|
Why would those variables ever be undefined or empty? :/ |
|
As said, COPYRIGHT_HOLDERS_SUBSTITUTION ends up empty in my tests, resulting in an empty translation string. If this is not the intention something else must be going wrong. |
luke-jr
added some commits
Jan 27, 2016
|
@laanwj Ok, fixed that. Also fixed the text sizing logic in splashscreen to be more flexible with unexpected fonts and/or name lengths; and moved PACKAGE_URL from setup.nsi.in to configure.ac's AC_INIT (note that it uses the old bitcoin.org URL in the commit itself, and updated in the merge with master). |
laanwj
commented on the diff
Jan 28, 2016
| @@ -6,7 +6,9 @@ define(_CLIENT_VERSION_REVISION, 99) | ||
| define(_CLIENT_VERSION_BUILD, 0) | ||
| define(_CLIENT_VERSION_IS_RELEASE, false) | ||
| define(_COPYRIGHT_YEAR, 2016) | ||
| -AC_INIT([Bitcoin Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[https://github.com/bitcoin/bitcoin/issues],[bitcoin]) | ||
| +define(_COPYRIGHT_HOLDERS,[The %s developers]) |
laanwj
Owner
|
luke-jr
added some commits
Feb 3, 2016
(could nit on the years, probably derived software will have a different year range for their own development, but it's good enough for a fallback) |



luke-jr commentedDec 9, 2015
This should help keep the software name consistent within translations (Bitcoin Kern, Nucleul Bitcoin, etc) or forks (Bitcoin LJR, etc).