From d7fd65b203873e479fed9b8ea1c2d49d84d67c67 Mon Sep 17 00:00:00 2001 From: Victor Porton Date: Tue, 18 Jun 2019 09:41:07 +0300 Subject: [PATCH 1/9] form field --- languages/fields.py | 6 ++++++ languages/forms.py | 10 ++++++++++ 2 files changed, 16 insertions(+) create mode 100644 languages/forms.py diff --git a/languages/fields.py b/languages/fields.py index 871107f..5657746 100644 --- a/languages/fields.py +++ b/languages/fields.py @@ -11,3 +11,9 @@ def __init__(self, *args, **kwargs): kwargs.setdefault('max_length', 3) kwargs.setdefault('choices', LANGUAGES) super(CharField, self).__init__(*args, **kwargs) + + def formfield(self, **kwargs): + from languages import forms + defaults = {'form_class': forms.LanguageField} + defaults.update(kwargs) + return super().formfield(**defaults) diff --git a/languages/forms.py b/languages/forms.py new file mode 100644 index 0000000..43d2530 --- /dev/null +++ b/languages/forms.py @@ -0,0 +1,10 @@ +from django import forms + +class LanguageField(forms.ChoiceField): + """ + A language field for Django forms. + """ + def __init__(self, *args, **kwargs): + defaults = {} # {'choices': } + defaults.update(kwargs) + super().__init__(*args, *args, **defaults) \ No newline at end of file From 07f25d2c84edff424c96f46c8b25d0c2a9b374b0 Mon Sep 17 00:00:00 2001 From: Victor Porton Date: Tue, 18 Jun 2019 10:03:23 +0300 Subject: [PATCH 2/9] created test app --- language_test/__init__.py | 0 language_test/settings.py | 121 ++++++++++++++++++++++++++++++++++++++ language_test/urls.py | 21 +++++++ language_test/wsgi.py | 16 +++++ manage.py | 22 +++++++ 5 files changed, 180 insertions(+) create mode 100644 language_test/__init__.py create mode 100644 language_test/settings.py create mode 100644 language_test/urls.py create mode 100644 language_test/wsgi.py create mode 100755 manage.py diff --git a/language_test/__init__.py b/language_test/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/language_test/settings.py b/language_test/settings.py new file mode 100644 index 0000000..a5f4c02 --- /dev/null +++ b/language_test/settings.py @@ -0,0 +1,121 @@ +""" +Django settings for language_test project. + +Generated by 'django-admin startproject' using Django 1.11.20. + +For more information on this file, see +https://docs.djangoproject.com/en/1.11/topics/settings/ + +For the full list of settings and their values, see +https://docs.djangoproject.com/en/1.11/ref/settings/ +""" + +import os + +# Build paths inside the project like this: os.path.join(BASE_DIR, ...) +BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) + + +# Quick-start development settings - unsuitable for production +# See https://docs.djangoproject.com/en/1.11/howto/deployment/checklist/ + +# SECURITY WARNING: keep the secret key used in production secret! +SECRET_KEY = 'kr09q(tihx%2+mg^z^4axqk+x&(ujtm(uv00==ljo-l+_8dx=@' + +# SECURITY WARNING: don't run with debug turned on in production! +DEBUG = True + +ALLOWED_HOSTS = [] + + +# Application definition + +INSTALLED_APPS = [ + 'django.contrib.admin', + 'django.contrib.auth', + 'django.contrib.contenttypes', + 'django.contrib.sessions', + 'django.contrib.messages', + 'django.contrib.staticfiles', +] + +MIDDLEWARE = [ + 'django.middleware.security.SecurityMiddleware', + 'django.contrib.sessions.middleware.SessionMiddleware', + 'django.middleware.common.CommonMiddleware', + 'django.middleware.csrf.CsrfViewMiddleware', + 'django.contrib.auth.middleware.AuthenticationMiddleware', + 'django.contrib.messages.middleware.MessageMiddleware', + 'django.middleware.clickjacking.XFrameOptionsMiddleware', +] + +ROOT_URLCONF = 'language_test.urls' + +TEMPLATES = [ + { + 'BACKEND': 'django.template.backends.django.DjangoTemplates', + 'DIRS': [os.path.join(BASE_DIR, 'templates')] + , + 'APP_DIRS': True, + 'OPTIONS': { + 'context_processors': [ + 'django.template.context_processors.debug', + 'django.template.context_processors.request', + 'django.contrib.auth.context_processors.auth', + 'django.contrib.messages.context_processors.messages', + ], + }, + }, +] + +WSGI_APPLICATION = 'language_test.wsgi.application' + + +# Database +# https://docs.djangoproject.com/en/1.11/ref/settings/#databases + +DATABASES = { + 'default': { + 'ENGINE': 'django.db.backends.sqlite3', + 'NAME': os.path.join(BASE_DIR, 'db.sqlite3'), + } +} + + +# Password validation +# https://docs.djangoproject.com/en/1.11/ref/settings/#auth-password-validators + +AUTH_PASSWORD_VALIDATORS = [ + { + 'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator', + }, + { + 'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator', + }, + { + 'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator', + }, + { + 'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator', + }, +] + + +# Internationalization +# https://docs.djangoproject.com/en/1.11/topics/i18n/ + +LANGUAGE_CODE = 'en-us' + +TIME_ZONE = 'UTC' + +USE_I18N = True + +USE_L10N = True + +USE_TZ = True + + +# Static files (CSS, JavaScript, Images) +# https://docs.djangoproject.com/en/1.11/howto/static-files/ + +STATIC_URL = '/static/' diff --git a/language_test/urls.py b/language_test/urls.py new file mode 100644 index 0000000..bd4164a --- /dev/null +++ b/language_test/urls.py @@ -0,0 +1,21 @@ +"""language_test URL Configuration + +The `urlpatterns` list routes URLs to views. For more information please see: + https://docs.djangoproject.com/en/1.11/topics/http/urls/ +Examples: +Function views + 1. Add an import: from my_app import views + 2. Add a URL to urlpatterns: url(r'^$', views.home, name='home') +Class-based views + 1. Add an import: from other_app.views import Home + 2. Add a URL to urlpatterns: url(r'^$', Home.as_view(), name='home') +Including another URLconf + 1. Import the include() function: from django.conf.urls import url, include + 2. Add a URL to urlpatterns: url(r'^blog/', include('blog.urls')) +""" +from django.conf.urls import url +from django.contrib import admin + +urlpatterns = [ + url(r'^admin/', admin.site.urls), +] diff --git a/language_test/wsgi.py b/language_test/wsgi.py new file mode 100644 index 0000000..2ec0c57 --- /dev/null +++ b/language_test/wsgi.py @@ -0,0 +1,16 @@ +""" +WSGI config for language_test project. + +It exposes the WSGI callable as a module-level variable named ``application``. + +For more information on this file, see +https://docs.djangoproject.com/en/1.11/howto/deployment/wsgi/ +""" + +import os + +from django.core.wsgi import get_wsgi_application + +os.environ.setdefault("DJANGO_SETTINGS_MODULE", "language_test.settings") + +application = get_wsgi_application() diff --git a/manage.py b/manage.py new file mode 100755 index 0000000..8ba2f6f --- /dev/null +++ b/manage.py @@ -0,0 +1,22 @@ +#!/usr/bin/env python3 +import os +import sys + +if __name__ == "__main__": + os.environ.setdefault("DJANGO_SETTINGS_MODULE", "language_test.settings") + try: + from django.core.management import execute_from_command_line + except ImportError: + # The above import may fail for some other reason. Ensure that the + # issue is really that Django is missing to avoid masking other + # exceptions on Python 2. + try: + import django + except ImportError: + raise ImportError( + "Couldn't import Django. Are you sure it's installed and " + "available on your PYTHONPATH environment variable? Did you " + "forget to activate a virtual environment?" + ) + raise + execute_from_command_line(sys.argv) From d7e66cf41405e61e37fd7a788fb8cc4c26a69ade Mon Sep 17 00:00:00 2001 From: Victor Porton Date: Tue, 18 Jun 2019 10:43:32 +0300 Subject: [PATCH 3/9] test for language form --- language_test/forms.py | 5 +++++ language_test/settings.py | 1 + language_test/templates/language_test/test.html | 8 ++++++++ language_test/urls.py | 7 +++++-- language_test/views.py | 9 +++++++++ languages/forms.py | 5 +++-- 6 files changed, 31 insertions(+), 4 deletions(-) create mode 100644 language_test/forms.py create mode 100644 language_test/templates/language_test/test.html create mode 100644 language_test/views.py diff --git a/language_test/forms.py b/language_test/forms.py new file mode 100644 index 0000000..2d1b27c --- /dev/null +++ b/language_test/forms.py @@ -0,0 +1,5 @@ +from django import forms +from languages.forms import LanguageField + +class TestForm(forms.Form): + language = LanguageField() diff --git a/language_test/settings.py b/language_test/settings.py index a5f4c02..f7709b8 100644 --- a/language_test/settings.py +++ b/language_test/settings.py @@ -37,6 +37,7 @@ 'django.contrib.sessions', 'django.contrib.messages', 'django.contrib.staticfiles', + 'language_test', ] MIDDLEWARE = [ diff --git a/language_test/templates/language_test/test.html b/language_test/templates/language_test/test.html new file mode 100644 index 0000000..d21533d --- /dev/null +++ b/language_test/templates/language_test/test.html @@ -0,0 +1,8 @@ + + + Test + + +

{{ form }}

+ + \ No newline at end of file diff --git a/language_test/urls.py b/language_test/urls.py index bd4164a..f944ba0 100644 --- a/language_test/urls.py +++ b/language_test/urls.py @@ -13,9 +13,12 @@ 1. Import the include() function: from django.conf.urls import url, include 2. Add a URL to urlpatterns: url(r'^blog/', include('blog.urls')) """ -from django.conf.urls import url from django.contrib import admin +from django.urls import re_path, path + +from language_test import views urlpatterns = [ - url(r'^admin/', admin.site.urls), + re_path(r'^admin/', admin.site.urls), + path('', views.TestView.as_view()) ] diff --git a/language_test/views.py b/language_test/views.py new file mode 100644 index 0000000..883bb21 --- /dev/null +++ b/language_test/views.py @@ -0,0 +1,9 @@ +from django.shortcuts import render +from django.views import View +from .forms import TestForm + + +class TestView(View): + def get(self, request): + form = TestForm() + return render(request, 'language_test/test.html', {'form': form}) \ No newline at end of file diff --git a/languages/forms.py b/languages/forms.py index 43d2530..5978905 100644 --- a/languages/forms.py +++ b/languages/forms.py @@ -5,6 +5,7 @@ class LanguageField(forms.ChoiceField): A language field for Django forms. """ def __init__(self, *args, **kwargs): - defaults = {} # {'choices': } + from .languages import LANGUAGES + defaults = {'choices': LANGUAGES} defaults.update(kwargs) - super().__init__(*args, *args, **defaults) \ No newline at end of file + super().__init__(*args, **defaults) \ No newline at end of file From 0a44985a8ca932706ddd855c6cbe0f8a591933ae Mon Sep 17 00:00:00 2001 From: Victor Porton Date: Tue, 18 Jun 2019 17:57:39 +0300 Subject: [PATCH 4/9] made select of languages ordered alphabetically --- languages/forms.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/languages/forms.py b/languages/forms.py index 5978905..a1b6790 100644 --- a/languages/forms.py +++ b/languages/forms.py @@ -6,6 +6,6 @@ class LanguageField(forms.ChoiceField): """ def __init__(self, *args, **kwargs): from .languages import LANGUAGES - defaults = {'choices': LANGUAGES} + defaults = {'choices': sorted(LANGUAGES, key=lambda p: p[1])} defaults.update(kwargs) super().__init__(*args, **defaults) \ No newline at end of file From 878dd091a53f013096c5af8f2c974c15a69e8701 Mon Sep 17 00:00:00 2001 From: Victor Porton Date: Wed, 19 Jun 2019 12:11:27 +0300 Subject: [PATCH 5/9] added caching --- languages/forms.py | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/languages/forms.py b/languages/forms.py index a1b6790..ab6692a 100644 --- a/languages/forms.py +++ b/languages/forms.py @@ -1,11 +1,32 @@ from django import forms +from django.core.cache import caches + +sorted_languages = None +def _get_sorted_languages(): + from .languages import LANGUAGES + global sorted_languages + if sorted_languages: + return sorted_languages + sorted_languages = sorted(LANGUAGES, key=lambda p: p[1]) + return sorted_languages + +class _LanguageWidget(forms.Select): + def render(self, name, value, attrs=None, renderer=None): + cache = caches['default'] + result = cache.get(value or '') + if result is not None: + return result + result = super().render(name, value, attrs, renderer) + cache.set(value or '', result) + return result class LanguageField(forms.ChoiceField): """ A language field for Django forms. """ + widget = _LanguageWidget + def __init__(self, *args, **kwargs): - from .languages import LANGUAGES - defaults = {'choices': sorted(LANGUAGES, key=lambda p: p[1])} + defaults = {'choices': _get_sorted_languages()} defaults.update(kwargs) - super().__init__(*args, **defaults) \ No newline at end of file + super().__init__(*args, **defaults) From deb49d6967a2af938d66f0b82e2f7e7268e81c7e Mon Sep 17 00:00:00 2001 From: Victor Porton Date: Sat, 12 Nov 2022 18:34:15 +0200 Subject: [PATCH 6/9] Django 4 compatibility --- languages/languages.py | 2 +- languages/regenerate.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/languages/languages.py b/languages/languages.py index 7543c0d..a7c29b6 100644 --- a/languages/languages.py +++ b/languages/languages.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ LANGUAGES = ( ("aa", _(u"Afar")), diff --git a/languages/regenerate.py b/languages/regenerate.py index 59122bb..880f58e 100644 --- a/languages/regenerate.py +++ b/languages/regenerate.py @@ -11,7 +11,7 @@ import urllib2 TEMPLATE = u'''# -*- coding: utf-8 -*- -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ LANGUAGES = ( %(languages)s From 6d7a6aec6565ce889e58905727edb8ffc9cca352 Mon Sep 17 00:00:00 2001 From: Victor Porton Date: Sat, 12 Nov 2022 19:10:38 +0200 Subject: [PATCH 7/9] bug fix --- languages/fields.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/languages/fields.py b/languages/fields.py index 5657746..3979a77 100644 --- a/languages/fields.py +++ b/languages/fields.py @@ -8,7 +8,7 @@ def __init__(self, *args, **kwargs): # Local import so the languages aren't loaded unless they are needed. from .languages import LANGUAGES - kwargs.setdefault('max_length', 3) + # kwargs.setdefault('max_length', 3) kwargs.setdefault('choices', LANGUAGES) super(CharField, self).__init__(*args, **kwargs) From b1d03df21ea873a4c8e6ed84187e9984a9eedff0 Mon Sep 17 00:00:00 2001 From: Victor Porton Date: Sat, 12 Nov 2022 19:12:54 +0200 Subject: [PATCH 8/9] bug fix --- languages/fields.py | 1 + 1 file changed, 1 insertion(+) diff --git a/languages/fields.py b/languages/fields.py index 3979a77..f703262 100644 --- a/languages/fields.py +++ b/languages/fields.py @@ -9,6 +9,7 @@ def __init__(self, *args, **kwargs): from .languages import LANGUAGES # kwargs.setdefault('max_length', 3) + kwargs.setdefault('max_length', 255) kwargs.setdefault('choices', LANGUAGES) super(CharField, self).__init__(*args, **kwargs) From 38f839221a6afc09f06daaa29b1dd56e147406d9 Mon Sep 17 00:00:00 2001 From: mathematician Date: Fri, 24 Jan 2025 19:43:29 +0200 Subject: [PATCH 9/9] Add FUNDING.yml --- .github/FUNDING.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 .github/FUNDING.yml diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml new file mode 100644 index 0000000..4ae4509 --- /dev/null +++ b/.github/FUNDING.yml @@ -0,0 +1,15 @@ +# These are supported funding model platforms + +github: vporton # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2] +patreon: # Replace with a single Patreon username +open_collective: # Replace with a single Open Collective username +ko_fi: # Replace with a single Ko-fi username +tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel +community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry +liberapay: # Replace with a single Liberapay username +issuehunt: # Replace with a single IssueHunt username +lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry +polar: # Replace with a single Polar username +buy_me_a_coffee: # Replace with a single Buy Me a Coffee username +thanks_dev: # Replace with a single thanks.dev username +custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2'] \ No newline at end of file