Skip to content

fix(translator): Change IP detection from JSON to XML format #117

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.

Sign up for GitHub

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

Merged
fishros merged 1 commit into from
Jan 11, 2026
Merged

fix(translator): Change IP detection from JSON to XML format #117

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions tools/translation/translator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
Author: Elysia
'''
import locale
import json
import xml.etree.ElementTree as ET
import os
import tools.base
from tools.base import CmdTask
Expand Down Expand Up @@ -77,21 +77,21 @@ def isCN(self) -> bool:

def getLocalFromIP(self) -> str:
local_str = ""
temp_file = "/tmp/fishros_check_country.json"
temp_file = "/tmp/fishros_check_country.xml"
try:
# Add timeout for IP detection
result = subprocess.run(["wget", "--header=Accept: application/json", "--no-check-certificate",
result = subprocess.run(["wget", "--header=Accept: application/xml", "--no-check-certificate",
"https://ip.renfei.net/", "-O", temp_file, "-qq", "--timeout=10"],
capture_output=True, text=True, timeout=15)
if result.returncode == 0:
with open(temp_file, 'r') as json_file:
data = json.loads(json_file.read())
self.ip_info = data
self.country = data['location']['countryCode']
if data['location']['countryCode'] in COUNTRY_CODE_MAPPING:
local_str = COUNTRY_CODE_MAPPING[data['location']['countryCode']]
else:
local_str = "en_US"
with open(temp_file, 'r') as xml_file:
self.ip_info = xml_file.read()
root = ET.fromstring(self.ip_info)
self.country = root.find('location/countryCode').text
if self.country in COUNTRY_CODE_MAPPING:
local_str = COUNTRY_CODE_MAPPING[self.country]
else:
local_str = "en_US"
else:
local_str = "en_US"
except Exception:
Expand Down