Skip to content

Commit

Permalink
Standardize on "Gold membership"
Browse files Browse the repository at this point in the history
- Remove "gold subscription"
- Membership is not capitalized unless in a title
- Don't use "gold" without member or membership
davidfischer committed Aug 20, 2019

Verified

This commit was signed with the committer’s verified signature.
neo1973 Markus Härer
1 parent 478cfac commit a84c4f3
Showing 17 changed files with 42 additions and 40 deletions.
2 changes: 1 addition & 1 deletion docs/advertising/ad-blocking.rst
Original file line number Diff line number Diff line change
@@ -53,7 +53,7 @@ Going ad-free
-------------

Users can go completely ad-free
by becoming a `Gold Member <https://readthedocs.org/accounts/gold/>`_
by becoming a `Gold member <https://readthedocs.org/accounts/gold/>`_
or a `Supporter <https://readthedocs.org/sustainability/#donations>`_.
Thank you for supporting Read the Docs.

4 changes: 2 additions & 2 deletions docs/advertising/ethical-advertising.rst
Original file line number Diff line number Diff line change
@@ -156,9 +156,9 @@ Opting Out
We have added multiple ways to opt out of the advertising on Read the Docs.

1. You can go completely ad-free
by becoming a `Gold Member <https://readthedocs.org/accounts/gold/>`_
by becoming a `Gold member <https://readthedocs.org/accounts/gold/>`_
or a `Supporter <https://readthedocs.org/sustainability/#donations>`_.
Additionally, Gold Members may remove advertising from their projects for all visitors.
Additionally, Gold members may remove advertising from their projects for all visitors.

2. You can opt out of seeing paid advertisements on documentation pages:

6 changes: 3 additions & 3 deletions docs/advertising/index.rst
Original file line number Diff line number Diff line change
@@ -23,13 +23,13 @@ that respects user privacy.
We recognize that advertising is not for everyone.
You may :ref:`opt out of paid advertising <advertising/ethical-advertising:Opting Out>`
although you will still see :ref:`community ads <advertising/ethical-advertising:Community Ads>`.
You can go ad-free by `becoming a Gold Member`_ or a `Supporter`_ of Read the Docs.
Gold Members can also remove advertising from their projects for all visitors.
You can go ad-free by `becoming a Gold member`_ or a `Supporter`_ of Read the Docs.
Gold members can also remove advertising from their projects for all visitors.

For businesses looking to remove advertising,
please consider :doc:`Read the Docs for Business </commercial/index>`.

.. _becoming a Gold Member: https://readthedocs.org/accounts/gold/
.. _becoming a Gold member: https://readthedocs.org/accounts/gold/
.. _Supporter: https://readthedocs.org/sustainability/#donations

.. toctree::
4 changes: 2 additions & 2 deletions docs/privacy-policy.rst
Original file line number Diff line number Diff line change
@@ -166,12 +166,12 @@ and we encourage you to check back periodically.
Payment processing
++++++++++++++++++

Should you choose to become a `Supporter`_, purchase a `Gold Membership`_,
Should you choose to become a `Supporter`_, purchase a `Gold membership`_,
or become a subscriber to Read the Docs' commercial hosting product,
your payment information and details will be processed by Stripe.
Read the Docs does not store your payment information.

.. _Gold Membership: https://readthedocs.org/accounts/gold/
.. _Gold membership: https://readthedocs.org/accounts/gold/
.. _Supporter: https://readthedocs.org/sustainability/

Site monitoring
4 changes: 2 additions & 2 deletions readthedocs/gold/__init__.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# -*- coding: utf-8 -*-

"""
A Django app for Gold Membership.
A Django app for Gold membership.
Gold Membership is Read the Docs' program for recurring, monthly donations.
Gold membership is Read the Docs' program for recurring, monthly donations.
"""
default_app_config = 'readthedocs.gold.apps.GoldAppConfig'
2 changes: 1 addition & 1 deletion readthedocs/gold/admin.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-

"""Django admin configuration for the Gold Membership app."""
"""Django admin configuration for the Gold membership app."""

from django.contrib import admin

2 changes: 1 addition & 1 deletion readthedocs/gold/apps.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-

"""Django app configuration for the Gold Membership app."""
"""Django app configuration for the Gold membership app."""

from django.apps import AppConfig

4 changes: 2 additions & 2 deletions readthedocs/gold/models.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
"""Django models for recurring donations aka Gold Membership."""
"""Django models for recurring donations aka Gold membership."""
import math
from datetime import datetime

@@ -25,7 +25,7 @@

class GoldUser(models.Model):

"""A user subscription for gold membership."""
"""A user subscription for Gold membership."""

pub_date = models.DateTimeField(_('Publication date'), auto_now_add=True)
modified_date = models.DateTimeField(_('Modified date'), auto_now=True)
7 changes: 4 additions & 3 deletions readthedocs/gold/templates/gold/projects.html
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@
<h3>{% trans "Gold Projects" %}</h3>
<p>
{% blocktrans trimmed %}
Gold Members may completely remove advertising for all visitors to their projects.
Gold members may completely remove advertising for all visitors to their projects.
{% endblocktrans %}
</p>

@@ -46,8 +46,9 @@ <h3>{% trans "Make a project ad-free" %}</h3>
</form>
{% else %}
<p>
{% blocktrans trimmed with gold_level=gold_user.get_level_display %}
You have already adopted all the projects you can with your current Gold Membership of {{ gold_level }}.
{% blocktrans trimmed with gold_level=gold_user.get_level_display gold_projects_count=gold_user.num_supported_projects %}
You can't make any more projects ad-free with your current Gold membership of {{ gold_level }}.
You can either increase the level of your membership or change which projects you make ad-free.
{% endblocktrans %}
</p>
{% endif %}
Original file line number Diff line number Diff line change
@@ -3,19 +3,19 @@

{% block profile-admin-gold-edit %}active{% endblock %}

{% block title %}Cancel Gold{% endblock %}
{% block title %}Cancel Gold membership{% endblock %}

{% block edit_content %}
<h2>Cancel Gold Subscription</h2>
<h2>Cancel Gold membership</h2>

<p>
{% blocktrans trimmed %}
Are you sure you want to cancel your subscription?
Are you sure you want to cancel your Gold membership?
{% endblocktrans %}
</p>

<form method="post" action="{% url "gold_cancel" %}">
{% csrf_token %}
<input type="submit" value="{% trans "Cancel Subscription" %}">
<input type="submit" value="{% trans "Cancel Gold membership" %}">
</form>
{% endblock %}
8 changes: 4 additions & 4 deletions readthedocs/gold/templates/gold/subscription_detail.html
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@

{% block profile-admin-gold-edit %}active{% endblock %}

{% block title %}{% trans "Gold Subscription" %}{% endblock %}
{% block title %}{% trans "Gold Membership" %}{% endblock %}

{% block extra_scripts %}
<script src="https://js.stripe.com/v2/" type="text/javascript"></script>
@@ -28,7 +28,7 @@

{% block edit_content %}
<div class="gold-subscription">
<h2>{% trans "Gold Subscription" %}</h2>
<h2>{% trans "Gold Membership" %}</h2>

<p>
{% blocktrans trimmed %}
@@ -47,11 +47,11 @@ <h2>{% trans "Gold Subscription" %}</h2>
</p>

<form method="get" action="{% url "gold_subscription" %}" class="subscription-update">
<button>{% trans "Update Subscription" %}</button>
<button>{% trans "Update membership" %}</button>
</form>

<form method="get" action="{% url "gold_cancel" %}" class="subscription-cancel">
<button>{% trans "Cancel Subscription" %}</button>
<button>{% trans "Cancel membership" %}</button>
</form>

<h3>{% trans "Gold projects" %}</h3>
10 changes: 5 additions & 5 deletions readthedocs/gold/templates/gold/subscription_form.html
Original file line number Diff line number Diff line change
@@ -34,7 +34,7 @@

{% block edit_content %}
<div>
<h2>Read the Docs Gold</h2>
<h2>{% trans 'Read the Docs Gold Membership' %}</h2>

<p>
{% blocktrans trimmed %}
@@ -46,8 +46,8 @@ <h2>Read the Docs Gold</h2>

<p>
{% blocktrans trimmed %}
Becoming a Gold Member makes Read the Docs ad-free when you are logged-in.
Gold Members may also completely remove advertising for all visitors to their projects.
Becoming a Gold member makes Read the Docs ad-free when you are logged-in.
Gold members may also completely remove advertising for all visitors to their projects.
{% endblocktrans %}
</p>

@@ -67,12 +67,12 @@ <h2>Read the Docs Gold</h2>

<p>
{% blocktrans trimmed %}
For any questions about our Gold Membership program,
For any questions about our Gold membership program,
please <a href="mailto:rev@readthedocs.org?subject=Gold%20membership%20questions">email us</a>.
{% endblocktrans %}
</p>

{% trans "Become a Gold Member" as subscription_title %}
{% trans "Become a Gold member" as subscription_title %}
{% if golduser %}
{% trans "Update Your Subscription" as subscription_title %}
{% endif %}
2 changes: 1 addition & 1 deletion readthedocs/templates/profiles/base_profile_edit.html
Original file line number Diff line number Diff line change
@@ -51,7 +51,7 @@ <h2>
<li class="{% block profile-admin-change-email %}{% endblock %}"><a href="{% url 'account_email' %}">{% trans "Change Email" %}</a></li>
<li class="{% block profile-admin-tokens %}{% endblock %}"><a href="{% url 'profiles_tokens' %}">{% trans "API Tokens" %}</a></li>
<li class="{% block profile-admin-delete-account %}{% endblock %}"><a href="{% url 'delete_account' %}">{% trans "Delete Account" %}</a></li>
<li class="{% block profile-admin-gold-edit %}{% endblock %}"><a href="{% url 'gold_detail' %}">{% trans "Gold" %}</a></li>
<li class="{% block profile-admin-gold-edit %}{% endblock %}"><a href="{% url 'gold_detail' %}">{% trans "Gold Membership" %}</a></li>
{% if USE_PROMOS %}
<li class="{% block profile-admin-advertising %}{% endblock %}"><a href="{% url 'account_advertising' %}">{% trans "Advertising" %}</a></li>
{% endif %}
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@
{% if request.user.gold.exists or request.user.goldonce.exists %}
<p>
{% blocktrans trimmed %}
Since you are a Gold Member or Supporter, you are <strong>ad-free</strong> for as long as you are logged-in.
Since you are a Gold member or Supporter, you are <strong>ad-free</strong> for as long as you are logged-in.
Thank you for supporting Read the Docs.
{% endblocktrans%}
</p>
@@ -39,7 +39,7 @@
{% url "gold_detail" as gold_detail %}
{% url "donate" as donate_url %}
{% blocktrans trimmed %}
You can <strong>go ad-free</strong> by becoming a <a href="{{ gold_detail }}">Gold Member</a> or <a href="{{ donate_url }}">Supporter</a> of Read the Docs</a>.
You can <strong>go ad-free</strong> by becoming a <a href="{{ gold_detail }}">Gold member</a> or <a href="{{ donate_url }}">Supporter</a> of Read the Docs</a>.
{% endblocktrans %}
</p>

6 changes: 3 additions & 3 deletions readthedocs/templates/projects/project_advertising.html
Original file line number Diff line number Diff line change
@@ -79,7 +79,7 @@ <h4>{% trans "Opting out" %}</h4>
<li class="module-item">
{% url "gold_detail" as gold_detail %}
{% blocktrans trimmed %}
By becoming a <a href="{{ gold_detail }}">Gold Member</a> to Read the Docs,
By becoming a <a href="{{ gold_detail }}">Gold member</a> to Read the Docs,
you may remove advertising from your projects for all visitors.
{% endblocktrans %}
</li>
@@ -95,7 +95,7 @@ <h4>{% trans "Opting out" %}</h4>
<li class="module-item">
{% blocktrans trimmed %}
If you would like to completely remove advertising from your open source project,
but both Read the Docs for Business and our Gold Memberships don't seem like the right fit,
but both Read the Docs for Business and our Gold memberships don't seem like the right fit,
please <a href="mailto:ads@readthedocs.org?subject=Alternatives%20to%20advertising">get in touch</a>
to discuss alternatives to advertising.
{% endblocktrans %}
@@ -113,7 +113,7 @@ <h4>{% trans "Opting out" %}</h4>
{% blocktrans trimmed %}
If you are a company hosting commercial documentation on our community site,
we do not allow removing paid advertisements on your documentation.
Please consider Read the Docs for Business or a Gold Membership.
Please consider Read the Docs for Business or a Gold membership.
{% endblocktrans %}
</small>
</p>
5 changes: 3 additions & 2 deletions readthedocs/templates/projects/project_dashboard.html
Original file line number Diff line number Diff line change
@@ -10,8 +10,9 @@ <h3>Support Read the Docs</h3>
Read the Docs depends on users like you to help us keep the site sustainable.
</p>
<p>
We now offer <a href="{% url "gold_detail" %}">Read the Docs Gold</a> to allow folks to support us. Gold subscriptions allow us to keep the site running, and improving all the time.
If you find value in Read the Docs, please consider getting a subscription.
We now offer <a href="{% url "gold_detail" %}">Read the Docs Gold membership</a> to allow folks to support us.
Gold members allow us to keep the site running, and improving all the time.
If you find value in Read the Docs, please consider becoming a member.
</p>

<form method="get" action="{% url "gold_detail" %}">
4 changes: 2 additions & 2 deletions readthedocs/templates/support.html
Original file line number Diff line number Diff line change
@@ -28,7 +28,7 @@

Read the Docs is supported by community contributions and advertising.
We hope to bring in enough money
with our `Gold`_ and `Ethical Ads`_ programs to keep Read the Docs sustainable.
with our `Gold membership`_ and `Ethical Ads`_ programs to keep Read the Docs sustainable.

**All people answering your questions are doing it with their own time,
so please be kind and provide as much information as possible.**
@@ -67,7 +67,7 @@

.. _Stack Overflow: http://stackoverflow.com/questions/tagged/read-the-docs
.. _Github Issue Tracker: https://github.com/readthedocs/readthedocs.org/issues
.. _Gold: https://readthedocs.org/accounts/gold/
.. _Gold membership: https://readthedocs.org/accounts/gold/
.. _Ethical Ads: https://docs.readthedocs.io/page/advertising/ethical-advertising.html
.. _Read the Docs for Business: https://readthedocs.com

0 comments on commit a84c4f3

Please sign in to comment.