Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add back-end support for custom translations of labels for user metadata fields #4527

Merged
merged 8 commits into from
Jul 27, 2023
Merged

Add back-end support for custom translations of labels for user metadata fields #4527

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d30c681
Make label field optional
JacquelineMorrissette Jun 23, 2023
8de8542
Add support for User Metadata custom translations
JacquelineMorrissette Jun 23, 2023
820f3d1
Merge remote-tracking branch 'origin/add-label-to-user-projects-metad…
JacquelineMorrissette Jul 5, 2023
3f96fa6
Add test (1 failing) for custom user metadata…
jnm Jul 21, 2023
0841953
Add and fix tests
JacquelineMorrissette Jul 25, 2023
9838f54
Merge branch 'add-label-to-user-projects-metadata' into custom-transl…
jnm Jul 27, 2023
084b381
Add minor readability improvements
jnm Jul 27, 2023
8c9f5fa
Use context managers to improve readability
jnm Jul 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion jsapp/scss/stylesheets/partials/_registration.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@
}

.sector,
.name {
.full_name {
width: 48%;
float: left;
margin-top: 0px;
Expand Down
25 changes: 17 additions & 8 deletions kobo/apps/accounts/forms.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,15 @@
from allauth.socialaccount.forms import SignupForm as BaseSocialSignupForm
from django import forms
from django.conf import settings
from django.utils.translation import get_language
from django.utils.translation import gettext_lazy as t

from kobo.static_lists import COUNTRIES


# Only these fields can be controlled by constance.config.USER_METADATA_FIELDS
CONFIGURABLE_METADATA_FIELDS = (
'full_name',
'organization',
'gender',
'sector',
Expand All @@ -29,7 +31,7 @@ def __init__(self, *args, **kwargs):


class KoboSignupMixin(forms.Form):
name = forms.CharField(
full_name = forms.CharField(
label=t('Full name'),
required=False,
)
Expand Down Expand Up @@ -87,13 +89,20 @@ def __init__(self, *args, **kwargs):
for field_name in list(self.fields.keys()):
if field_name not in CONFIGURABLE_METADATA_FIELDS:
continue
if field_name not in desired_metadata_fields:
try:
desired_field = desired_metadata_fields[field_name]
if 'label' in desired_field.keys():
try:
self.fields[field_name].label = desired_field['label'][get_language()]
except KeyError:
self.fields[field_name].label = desired_field['label']['default']
JacquelineMorrissette marked this conversation as resolved.
Show resolved Hide resolved
else:
continue
except KeyError:
self.fields.pop(field_name)
continue
else:
self.fields[field_name].required = desired_metadata_fields[
field_name
].get('required', False)
field = self.fields[field_name]
field.required = desired_field.get('required', False)

def clean_email(self):
email = self.cleaned_data['email']
Expand All @@ -117,7 +126,7 @@ class SocialSignupForm(KoboSignupMixin, BaseSocialSignupForm):
field_order = [
'username',
'email',
'name',
'full_name',
'gender',
'sector',
'country',
Expand All @@ -133,7 +142,7 @@ def __init__(self, *args, **kwargs):

class SignupForm(KoboSignupMixin, BaseSignupForm):
field_order = [
'name',
'full_name',
'organization',
'username',
'email',
Expand Down