[arch-commits] Commit in deluge/trunk (PKGBUILD fix-ngettext.diff)

[Jan Steffens]

    Date: Sunday, February 23, 2020 @ 20:11:18
  Author: heftig
Revision: 376109

2.0.4.dev23+g2f1c008a2-3: FS#65598 fix ngettext

Added:
  deluge/trunk/fix-ngettext.diff
Modified:
  deluge/trunk/PKGBUILD

-------------------+
 PKGBUILD          |    9 ++++++---
 fix-ngettext.diff |   13 +++++++++++++
 2 files changed, 19 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-02-23 20:04:20 UTC (rev 376108)
+++ PKGBUILD	2020-02-23 20:11:18 UTC (rev 376109)
@@ -5,7 +5,7 @@
 pkgbase=deluge
 pkgname=(deluge deluge-gtk)
 pkgver=2.0.4.dev23+g2f1c008a2
-pkgrel=2
+pkgrel=3
 pkgdesc="BitTorrent client with multiple user interfaces in a client/server model"
 url="https://deluge-torrent.org/"
 arch=(any)
@@ -42,8 +42,10 @@
   git
 )
 _commit=2f1c008a26b50ab3487bd03bcabb39347d441f23  # develop
-source=("git://git.deluge-torrent.org/deluge.git#commit=$_commit")
-sha256sums=('SKIP')
+source=("git://git.deluge-torrent.org/deluge.git#commit=$_commit"
+        fix-ngettext.diff)
+sha256sums=('SKIP'
+            '27154397f2b22e55e2ad74f74da2f4f083bce1fcee90f8ba9306e6ef13ce98c0')
 
 pkgver() {
   cd deluge
@@ -52,6 +54,7 @@
 
 prepare() {
   cd deluge
+  git apply -3 ../fix-ngettext.diff
 }
 
 build() {

Added: fix-ngettext.diff
===================================================================
--- fix-ngettext.diff	                        (rev 0)
+++ fix-ngettext.diff	2020-02-23 20:11:18 UTC (rev 376109)
@@ -0,0 +1,13 @@
+diff --git i/deluge/i18n/util.py w/deluge/i18n/util.py
+index bd002f7a2..90568fc5b 100644
+--- i/deluge/i18n/util.py
++++ w/deluge/i18n/util.py
+@@ -114,7 +114,7 @@ def setup_translation():
+         # Workaround for Python 2 unicode gettext (keyword removed in Py3).
+         kwargs = {} if not deluge.common.PY2 else {'unicode': True}
+ 
+-        gettext.install(I18N_DOMAIN, translations_path, names='ngettext', **kwargs)
++        gettext.install(I18N_DOMAIN, translations_path, names=['ngettext'], **kwargs)
+         builtins.__dict__['_n'] = builtins.__dict__['ngettext']
+ 
+         libintl = None