Skip to content

Commit 0303fc6

Browse files
mayhemmayhem
authored
Merge pull request #445 from metabrainz/improve-data-use-text
Improve the text on the profile page for commercial users
2 parents 99097a1 + fda3556 commit 0303fc6

File tree

1 file changed

+61
-36
lines changed

1 file changed

+61
-36
lines changed

‎metabrainz/templates/users/profile.html‎

Lines changed: 61 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -75,59 +75,84 @@ <h3>{{ _('Contact information') }}</h3>
7575
{% if current_user.is_commercial %}
7676
{% if current_user.state in ('active', 'limited') and current_user.good_standing %}
7777
<h3>{{ _('Data use permission granted') }}</h3>
78-
<p>
79-
{{ _('You have permission to use any of the data published by the MetaBrainz
80-
Foundation. This includes data dumps released under a Creative Commons
81-
non-commercial license. Thank you for your support!') }}
82-
</p>
83-
<p>
84-
{{ _('Note 1: If your support falls behind by more than 60 days, this
85-
permission may be withdrawn. You can always check your current permission
86-
status on this page.') }}
87-
</p>
88-
<p>
89-
{{ _('Note 2: The IP addresses from which replication packets for the Live Data Feed are downloaded are logged.') }}
90-
</p>
78+
<div style="font-size: 13pt">
79+
<p>
80+
<b>Your support agreement has been completed -- thank you!</b>
81+
</p>
82+
<p>
83+
{{ _('You have permission to use any of the data published by the MetaBrainz
84+
Foundation. This includes data dumps released under a Creative Commons
85+
non-commercial license. Thank you for your support!') }}
86+
</p>
87+
<p>
88+
{{ _('Note 1: If your support falls behind by more than 60 days, this
89+
permission may be withdrawn. You can always check your current permission
90+
status on this page.') }}
91+
</p>
92+
<p>
93+
{{ _('Note 2: The IP addresses from which replication packets for the Live Data Feed are downloaded are logged.') }}
94+
</p>
95+
</div>
9196
{% else %}
92-
<h3>{{ _('Limited data use permission granted') }}</h3>
93-
<p>
94-
{{ _('You do not currently have permission to use data released under a Creative Commons non-commercial license for commercial purposes.') }}
95-
</p>
96-
<p>
97-
{{ _('Reason:') }}
97+
<h3>Limited/no data use permission granted</h3>
98+
<div style="font-size: 13pt">
9899
{% if current_user.state == 'rejected' %}
99-
{{ _('Your application for using the Live Data Feed has been rejected.') }}
100+
<p>
101+
<b>Your application for using the Live Data Feed has been rejected.</b>
102+
</p>
103+
<p>
104+
You do not have permission to use our data in a public commercial product.
105+
</p>
100106
{% elif current_user.state == 'pending' %}
101-
{{ _('Your application for using the Live Data Feed is still pending. You may use our data and APIs for evaluation purposes while your application is pending.') }}
107+
<p>
108+
<b>Your application for using the Live Data Feed is still pending.</b>
109+
</p>
110+
<p>
111+
You may use our data and APIs for evaluation/development purposes
112+
while your application is pending.
113+
</p>
102114
{% elif current_user.state == 'waiting' %}
103-
{{ _('Your application for using the Live Data Feed is in the waiting list. You may use our data and APIs for evaluation purposes while your application is pending.') }}
115+
<p>
116+
<b>Your application for using the Live Data Feed is waiting to finalize our support agreement.</b>
117+
</p>
118+
<p>
119+
You may use our data and APIs for evaluation and development purposes, but you may not use the data in a public
120+
commercial product. Once you are nearing the public release of a product that contains our data, please
121+
<a href="/contact">contact us</a> again to finalize our support agreement.
122+
</p>
104123
{% elif not current_user.good_standing %}
105-
{{ _('Your account sign-up is incomplete or your account is in bad standing, which means that you are more than
106-
60 days behind in support payments. If you think this is a mistake,
107-
please <a href="%(contact_url)s">contact us</a>.', contact_url=url_for('index.contact')) }}
124+
<p>
125+
<b>Your use of the Live Data Feed is pending suspension.</b>
126+
</p>
127+
<p>
128+
Your account is in bad standing, which means that you are more than 60 days behind in support payments. If you think
129+
this is a mistake, please <a href="/contact">contact us</a>.
130+
</p>
108131
{% else %}
109132
{{ _('Unknown. :(') }}
110133
{% endif %}
111-
</p>
134+
</div>
112135
{% endif %}
113136
{% endif %}
114137

115138
{% if current_user.state in ('active', 'limited') and current_user.good_standing %}
116139
<h2>{{ _('Data Download') }}</h2>
117140

118-
{% if not current_user.is_commercial %}
141+
<div style="font-size: 13pt">
142+
{% if not current_user.is_commercial %}
143+
<p>
144+
Thank you for registering with us -- we really appreciate it!
145+
</p>
146+
{% endif %}
147+
119148
<p>
120-
Thank you for registering with us -- we really appreciated it!
149+
Please proceed to our download page to download our datasets:
121150
</p>
122-
{% endif %}
123-
124-
<p>
125-
Please proceed to our download page to download our datasets:
126-
</p>
127151

128-
<p>
129-
<a href="{{ url_for("index.download") }}" class="btn btn-lg btn-primary">Download Datasets</a>
130-
</p>
152+
<p>
153+
<a href="{{ url_for("index.download") }}" class="btn btn-lg btn-primary">Download Datasets</a>
154+
</p>
155+
</div>
131156
{% endif %}
132157

133158
{% if current_user.state == 'active' %}

0 commit comments

Comments
 (0)