[damned-lies] refactor: fix few linter issues in languages
- From: Claude Paroz <claudep src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [damned-lies] refactor: fix few linter issues in languages
- Date: Sun, 18 Apr 2021 19:07:43 +0000 (UTC)
commit a2ffb25131ea5e7ef6f8e7cb1277daf494cce2ff
Author: Guillaume Bernard <associations guillaume-bernard fr>
Date: Sun Apr 18 10:14:22 2021 +0200
refactor: fix few linter issues in languages
languages/admin.py | 2 ++
languages/management/commands/load-plurals.py | 2 ++
languages/models.py | 16 +++++++---------
languages/views.py | 11 +++++++++--
4 files changed, 20 insertions(+), 11 deletions(-)
---
diff --git a/languages/admin.py b/languages/admin.py
index 1214e944..d32b6cc3 100644
--- a/languages/admin.py
+++ b/languages/admin.py
@@ -1,7 +1,9 @@
from django.contrib import admin
from languages.models import Language
+
class LanguageAdmin(admin.ModelAdmin):
search_fields = ('name', 'locale')
+
admin.site.register(Language, LanguageAdmin)
diff --git a/languages/management/commands/load-plurals.py b/languages/management/commands/load-plurals.py
index 62cc91a1..fbddffd3 100644
--- a/languages/management/commands/load-plurals.py
+++ b/languages/management/commands/load-plurals.py
@@ -2,6 +2,8 @@ from django.core.management.base import BaseCommand
from languages.models import Language
# Shamelessly copied from http://translate.sourceforge.net/wiki/l10n/pluralforms (2009-05-25)
+
+# pylint: disable=line-too-long
plurals = {
'af': "nplurals=2; plural=(n != 1)",
'ak': "nplurals=2; plural=(n > 1)",
diff --git a/languages/models.py b/languages/models.py
index 637c7cb2..6a6b12ee 100644
--- a/languages/models.py
+++ b/languages/models.py
@@ -35,12 +35,12 @@ class Language(models.Model):
This is a sort of BCP47 to ISO639 conversion function """
iana_splitted = ianacode.split("-", 1)
lang_code = iana_splitted[0]
- iana_suffix = len(iana_splitted) > 1 and iana_splitted[1] or ""
+ iana_suffix = iana_splitted[1] if len(iana_splitted) > 1 else ""
iana_suffix = iana_suffix.replace('Latn', 'latin').replace('Cyrl', 'cyrillic')
lang_list = cls.objects.filter(Q(locale=lang_code) | Q(locale__regex=r'^%s[@_].+' % lang_code))
if len(lang_list) == 0:
return None
- elif len(lang_list) > 1:
+ if len(lang_list) > 1:
# Find the best language to return
best_lang = lang_list[0]
for lang in lang_list:
@@ -55,8 +55,7 @@ class Language(models.Model):
def get_name(self):
if self.name != self.locale:
return _(self.name)
- else:
- return self.locale
+ return self.locale
def get_suffix(self):
splitted = self.locale.replace('@', '_').split('_')
@@ -95,8 +94,7 @@ class Language(models.Model):
def get_team_url(self):
if self.team:
return self.team.get_absolute_url()
- else:
- try:
- return FakeTeam(self).get_absolute_url()
- except NoReverseMatch:
- return ''
+ try:
+ return FakeTeam(self).get_absolute_url()
+ except NoReverseMatch:
+ return ''
diff --git a/languages/views.py b/languages/views.py
index fbeae48f..4eb27a92 100644
--- a/languages/views.py
+++ b/languages/views.py
@@ -11,6 +11,7 @@ from common import utils
from languages.models import Language
from stats.models import Release, Statistics
+
def languages(request):
languages = Language.objects.select_related("team").all()
context = {
@@ -19,6 +20,7 @@ def languages(request):
}
return render(request, 'languages/language_list.html', context)
+
def language_all(request, locale, dtype):
language = get_object_or_404(Language, locale=locale)
stats = Statistics.get_lang_stats_by_type(language, dtype, release=None)
@@ -34,6 +36,7 @@ def language_all(request, locale, dtype):
}
return render(request, 'languages/language_all_modules.html', context)
+
def release_archives(request, locale):
""" This view is used to display archive release stats through Ajax call
Only the HTML table is produced
@@ -46,6 +49,7 @@ def release_archives(request, locale):
}
return render(request, 'languages/language_release_summary.html', context)
+
def language_release(request, locale, release_name, dtype):
if locale == 'C':
language = None
@@ -68,6 +72,7 @@ def language_release(request, locale, release_name, dtype):
}
return render(request, 'languages/language_release.html', context)
+
def language_release_tar(request, locale, release_name, dtype):
release = get_object_or_404(Release, name=release_name)
language = get_object_or_404(Language, locale=locale)
@@ -87,6 +92,7 @@ def language_release_tar(request, locale, release_name, dtype):
return HttpResponseRedirect("/POT/tar/%s" % tar_filename)
+
def language_release_xml(request, locale, release_name):
""" This view create the same XML output than the previous Damned-Lies, so as
apps which depend on it (like Vertimus) don't break.
@@ -119,13 +125,14 @@ def language_release_xml(request, locale, release_name):
content += get_domain_stats(domains, "domain")
content += "</module>"
# Add modules who have no ui counterparts
+ # FIXME: duplicated code fragment. Replace respectively 'dev-tools' and 'desktop' with the catname
variable
if catname == 'dev-tools':
try:
mod = [m for m in stats['doc']['categs']['dev-tools']['modules'] if m[0] ==
'gnome-devel-docs'][0][1]
content += "<module id=\"gnome-devel-docs\" branch=\"%s\">" % mod.keys()[0]
content += get_domain_stats(mod.values()[0], "document")
content += "</module>"
- except:
+ except: # FIXME: which exception is this catching?
pass
if catname == 'desktop':
try:
@@ -133,7 +140,7 @@ def language_release_xml(request, locale, release_name):
content += "<module id=\"gnome-user-docs\" branch=\"%s\">" % mod.keys()[0]
content += get_domain_stats(mod.values()[0], "document")
content += "</module>"
- except:
+ except: # FIXME: which exception is this catching?
pass
if catname != 'default':
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]