From 2e051692e56c89e4cbdb15eb5b9647a9bece0f35 Mon Sep 17 00:00:00 2001 From: shubham76 Date: Wed, 7 Mar 2018 21:10:16 +0530 Subject: [PATCH 1/5] Changed 'Submit' text on buttons with something more meaningful --- readthedocs/templates/core/project_details.html | 2 +- readthedocs/templates/projects/domain_list.html | 2 +- readthedocs/templates/projects/integration_form.html | 2 +- readthedocs/templates/projects/integration_list.html | 4 ++-- readthedocs/templates/projects/onboard_detail.html | 2 +- readthedocs/templates/projects/project_advanced.html | 2 +- readthedocs/templates/projects/project_advertising.html | 8 ++++---- readthedocs/templates/projects/project_edit.html | 4 ++-- readthedocs/templates/projects/project_notifications.html | 4 ++-- readthedocs/templates/projects/project_redirects.html | 2 +- readthedocs/templates/projects/project_translations.html | 2 +- readthedocs/templates/projects/project_users.html | 2 +- readthedocs/templates/projects/project_versions.html | 2 +- .../templates/projects/projectrelationship_form.html | 6 +++--- .../templates/projects/projectrelationship_list.html | 2 +- 15 files changed, 23 insertions(+), 23 deletions(-) diff --git a/readthedocs/templates/core/project_details.html b/readthedocs/templates/core/project_details.html index a8f9f52a3c9..47081bd5771 100644 --- a/readthedocs/templates/core/project_details.html +++ b/readthedocs/templates/core/project_details.html @@ -66,7 +66,7 @@

{% trans "Build a version" %}

{% endfor %} - + diff --git a/readthedocs/templates/projects/domain_list.html b/readthedocs/templates/projects/domain_list.html index d458b7ae44c..cedc5c46a55 100644 --- a/readthedocs/templates/projects/domain_list.html +++ b/readthedocs/templates/projects/domain_list.html @@ -35,7 +35,7 @@

{% trans "Add new Domain" %}

{% csrf_token %} {{ form.as_p }}

- +

{% endblock %} diff --git a/readthedocs/templates/projects/integration_form.html b/readthedocs/templates/projects/integration_form.html index cc46a9b0355..42b7a1e509c 100644 --- a/readthedocs/templates/projects/integration_form.html +++ b/readthedocs/templates/projects/integration_form.html @@ -18,6 +18,6 @@ action="{% url 'projects_integrations_create' project_slug=project.slug %}"> {% csrf_token %} {{ form.as_p }} - + {% endblock %} diff --git a/readthedocs/templates/projects/integration_list.html b/readthedocs/templates/projects/integration_list.html index 64fa01b83d2..e65057a8bbb 100644 --- a/readthedocs/templates/projects/integration_list.html +++ b/readthedocs/templates/projects/integration_list.html @@ -17,7 +17,7 @@
  • - {% trans "Add integration" %} + {% trans "Add Integration" %}
  • @@ -35,7 +35,7 @@ {% empty %}
  • - {% trans 'No integrations are currently configured' %} + {% trans 'No integrations are currently configured.' %}

  • {% endfor %} diff --git a/readthedocs/templates/projects/onboard_detail.html b/readthedocs/templates/projects/onboard_detail.html index c1aebea31aa..51dde84ac12 100644 --- a/readthedocs/templates/projects/onboard_detail.html +++ b/readthedocs/templates/projects/onboard_detail.html @@ -38,7 +38,7 @@

    {% trans "Your documentation is ready to use" %}

    {% endblocktrans %}

    - + {% else %} {% comment %}Last build failed{% endcomment %} diff --git a/readthedocs/templates/projects/project_advanced.html b/readthedocs/templates/projects/project_advanced.html index 2372e023d5d..2ac96549e9d 100644 --- a/readthedocs/templates/projects/project_advanced.html +++ b/readthedocs/templates/projects/project_advanced.html @@ -15,7 +15,7 @@
    {% csrf_token %} {{ form.as_p }}

    - +

    {% endblock %} diff --git a/readthedocs/templates/projects/project_advertising.html b/readthedocs/templates/projects/project_advertising.html index c18ce73d0b8..b2143a59b3d 100644 --- a/readthedocs/templates/projects/project_advertising.html +++ b/readthedocs/templates/projects/project_advertising.html @@ -72,7 +72,7 @@

    {% trans "Opting out" %}

    {% endblocktrans %}
    - +
    @@ -85,7 +85,7 @@

    {% trans "Opting out" %}

    {% endblocktrans %}
    - +
    @@ -98,7 +98,7 @@

    {% trans "Opting out" %}

    {% endblocktrans %}
    - +
    @@ -129,7 +129,7 @@

    {% trans "Still can't help?" %}

    {% csrf_token %} {{ form.as_p }}

    - +

    {% endblock %} diff --git a/readthedocs/templates/projects/project_edit.html b/readthedocs/templates/projects/project_edit.html index e541ec1aff9..1bc25d680d5 100644 --- a/readthedocs/templates/projects/project_edit.html +++ b/readthedocs/templates/projects/project_edit.html @@ -19,10 +19,10 @@

    {{ form.as_p }}

    - + {% comment %}Translators: The 'or' here is in between 'Submit' and 'delete'.{% endcomment %} {% trans "or" %} - {% trans "delete" %} + {% trans "delete project" %}

    {% endblock %} diff --git a/readthedocs/templates/projects/project_notifications.html b/readthedocs/templates/projects/project_notifications.html index 375d34f80e2..f3f7bb6e8b5 100644 --- a/readthedocs/templates/projects/project_notifications.html +++ b/readthedocs/templates/projects/project_notifications.html @@ -66,7 +66,7 @@

    {% trans "New Email Notifications" %}

    {% csrf_token %} {{ email_form }}

    - +

    @@ -77,7 +77,7 @@

    {% trans "New Webhook Notifications" %}

    {% csrf_token %} {{ webhook_form }}

    - +

    {% endblock %} diff --git a/readthedocs/templates/projects/project_redirects.html b/readthedocs/templates/projects/project_redirects.html index 7bfc33a8cf2..eb3ac75d191 100644 --- a/readthedocs/templates/projects/project_redirects.html +++ b/readthedocs/templates/projects/project_redirects.html @@ -106,7 +106,7 @@

    {% trans "Redirects" %}

    {{ form.as_p }}

    - +

    {% endblock %} diff --git a/readthedocs/templates/projects/project_translations.html b/readthedocs/templates/projects/project_translations.html index 8fc223cf6d2..437dce77bd0 100644 --- a/readthedocs/templates/projects/project_translations.html +++ b/readthedocs/templates/projects/project_translations.html @@ -33,7 +33,7 @@

    {% trans "Existing Translations" %}

    {% csrf_token %} {{ form.as_p }}

    - +

    {% endblock %} diff --git a/readthedocs/templates/projects/project_users.html b/readthedocs/templates/projects/project_users.html index 048d2231041..91f75dd3b08 100644 --- a/readthedocs/templates/projects/project_users.html +++ b/readthedocs/templates/projects/project_users.html @@ -48,7 +48,7 @@

    {% trans "Add Maintainer" %}

    {% csrf_token %} {{ form.as_p }}

    - +

    {% endblock %} diff --git a/readthedocs/templates/projects/project_versions.html b/readthedocs/templates/projects/project_versions.html index e99cd3dbca2..38fc4967190 100644 --- a/readthedocs/templates/projects/project_versions.html +++ b/readthedocs/templates/projects/project_versions.html @@ -49,7 +49,7 @@

    {{ field.label}}

    {% endfor %}

    - +

    {% endblock %} diff --git a/readthedocs/templates/projects/projectrelationship_form.html b/readthedocs/templates/projects/projectrelationship_form.html index 566b5fde8d0..0515c0d3b32 100644 --- a/readthedocs/templates/projects/projectrelationship_form.html +++ b/readthedocs/templates/projects/projectrelationship_form.html @@ -19,14 +19,14 @@ action="{% url 'projects_subprojects_update' project_slug=project.slug subproject_slug=object.child.slug %}"> {% csrf_token %} {{ form.as_p }} - +
    {% csrf_token %} - +
    {% else %}
    {% csrf_token %} {{ form.as_p }} - +
    {% endif %} {% endblock %} diff --git a/readthedocs/templates/projects/projectrelationship_list.html b/readthedocs/templates/projects/projectrelationship_list.html index a5aca6a2753..986c0ecf893 100644 --- a/readthedocs/templates/projects/projectrelationship_list.html +++ b/readthedocs/templates/projects/projectrelationship_list.html @@ -38,7 +38,7 @@
  • - {% trans "Add subproject" %} + {% trans "Add Subproject" %}
  • From 56624e1726119315b5be25e7d3da4c4ce6d6a42f Mon Sep 17 00:00:00 2001 From: Shubham R Patil Date: Wed, 7 Mar 2018 22:46:04 +0530 Subject: [PATCH 2/5] Update project_advertising.html --- readthedocs/templates/projects/project_advertising.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/readthedocs/templates/projects/project_advertising.html b/readthedocs/templates/projects/project_advertising.html index b2143a59b3d..28b72fa7610 100644 --- a/readthedocs/templates/projects/project_advertising.html +++ b/readthedocs/templates/projects/project_advertising.html @@ -72,7 +72,7 @@

    {% trans "Opting out" %}

    {% endblocktrans %}
    - +
    @@ -85,7 +85,7 @@

    {% trans "Opting out" %}

    {% endblocktrans %}
    - +
    @@ -98,7 +98,7 @@

    {% trans "Opting out" %}

    {% endblocktrans %}
    - +
    From 0415e0e6addbb7922615034a8097121638283045 Mon Sep 17 00:00:00 2001 From: Shubham R Patil Date: Thu, 8 Mar 2018 07:46:56 +0530 Subject: [PATCH 3/5] Update project_edit.html --- readthedocs/templates/projects/project_edit.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readthedocs/templates/projects/project_edit.html b/readthedocs/templates/projects/project_edit.html index 1bc25d680d5..9b173c8f824 100644 --- a/readthedocs/templates/projects/project_edit.html +++ b/readthedocs/templates/projects/project_edit.html @@ -22,7 +22,7 @@ {% comment %}Translators: The 'or' here is in between 'Submit' and 'delete'.{% endcomment %} {% trans "or" %} - {% trans "delete project" %} + {% trans "Delete Project" %}

    {% endblock %} From 473b352126d2f83859d954da1ac6cac1e3a671fa Mon Sep 17 00:00:00 2001 From: Shubham R Patil Date: Thu, 8 Mar 2018 14:37:14 +0530 Subject: [PATCH 4/5] fixed typo --- readthedocs/templates/projects/project_edit.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readthedocs/templates/projects/project_edit.html b/readthedocs/templates/projects/project_edit.html index 9b173c8f824..12e2e189912 100644 --- a/readthedocs/templates/projects/project_edit.html +++ b/readthedocs/templates/projects/project_edit.html @@ -20,7 +20,7 @@ {{ form.as_p }}

    - {% comment %}Translators: The 'or' here is in between 'Submit' and 'delete'.{% endcomment %} + {% comment %}Translators: The 'or' here is in between 'Save' and 'Delete Project'.{% endcomment %} {% trans "or" %} {% trans "Delete Project" %}

    From 7e6ac31433d61bfbb77c4bc7583b7f6360353e80 Mon Sep 17 00:00:00 2001 From: shubham76 Date: Fri, 9 Mar 2018 19:12:22 +0530 Subject: [PATCH 5/5] Removed the capitalization in sentences or texts on submit buttons --- readthedocs/templates/core/project_details.html | 2 +- readthedocs/templates/projects/integration_form.html | 2 +- readthedocs/templates/projects/integration_list.html | 2 +- readthedocs/templates/projects/onboard_detail.html | 2 +- readthedocs/templates/projects/project_advertising.html | 2 +- readthedocs/templates/projects/project_edit.html | 4 ++-- .../templates/projects/projectrelationship_form.html | 6 +++--- .../templates/projects/projectrelationship_list.html | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/readthedocs/templates/core/project_details.html b/readthedocs/templates/core/project_details.html index 47081bd5771..c38253d06aa 100644 --- a/readthedocs/templates/core/project_details.html +++ b/readthedocs/templates/core/project_details.html @@ -66,7 +66,7 @@

    {% trans "Build a version" %}

    {% endfor %} - + diff --git a/readthedocs/templates/projects/integration_form.html b/readthedocs/templates/projects/integration_form.html index 42b7a1e509c..cc46a9b0355 100644 --- a/readthedocs/templates/projects/integration_form.html +++ b/readthedocs/templates/projects/integration_form.html @@ -18,6 +18,6 @@ action="{% url 'projects_integrations_create' project_slug=project.slug %}"> {% csrf_token %} {{ form.as_p }} - + {% endblock %} diff --git a/readthedocs/templates/projects/integration_list.html b/readthedocs/templates/projects/integration_list.html index e65057a8bbb..099538fdb55 100644 --- a/readthedocs/templates/projects/integration_list.html +++ b/readthedocs/templates/projects/integration_list.html @@ -17,7 +17,7 @@
  • - {% trans "Add Integration" %} + {% trans "Add integration" %}
  • diff --git a/readthedocs/templates/projects/onboard_detail.html b/readthedocs/templates/projects/onboard_detail.html index 51dde84ac12..c1aebea31aa 100644 --- a/readthedocs/templates/projects/onboard_detail.html +++ b/readthedocs/templates/projects/onboard_detail.html @@ -38,7 +38,7 @@

    {% trans "Your documentation is ready to use" %}

    {% endblocktrans %}

    - + {% else %} {% comment %}Last build failed{% endcomment %} diff --git a/readthedocs/templates/projects/project_advertising.html b/readthedocs/templates/projects/project_advertising.html index 28b72fa7610..c18ce73d0b8 100644 --- a/readthedocs/templates/projects/project_advertising.html +++ b/readthedocs/templates/projects/project_advertising.html @@ -129,7 +129,7 @@

    {% trans "Still can't help?" %}

    {% csrf_token %} {{ form.as_p }}

    - +

    {% endblock %} diff --git a/readthedocs/templates/projects/project_edit.html b/readthedocs/templates/projects/project_edit.html index 12e2e189912..29c219c8247 100644 --- a/readthedocs/templates/projects/project_edit.html +++ b/readthedocs/templates/projects/project_edit.html @@ -20,9 +20,9 @@ {{ form.as_p }}

    - {% comment %}Translators: The 'or' here is in between 'Save' and 'Delete Project'.{% endcomment %} + {% comment %}Translators: The 'or' here is in between 'Save' and 'Delete project'.{% endcomment %} {% trans "or" %} - {% trans "Delete Project" %} + {% trans "Delete project" %}

    {% endblock %} diff --git a/readthedocs/templates/projects/projectrelationship_form.html b/readthedocs/templates/projects/projectrelationship_form.html index 0515c0d3b32..566b5fde8d0 100644 --- a/readthedocs/templates/projects/projectrelationship_form.html +++ b/readthedocs/templates/projects/projectrelationship_form.html @@ -19,14 +19,14 @@ action="{% url 'projects_subprojects_update' project_slug=project.slug subproject_slug=object.child.slug %}"> {% csrf_token %} {{ form.as_p }} - +
    {% csrf_token %} - +
    {% else %}
    {% csrf_token %} {{ form.as_p }} - +
    {% endif %} {% endblock %} diff --git a/readthedocs/templates/projects/projectrelationship_list.html b/readthedocs/templates/projects/projectrelationship_list.html index 986c0ecf893..a5aca6a2753 100644 --- a/readthedocs/templates/projects/projectrelationship_list.html +++ b/readthedocs/templates/projects/projectrelationship_list.html @@ -38,7 +38,7 @@
  • - {% trans "Add Subproject" %} + {% trans "Add subproject" %}