mirror of
https://github.com/yann64/haikuports.git
synced 2026-05-03 13:38:52 +02:00
57 lines
1.8 KiB
Plaintext
57 lines
1.8 KiB
Plaintext
From 731e74fe876b1a0be8ee5926168ff1f08b7eabd5 Mon Sep 17 00:00:00 2001
|
|
From: Philipp Wolfer <ph.wolfer@gmail.com>
|
|
Date: Tue, 29 Jan 2019 11:33:18 +0000
|
|
Subject: [PATCH 3/3] Haiku: Avoid using locale.strxfrm
|
|
|
|
---
|
|
picard/ui/options/interface.py | 3 +--
|
|
picard/ui/options/releases.py | 4 +---
|
|
2 files changed, 2 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/picard/ui/options/interface.py b/picard/ui/options/interface.py
|
|
index 81fad103..4fca8cec 100644
|
|
--- a/picard/ui/options/interface.py
|
|
+++ b/picard/ui/options/interface.py
|
|
@@ -30,7 +30,6 @@
|
|
|
|
|
|
from functools import partial
|
|
-import locale
|
|
import os.path
|
|
|
|
from PyQt5 import (
|
|
@@ -204,7 +203,7 @@ class InterfaceOptionsPage(OptionsPage):
|
|
language_list = [(lang[0], lang[1], _(lang[2])) for lang in UI_LANGUAGES]
|
|
|
|
def fcmp(x):
|
|
- return locale.strxfrm(x[2])
|
|
+ return x[2]
|
|
for lang_code, native, translation in sorted(language_list, key=fcmp):
|
|
if native and native != translation:
|
|
name = '%s (%s)' % (translation, native)
|
|
diff --git a/picard/ui/options/releases.py b/picard/ui/options/releases.py
|
|
index 24f34180..21712fc4 100644
|
|
--- a/picard/ui/options/releases.py
|
|
+++ b/picard/ui/options/releases.py
|
|
@@ -24,8 +24,6 @@
|
|
# along with this program; if not, write to the Free Software
|
|
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
|
|
-
|
|
-from locale import strxfrm
|
|
from operator import itemgetter
|
|
|
|
from PyQt5 import (
|
|
@@ -275,7 +273,7 @@ class ReleasesOptionsPage(OptionsPage):
|
|
source_list = [(c[0], _(c[1])) for c in source.items()]
|
|
|
|
def fcmp(x):
|
|
- return strxfrm(x[1])
|
|
+ return x[1]
|
|
source_list.sort(key=fcmp)
|
|
config = get_config()
|
|
saved_data = config.setting[setting]
|
|
--
|
|
2.30.2
|
|
|