Skip to content

Commit d0cfd4f

Browse files
committed
clean up
1 parent 97ab4e9 commit d0cfd4f

File tree

4 files changed

+22
-22
lines changed

4 files changed

+22
-22
lines changed

martor/locale/en/LC_MESSAGES/django.po

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: PACKAGE VERSION\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2020-09-16 11:53+0700\n"
11+
"POT-Creation-Date: 2020-11-01 13:57+0700\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <[email protected]>\n"
@@ -175,15 +175,15 @@ msgstr ""
175175
msgid "Markdown Guide (Help)"
176176
msgstr ""
177177

178-
#: views.py:22 views.py:36 views.py:37
178+
#: views.py:21 views.py:35 views.py:36
179179
msgid "Invalid request!"
180180
msgstr ""
181181

182-
#: views.py:77
182+
#: views.py:74
183183
#, python-format
184184
msgid "No users registered as `%(username)s` or user is unactived."
185185
msgstr ""
186186

187-
#: views.py:81
187+
#: views.py:79
188188
msgid "Validation Failed for field `username`"
189189
msgstr ""

martor/locale/id/LC_MESSAGES/django.po

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: PACKAGE VERSION\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2020-09-16 11:53+0700\n"
11+
"POT-Creation-Date: 2020-11-01 13:57+0700\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <[email protected]>\n"
@@ -177,17 +177,17 @@ msgstr "Layar Penuh"
177177
msgid "Markdown Guide (Help)"
178178
msgstr "Bantuan Penggunaan Markdown"
179179

180-
#: views.py:22 views.py:36 views.py:37
180+
#: views.py:21 views.py:35 views.py:36
181181
msgid "Invalid request!"
182182
msgstr "Permintaan tidak valid"
183183

184-
#: views.py:77
184+
#: views.py:74
185185
#, python-format
186186
msgid "No users registered as `%(username)s` or user is unactived."
187187
msgstr ""
188188
"Tidak ada pengguna terdaftar sebagai `%(username)s` atau pengguna telah "
189189
"nonaktif."
190190

191-
#: views.py:81
191+
#: views.py:79
192192
msgid "Validation Failed for field `username`"
193193
msgstr "Validasi Gagal untuk field `username`"

martor/locale/tr/LC_MESSAGES/django.po

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: PACKAGE VERSION\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2020-09-16 11:55+0700\n"
11+
"POT-Creation-Date: 2020-11-01 13:57+0700\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: Ozcan Yarimdunya <[email protected]>\n"
1414
"Language-Team: LANGUAGE <[email protected]>\n"
@@ -66,8 +66,8 @@ msgid ""
6666
"This editor is powered by Markdown. For full documentation, <a href="
6767
"\"%(doc_url)s\" target=\"_blank\">click here</a>."
6868
msgstr ""
69-
"Bu editör Markdown tarafından desteklenmektedir. Bütün dokümantasyon için, <a "
70-
"href=\"%(doc_url)s\" target=\"_blank\">buraya tıkla</a>."
69+
"Bu editör Markdown tarafından desteklenmektedir. Bütün dokümantasyon için, "
70+
"<a href=\"%(doc_url)s\" target=\"_blank\">buraya tıkla</a>."
7171

7272
#: templates/martor/bootstrap/guide.html:28
7373
#: templates/martor/bootstrap/toolbar.html:54
@@ -178,15 +178,15 @@ msgstr "Tam ekran"
178178
msgid "Markdown Guide (Help)"
179179
msgstr "Markdown Kılavuzu (Yardım)"
180180

181-
#: views.py:22 views.py:36 views.py:37
181+
#: views.py:21 views.py:35 views.py:36
182182
msgid "Invalid request!"
183183
msgstr "Geçersiz istek!"
184184

185-
#: views.py:77
185+
#: views.py:74
186186
#, python-format
187187
msgid "No users registered as `%(username)s` or user is unactived."
188188
msgstr "`%(username)s` kullanıcı kayıtlı değil veya aktif değil"
189189

190-
#: views.py:81
190+
#: views.py:79
191191
msgid "Validation Failed for field `username`"
192192
msgstr "`kullanıcı adı` alanı için doğrulama başarısız"

martor/views.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99

1010
from .api import imgur_uploader
1111
from .settings import MARTOR_MARKDOWNIFY_FUNCTION
12-
from .utils import LazyEncoder
1312

1413
User = get_user_model()
1514

@@ -68,15 +67,16 @@ def markdown_search_user(request):
6867
queries = {'%s__icontains' % User.USERNAME_FIELD: username}
6968
users = User.objects.filter(**queries).filter(is_active=True)
7069
if users.exists():
71-
response_data.update({'status': 200,
72-
'data': [{'username': u.username} for u in users]})
70+
users_name = users.values_list('username', flat=True)
71+
response_data.update({'status': 200, 'data': users_name})
7372
return JsonResponse(response_data)
7473

75-
response_data.update({'status': 204,
76-
'error': _('No users registered as `%(username)s` '
77-
'or user is unactived.') % {'username': username}})
74+
error_message = _('No users registered as `%(username)s` '
75+
'or user is unactived.')
76+
error_message = error_message % {'username': username}
77+
response_data.update({'status': 204, 'error': error_message})
7878
else:
79-
response_data.update({'status': 204,
80-
'error': _('Validation Failed for field `username`')})
79+
error_message = _('Validation Failed for field `username`')
80+
response_data.update({'status': 204, 'error': error_message})
8181

8282
return JsonResponse(response_data)

0 commit comments

Comments
 (0)