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

Label for subproject select renamed "Child" => "Subproject" + help text added #9829

Merged
merged 4 commits into from
Dec 22, 2022
+52 −8
Merged

Label for subproject select renamed "Child" => "Subproject" + help text added #9829

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f849730
Changes label from "Child" to "Subproject"
benjaoming Dec 20, 2022
33ab439
Adds a link to the documentation about subprojects
benjaoming Dec 20, 2022
5d51dc8
Apply "subproject" and "main project" terminology to model
benjaoming Dec 21, 2022
eedb2da
Remove labels from the form again
benjaoming Dec 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion readthedocs/projects/forms.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -433,7 +433,8 @@ class ProjectRelationshipForm(forms.ModelForm):

class Meta:
model = ProjectRelationship
fields = '__all__'
fields = "__all__"
labels = {"child": _("Subproject")}
benjaoming marked this conversation as resolved.
Show resolved Hide resolved
benjaoming marked this conversation as resolved.
Show resolved Hide resolved

def __init__(self, *args, **kwargs):
self.project = kwargs.pop('project')
Expand Down
7 changes: 7 additions & 0 deletions readthedocs/templates/projects/projectrelationship_form.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,12 @@
{% block project_edit_content_header %}{% trans "Subprojects" %}{% endblock %}

{% block project_edit_content %}
<p class="help_text">
{% blocktrans trimmed %}
Using subprojects allows you to serve multiple projects from the same domain as your main project. <a href="https://docs.readthedocs.io/en/stable/subprojects.html">Learn more</a>.
{% endblocktrans %}
</p>

{% if object %}
<form
method="post"
Expand All @@ -38,4 +44,5 @@
<input type="submit" value="{% trans "Add subproject" %}">
</form>
{% endif %}

{% endblock %}