Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-11-29 02:27:14 -05:00
Code Issues Projects Releases Packages Wiki Activity

Use locale.getlocale() instead of deprecated locale.getdefaultlocale()

Browse source
This commit is contained in:
Miguel Jacq 2025-03-06 16:23:34 +11:00 • committed by Kushal Das
parent 2e222ce09d
commit 62073ab708
No known key found for this signature in database
GPG key ID: C65FF007C75766ED
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cli/onionshare_cli/settings.py
View file

@ -140,7 +140,7 @@ class Settings(object):
# Choose the default locale based on the OS preference, and fall-back to English
if self._settings["locale"] is None:
language_code, encoding = locale.getdefaultlocale()
language_code, encoding = locale.getlocale()
# Default to English
if not language_code:

10
cli/tests/conftest.py
View file

@ -1,6 +1,6 @@
import sys
import os
import shutil
import sys
import tempfile
import pytest
@ -116,22 +116,22 @@ def default_zw():
@pytest.fixture
def locale_en(monkeypatch):
monkeypatch.setattr("locale.getdefaultlocale", lambda: ("en_US", "UTF-8"))
monkeypatch.setattr("locale.getlocale", lambda: ("en_US", "UTF-8"))
@pytest.fixture
def locale_fr(monkeypatch):
monkeypatch.setattr("locale.getdefaultlocale", lambda: ("fr_FR", "UTF-8"))
monkeypatch.setattr("locale.getlocale", lambda: ("fr_FR", "UTF-8"))
@pytest.fixture
def locale_invalid(monkeypatch):
monkeypatch.setattr("locale.getdefaultlocale", lambda: ("xx_XX", "UTF-8"))
monkeypatch.setattr("locale.getlocale", lambda: ("xx_XX", "UTF-8"))
@pytest.fixture
def locale_ru(monkeypatch):
monkeypatch.setattr("locale.getdefaultlocale", lambda: ("ru_RU", "UTF-8"))
monkeypatch.setattr("locale.getlocale", lambda: ("ru_RU", "UTF-8"))
@pytest.fixture