Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use IP geolocation database by DB-IP instead of MaxMind #12014

Merged

Conversation

sledgehammer999
Copy link
Member

Closes #11792

GUI
WebUI

src/base/net/geoipmanager.cpp Outdated Show resolved Hide resolved
src/base/net/geoipmanager.cpp Outdated Show resolved Hide resolved
src/base/net/private/geoipdatabase.cpp Outdated Show resolved Hide resolved
src/gui/aboutdialog.cpp Outdated Show resolved Hide resolved
README.md Outdated Show resolved Hide resolved
@Chocobo1 Chocobo1 added the Core label Feb 15, 2020
@sledgehammer999
Copy link
Member Author

One thing that I forgot to ask about.
Do you have any suggestions about the strings in the about dialog boxes? Translation-wise the way they are broken up may not work with all languages. Some languages may require rearranging the order of the words. I don't know how to achieve that AND maintain the linked URL at the correct word.

src/gui/aboutdialog.cpp Outdated Show resolved Hide resolved
src/webui/www/private/views/about.html Outdated Show resolved Hide resolved
@Chocobo1
Copy link
Member

Chocobo1 commented Feb 16, 2020

I don't know how to achieve that AND maintain the linked URL at the correct word.

You can just place all text in one tr()/QBT_TR() and let translator decide the final outcome, this is better than presenting the broken up sentences.

@sledgehammer999
Copy link
Member Author

You can just place all text in one tr()/QBT_TR() and let translator decide the final outcome, this is better than presenting the broken up sentences.

But in the past we had problems with translators messing up the html tags in their translations.

@glassez
Copy link
Member

glassez commented Feb 16, 2020

Then we should use less rich text in qBittorrent UI. Otherwise the reliable solution seems to be impossible.

@sledgehammer999
Copy link
Member Author

Pushed all proposed changes.

@sledgehammer999
Copy link
Member Author

Then we should use less rich text in qBittorrent UI. Otherwise the reliable solution seems to be impossible.

I don't wish to tackle this. If someone has a ready string that I can copy let me know. Otherwise, IMO, lets proceed as-is. There can be another PR by someone else regarding that specific issue.

If there aren't any other issues pending please review-approve.

src/gui/aboutdialog.cpp Outdated Show resolved Hide resolved
src/gui/aboutdialog.cpp Show resolved Hide resolved
src/webui/www/private/views/about.html Outdated Show resolved Hide resolved
src/webui/www/private/views/about.html Outdated Show resolved Hide resolved
@glassez
Copy link
Member

glassez commented Feb 17, 2020

But in the past we had problems with translators messing up the html tags in their translations.

IMO, it's a shitty idea to try to prevent translators from making mistakes by creating a string that may not be translated correctly into some languages (and at least difficult to translate).

@sledgehammer999
Copy link
Member Author

Ok, I think I resolved the translatable string issue.

src/gui/aboutdialog.cpp Show resolved Hide resolved
src/webui/www/private/views/about.html Outdated Show resolved Hide resolved
@FranciscoPombal
Copy link
Member

@sledgehammer999 you probably want to change the two top lines of the .gitingore as well, which currently read:

src/gui/geoip/GeoIP.dat
src/gui/geoip/GeoIP.dat.gz

@sledgehammer999
Copy link
Member Author

you probably want to change the two top lines of the .gitingore as well, which currently read:

Those lines should have been removed a long time ago. In ancient times, qbt windows builds bundled the geoip database too.

@sledgehammer999
Copy link
Member Author

Thanks everyone.

@sledgehammer999 sledgehammer999 merged commit 193da7f into qbittorrent:master Feb 18, 2020
@sledgehammer999 sledgehammer999 deleted the alt_IP_db_provider branch February 18, 2020 15:05
Chocobo1 added a commit that referenced this pull request Mar 13, 2020
Backport #12014: Use IP geolocation database by DB-IP instead of MaxMind
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

no geoip flags after reinstalling the system
5 participants