Skip to content

Commit

Permalink
Add missing commas to multiple values in trans blocks
Browse files Browse the repository at this point in the history
  • Loading branch information
nlhkabu committed Sep 10, 2019
1 parent 453e589 commit 67f27a2
Show file tree
Hide file tree
Showing 26 changed files with 104 additions and 104 deletions.
4 changes: 2 additions & 2 deletions warehouse/templates/accounts/two-factor.html
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ <h2>
</button>
<ul id="webauthn-errors" class="form-errors form-errors--full-width margin-top--large">
<li id="webauthn-browser-support" class="hidden">
{% trans trimmed href="https://developer.mozilla.org/en-US/docs/Web/API/PublicKeyCredential#Browser_compatibility" title=gettext("External link") target="_blank" rel="noopener" %}
<a href="{{ href }}" title="{{ title }}" target="{{ target }}" rel="{{ rel }}">Upgrade your browser</a> to log in with a security device (e.g. USB key)
{% trans trimmed href="https://developer.mozilla.org/en-US/docs/Web/API/PublicKeyCredential#Browser_compatibility", title=gettext("External link") %}
<a href="{{ href }}" title="{{ title }}" target="_blank" rel="noopener">Upgrade your browser</a> to log in with a security device (e.g. USB key)
{% endtrans %}
</li>
</ul>
Expand Down
2 changes: 1 addition & 1 deletion warehouse/templates/email/account-deleted/body.html
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@
{% block content %}
<p>{% trans username=username %}Your PyPI account <strong>{{ username }}</strong> has been deleted.{% endtrans %}</p>

<p>{% trans href='mailto:[email protected]' email_address='[email protected]' %}If you did not make this change, you can email <a href="{{ href }}">{{ email_address }}</a> to communicate with the PyPI administrators.{% endtrans %}</p>
<p>{% trans href='mailto:[email protected]', email_address='[email protected]' %}If you did not make this change, you can email <a href="{{ href }}">{{ email_address }}</a> to communicate with the PyPI administrators.{% endtrans %}</p>
{% endblock %}
2 changes: 1 addition & 1 deletion warehouse/templates/email/account-deleted/body.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
{% extends "email/_base/body.txt" %}

{% block content %}
{% trans trimmed username=username email_address='[email protected]' %}
{% trans trimmed username=username, email_address='[email protected]' %}
Your PyPI account '{{ username }}' has been deleted.

If you did not make this change, you can email {{ email_address }} to communicate
Expand Down
4 changes: 2 additions & 2 deletions warehouse/templates/email/added-as-collaborator/body.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@
{% set site = request.registry.settings["site.name"] %}

{% block content %}
<p>{% trans role=role site=site project=project submitter=submitter %}You have been added as <strong>{{ role }}</strong> to the {{ site }} project {{ project }} by {{ submitter }}.{% endtrans %}</p>
<p>{% trans role=role, site=site, project=project, submitter=submitter %}You have been added as <strong>{{ role }}</strong> to the {{ site }} project {{ project }} by {{ submitter }}.{% endtrans %}</p>
{% endblock %}


{% block reason %}
{% trans submitter=submitter site=site %}You are receiving this because you have been added by {{ submitter }} to a project on {{ site }}.{% endtrans %}
{% trans submitter=submitter, site=site %}You are receiving this because you have been added by {{ submitter }} to a project on {{ site }}.{% endtrans %}
{% endblock %}
4 changes: 2 additions & 2 deletions warehouse/templates/email/added-as-collaborator/body.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
{% set site = request.registry.settings["site.name"] %}

{% block content %}
{% trans role=role site=site project=project submitter=submitter %}You have been added as {{ role }} to the {{ site }} project {{ project }} by {{ submitter }}.{% endtrans %}
{% trans role=role, site=site, project=project, submitter=submitter %}You have been added as {{ role }} to the {{ site }} project {{ project }} by {{ submitter }}.{% endtrans %}
{% endblock %}

{% block reason %}{% trans submitter=submitter site=site %}You are receiving this because you have been added by {{ submitter }} to a project on {{ site }}.{% endtrans %}{% endblock %}
{% block reason %}{% trans submitter=submitter, site=site %}You are receiving this because you have been added by {{ submitter }} to a project on {{ site }}.{% endtrans %}{% endblock %}
2 changes: 1 addition & 1 deletion warehouse/templates/email/collaborator-added/body.html
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
</ul>
</p>

<p>{% trans href='mailto:[email protected]' email_address='[email protected]' %}If this was a mistake, you can email <a href="{{ href }}">{{ email_address }}</a> to communicate with the PyPI administrators.{% endtrans %}</p>
<p>{% trans href='mailto:[email protected]', email_address='[email protected]' %}If this was a mistake, you can email <a href="{{ href }}">{{ email_address }}</a> to communicate with the PyPI administrators.{% endtrans %}</p>
{% endblock %}


Expand Down
2 changes: 1 addition & 1 deletion warehouse/templates/email/password-change/body.html
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@
{% block content %}
<p>{% trans username=username %}Someone, perhaps you, has changed the password for your PyPI account <strong>{{ username }}</strong>.{% endtrans %}</p>

<p>{% trans href='mailto:[email protected]' email_address='[email protected]' %}If you did not make this change, you can email <a href="{{ href }}">{{ email_address }}</a> to communicate with the PyPI administrators.{% endtrans %}</p>
<p>{% trans href='mailto:[email protected]', email_address='[email protected]' %}If you did not make this change, you can email <a href="{{ href }}">{{ email_address }}</a> to communicate with the PyPI administrators.{% endtrans %}</p>
{% endblock %}
4 changes: 2 additions & 2 deletions warehouse/templates/email/password-compromised-hibp/body.html
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ <h3>{% trans %}What?{% endtrans %}</h3>

<h3>{% trans %}What should I do?{% endtrans %}</h3>
<p>
{% trans trimmed reset_pw_url=request.route_url('accounts.request-password-reset', _host=request.registry.settings.get('warehouse.domain')) have_i_been_pwned_url='https://haveibeenpwned.com/' %}
{% trans trimmed reset_pw_url=request.route_url('accounts.request-password-reset', _host=request.registry.settings.get('warehouse.domain')), have_i_been_pwned_url='https://haveibeenpwned.com/' %}
To regain access to your account,
<a href="{{ reset_pw_url }}">reset your password</a>
on PyPI. We also recommend that you go to
Expand All @@ -52,7 +52,7 @@ <h3>{% trans %}How do you know this?{% endtrans %}</h3>
{% endtrans %}
</p>
<p>
{% trans trimmed faq_url=request.help_url(_anchor='compromised-password') email_href='mailto:[email protected]' email_address='[email protected]' %}
{% trans trimmed faq_url=request.help_url(_anchor='compromised-password'), email_href='mailto:[email protected]', email_address='[email protected]' %}
For more information, see our
<a href="{{ faq_url }}">FAQ</a>. For help,
you can email <a href="{{ email_href }}">{{ email_address }}</a> to communicate with
Expand Down
4 changes: 2 additions & 2 deletions warehouse/templates/email/password-compromised-hibp/body.txt
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ against PyPI and its users.{% endtrans %}

# {% trans %}What should I do?{% endtrans %}

{% trans trimmed reset_pw_url=request.route_url('accounts.request-password-reset', _host=request.registry.settings.get('warehouse.domain')) have_i_been_pwned_url='https://haveibeenpwned.com/' %}
{% trans trimmed reset_pw_url=request.route_url('accounts.request-password-reset', _host=request.registry.settings.get('warehouse.domain')), have_i_been_pwned_url='https://haveibeenpwned.com/' %}
To regain access to your account, reset your password on PyPI
({{ reset_pw_url }}). We also recommend that you go to
HaveIBeenPwned ({{ have_i_been_pwned_url }}) and check your other passwords and get
Expand All @@ -43,6 +43,6 @@ updating your password, we generate a SHA1 hash of your password and use the fir
characters of the hash to decide if the password is compromised. The plaintext password
is never stored by PyPI or sent to HaveIBeenPwned.{% endtrans %}

{% trans help_url=request.help_url(_anchor='compromised-password') email_address='[email protected]' %}For more information, see {{ help_url }}. For
{% trans help_url=request.help_url(_anchor='compromised-password'), email_address='[email protected]' %}For more information, see {{ help_url }}. For
help, you can email {{ email_address }} to communicate with the PyPI administrators.{% endtrans %}
{% endblock %}
4 changes: 2 additions & 2 deletions warehouse/templates/email/primary-email-change/body.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@


{% block content %}
<p>{% trans username=username old_email=old_email new_email=new_email %}The primary email for your PyPI account <strong>{{ username }}</strong> has been changed from <code>{{ old_email }}</code> to <code>{{ new_email }}</code>{% endtrans %}</p>
<p>{% trans username=username, old_email=old_email, new_email=new_email %}The primary email for your PyPI account <strong>{{ username }}</strong> has been changed from <code>{{ old_email }}</code> to <code>{{ new_email }}</code>{% endtrans %}</p>

<p>{% trans href='mailto:[email protected]' email_address='[email protected]' %}If you did not make this change, you can email <a href="{{ href }}">{{ email_address }}</a> to communicate with the PyPI administrators.{% endtrans %}</p>
<p>{% trans href='mailto:[email protected]', email_address='[email protected]' %}If you did not make this change, you can email <a href="{{ href }}">{{ email_address }}</a> to communicate with the PyPI administrators.{% endtrans %}</p>
{% endblock %}
2 changes: 1 addition & 1 deletion warehouse/templates/email/primary-email-change/body.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
{% extends "email/_base/body.txt" %}

{% block content %}
{% trans username=username old_email=old_email new_email=new_email %}The primary email for your PyPI account:
{% trans username=username, old_email=old_email, new_email=new_email %}The primary email for your PyPI account:

'{{ username }}'

Expand Down
4 changes: 2 additions & 2 deletions warehouse/templates/includes/accounts/profile-actions.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<div class="sidebar-section">
<h3 class="sidebar-section__title">{% trans %}Statistics{% endtrans %}</h3>
<p>
{% trans trimmed libs_io_href='https://libraries.io/' title=gettext('External link') gbq_href='https://packaging.python.org/guides/analyzing-pypi-package-downloads/' %}
{% trans trimmed libs_io_href='https://libraries.io/', title=gettext('External link'), gbq_href='https://packaging.python.org/guides/analyzing-pypi-package-downloads/' %}
View statistics for your projects via
<a href="{{ libs_io_href }}" title="{{ title }}" target="_blank" rel="noopener">Libraries.io</a>,
or by using
Expand All @@ -30,7 +30,7 @@ <h3 class="sidebar-section__title">{% trans %}Statistics{% endtrans %}</h3>
<div class="sidebar-section">
<h3 class="sidebar-section__title">{% trans %}Statistics{% endtrans %}</h3>
<p>
{% trans trimmed username=user.username libs_io_href='https://libraries.io/' title=gettext('External link') gbq_href='https://packaging.python.org/guides/analyzing-pypi-package-downloads/' %}
{% trans trimmed username=user.username, libs_io_href='https://libraries.io/', title=gettext('External link'), gbq_href='https://packaging.python.org/guides/analyzing-pypi-package-downloads/' %}
View statistics for {{ username }}'s projects via
<a href="{{ libs_io_href }}" title="{{ title }}" target="_blank" rel="noopener">Libraries.io</a>,
or by using
Expand Down
2 changes: 1 addition & 1 deletion warehouse/templates/includes/accounts/profile-callout.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<div class="callout-block no-top-margin">
{% if user.id == request.user.id %}
<p>
{% trans trimmed href='https://packaging.python.org/' title=gettext('External link') %}
{% trans trimmed href='https://packaging.python.org/', title=gettext('External link') %}
You have not uploaded any projects to PyPI, yet.
To learn how to get started, visit the
<a href="{{ href }}" title="{{ title }}" target="_blank" rel="noopener">Python Packaging User Guide</a>
Expand Down
2 changes: 1 addition & 1 deletion warehouse/templates/includes/hash-modal.html
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
</a>
<div class="modal__body">
<h3 class="modal__title">
{% trans trimmed href='https://pip.pypa.io/en/stable/reference/pip_install/#hash-checking-mode' title=gettext('External link') filename=file.filename %}
{% trans trimmed href='https://pip.pypa.io/en/stable/reference/pip_install/#hash-checking-mode', title=gettext('External link'), filename=file.filename %}
<a href="{{ href }}" title="{{ title }}" target="_blank" rel="noopener">Hashes</a> for {{ filename }}
{% endtrans %}
</h3>
Expand Down
8 changes: 4 additions & 4 deletions warehouse/templates/manage/account.html
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@

<ul id="webauthn-errors" class="form-errors form-errors--full-width">
<li id="webauthn-browser-support" class="hidden margin-top--large">
{% trans trimmed href='https://developer.mozilla.org/en-US/docs/Web/API/PublicKeyCredential#Browser_compatibility' title=gettext('External link') %}
{% trans trimmed href='https://developer.mozilla.org/en-US/docs/Web/API/PublicKeyCredential#Browser_compatibility', title=gettext('External link') %}
<a href="{{ href }}" title="{{ title }}" target="_blank" rel="noopener">Upgrade your browser</a>
to set up two factor authentication with a security device (e.g. USB key)
{% endtrans %}
Expand Down Expand Up @@ -252,7 +252,7 @@ <h2 class="no-top-padding sub-title">{% trans %}Profile picture{% endtrans %}</h
<img src="{{ gravatar(request, user.email, size=140) }}" alt="{{ alt }}" title="{{ alt }}" class="gravatar-form__image">
<div class="gravatar-form__content">
<p>
{% trans trimmed href='https://gravatar.com/' title=gettext('External link')%}
{% trans trimmed href='https://gravatar.com/', title=gettext('External link')%}
We use
<a href="{{ href }}" title="{{ title }}" target="_blank" rel="noopener">gravatar.com</a>
to generate your profile picture based on your primary email address
Expand Down Expand Up @@ -305,7 +305,7 @@ <h2 class="sub-title">{% trans %}Account details{% endtrans %}</h2>
{% endtrans %}
</p>
</div>
<input value="{% endtrans %}Update account{% endtrans %}" class="button button--primary" type="submit">
<input value="{% trans %}Update account{% endtrans %}" class="button button--primary" type="submit">
</form>
</section>

Expand Down Expand Up @@ -673,7 +673,7 @@ <h3>{% trans %}Cannot delete account{% endtrans %}</h3>
{% for project in active_projects %}
<li>
<strong>{{ project.name }}</strong> -
{% trans trimmed transfer_href=request.route_path('manage.project.roles', project_name=project.name) delete_href=request.route_path('manage.project.settings', project_name=project.name) %}
{% trans trimmed transfer_href=request.route_path('manage.project.roles', project_name=project.name), delete_href=request.route_path('manage.project.settings', project_name=project.name) %}
<a href="{{ transfer_href }}">transfer ownership</a>
or
<a href="{{ delete_href }}">delete project</a>
Expand Down
2 changes: 1 addition & 1 deletion warehouse/templates/manage/account/totp-provision.html
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
{% block main %}
<h1 class="page-title page-title--wsubtitle heading-wsubtitle__heading">{{ title }}</h1>
<p class="heading-wsubtitle__subtitle">
{% trans trimmed href='https://en.wikipedia.org/wiki/Time-based_One-time_Password_algorithm' title=gettext('External link') %}
{% trans trimmed href='https://en.wikipedia.org/wiki/Time-based_One-time_Password_algorithm', title=gettext('External link') %}
PyPI supports any application that follows the
<a href="{{ href }}" title="{{ title }}" target="_blank" rel="noopener"><abbr title="time-based one-time password">TOTP</abbr> standard</a>.
{% endtrans %}
Expand Down
8 changes: 4 additions & 4 deletions warehouse/templates/manage/account/webauthn-provision.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@
{% block main %}
<h1 class="page-title page-title--wsubtitle heading-wsubtitle__heading">{{ title }} <span class="badge badge--warning">{% trans %}Beta feature{% endtrans %}</span></h1>
<p class="heading-wsubtitle__subtitle">
{% trans href='https://fidoalliance.org/certification/fido-certified-products/' title=gettext('External link') %}PyPI supports any device that adheres to the <a href="{{ href }}" title="{{ title }}" target="_blank" rel="noopener">FIDO standard</a>.{% endtrans %}
{% trans href='https://fidoalliance.org/certification/fido-certified-products/', title=gettext('External link') %}PyPI supports any device that adheres to the <a href="{{ href }}" title="{{ title }}" target="_blank" rel="noopener">FIDO standard</a>.{% endtrans %}
<br>
{% trans trimmed title=gettext('External link') yubico_href='https://www.yubico.com/' titan_href='https://cloud.google.com/titan-security-key/' thetis_href='https://thetis.io/' %}
{% trans trimmed title=gettext('External link'), yubico_href='https://www.yubico.com/', titan_href='https://cloud.google.com/titan-security-key/', thetis_href='https://thetis.io/' %}
Popular <em>USB keys</em> include
<a href="{{ yubico_href }}" title="{{ title }}" target="_blank" rel="noopener">Yubikey</a>,
<a href="{{ titan_href }}" title="{{ title }}" target="_blank" rel="noopener">Google Titan</a>
Expand All @@ -50,7 +50,7 @@ <h1 class="page-title page-title--wsubtitle heading-wsubtitle__heading">{{ title
</p>
<ul id="webauthn-errors" class="form-errors margin-top--large">
<li id="webauthn-browser-support" class="hidden">
{% trans trimmed href='https://developer.mozilla.org/en-US/docs/Web/API/PublicKeyCredential#Browser_compatibility' title=gettext('External link') %}
{% trans trimmed href='https://developer.mozilla.org/en-US/docs/Web/API/PublicKeyCredential#Browser_compatibility', title=gettext('External link') %}
<a href="{{ href }}" title="{{ title }}" target="_blank" rel="noopener">Upgrade your browser</a> to set up two factor authentication with a security device (e.g. USB key)
{% endtrans %}
</li>
Expand All @@ -70,7 +70,7 @@ <h1 class="page-title page-title--wsubtitle heading-wsubtitle__heading">{{ title

<div class="callout-block">
<p>
{% trans trimmed title=gettext('External link') fido_href='https://fidoalliance.org/specifications/download/' mozilla_href='https://developer.mozilla.org/en-US/docs/Web/API/PublicKeyCredential#Browser_compatibility' %}
{% trans trimmed title=gettext('External link'), fido_href='https://fidoalliance.org/specifications/download/', mozilla_href='https://developer.mozilla.org/en-US/docs/Web/API/PublicKeyCredential#Browser_compatibility' %}
<strong>Not working?</strong> Check you're using a device that follows the
<a href="{{ fido_href }}" title="{{ title }}" target="_blank" rel="noopener">FIDO specification</a>
and a
Expand Down
Loading

0 comments on commit 67f27a2

Please sign in to comment.