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

Jump to bottom

Fixes for recent strings #2120

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fixes for recent strings #2120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9d86c9e
String fixes
Jan 27, 2022
7c02abb
Spelling: to allow
comradekingu Jan 28, 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
4 changes: 2 additions & 2 deletions liberapay/constants.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,8 +344,8 @@ def __missing__(self, currency):
)

PRIVACY_FIELDS = OrderedDict([
('hide_giving', (_("Do not publish the amounts of money I send."), False)),
('hide_receiving', (_("Do not publish the amounts of money I receive."), False)),
('hide_giving', (_("Do not publish the amount of money I send."), False)),
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://english.stackexchange.com/questions/254339/when-to-use-amount-vs-amounts

Copy link
Contributor Author

@comradekingu comradekingu Jan 28, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes. This is also wrong in "Source code of the recurrent donations platform Liberapay".
(Edit: where it should be
"Source code of the recurrent donation platform Liberapay." or
"Source code of the ___ platform for recurrent donations, Liberapay" (there are more than one, so it needs that qualifier)

"Disclose" could be better suited, but I appreciate the effort to simplify.

('hide_receiving', (_("Do not publish the amount of money I receive."), False)),
('hide_from_search', (_("Hide this profile from search results on Liberapay."), True)),
('profile_noindex', (_("Tell web search engines not to index this profile."), True)),
('hide_from_lists', (_("Prevent this profile from being listed on Liberapay."), True)),
Expand Down
8 changes: 4 additions & 4 deletions templates/macros/your-tip.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,17 +236,17 @@ <h5 class="list-group-item-heading">{{ _("Manual renewal") }}</h5>
% endif
% if patron_visibilities == 1
<p class="text-info">{{ glyphicon('info-sign') }} {{ _(
"{username} has chosen not to see who their patrons are, so your donation will be secret.",
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a known singular, where "their" would denote plural.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Liberapay uses singular they.

Copy link
Contributor Author

@comradekingu comradekingu Jan 28, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"Singular they" is not the issue, as unknown singular they/their is English (the latter an adoption from old Norse.)
That article purposefully masks that.

"{username} has chosen not to see own patrons, so your donation will be secret.",
username=tippee_name
) }}</p>
% elif patron_visibilities == 2
<p class="text-info">{{ glyphicon('info-sign') }} {{ _(
"This donation won't be secret, you will appear in {username}'s private list of patrons.",
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sentence splicing.

"This donation won't be secret. You will appear in {username}'s private list of patrons.",
username=tippee_name
) }}</p>
% elif patron_visibilities == 4
<p class="text-warning">{{ glyphicon('info-sign') }} {{ _(
"{username} discloses who their patrons are, your donation will be public.",
"{username} discloses own patrons, so your donation will be public.",
username=tippee_name
) }}</p>
% elif patron_visibilities
Expand Down Expand Up @@ -300,7 +300,7 @@ <h5 class="list-group-item-heading">{{ _("Public donation") }}</h5>
</ul>
% else
<p class="text-muted">{{ glyphicon('info-sign') }} {{ _(
"{username} hasn't yet specified whether they want to see who their patrons are, "
Copy link
Contributor Author

@comradekingu comradekingu Jan 28, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Singular known they/their is a poor choice of words.
Much longer.

"{username} hasn't yet chosen to see own patrons, "
"so your donation will be secret.",
username=tippee_name
) }}</p>
Expand Down
8 changes: 4 additions & 4 deletions www/%username/giving/index.html.spt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ next_payday = compute_next_payday_date()
% if show_automatic_renewal_hint
<div class="text-info">
{{ glyphicon('info-sign') }} {{ _(
"Liberapay now supports automatic renewals, do you want to switch it "
"Liberapay now supports automatic renewals. Do you want to switch it "
"on for all your donations?"
) }}
&nbsp;
Expand All @@ -204,7 +204,7 @@ next_payday = compute_next_payday_date()
% if show_visibility_hint
<div class="text-info">
{{ glyphicon('info-sign') }} {{ _(
"Liberapay now supports non-anonymous donations, do you want to "
"Liberapay now supports non-anonymous donations. Do you want to "
"modify the visibility of all your donations at once?"
) }}
&nbsp;
Expand All @@ -227,8 +227,8 @@ next_payday = compute_next_payday_date()
% elif show_incomplete_profile_warning
<div class="text-info">
{{ glyphicon('info-sign') }} {{ _(
"Since you've chosen to make a public donation, we recommend that you "
Copy link
Contributor Author

@comradekingu comradekingu Jan 28, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Run-on sentence.
The "we" is unreferenced.
The causality is unexplained.
"that" is superfluous.
Much longer.

I can't work out what "recommendation" adds to help me in any way.
For the people that haven't done so already, the link between donating publicly and having something to actually go along with it is not likely obvious. Fair?

"complete your public profile."
"Complete your public profile to have something to show "
"along with your public donation."
) }}
&nbsp;
<span class="buttons"><a class="btn btn-primary" href="{{ participant.path('edit/username') }}">{{
Expand Down
8 changes: 4 additions & 4 deletions www/%username/giving/pay/stripe/%payin_id.spt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ title = _("Funding your donations")
<a class="btn btn-default" href="{{ payer.path('receipts/direct/%s' % payin.id) }}">{{
_("View receipt")
}}</a>
% elif status == 'failed' and payin.error.startswith("For 'sepa_debit' payments, we currently require ")
% elif status == 'failed' and payin.error.startswith("For 'sepa_debit' payments, Liberapay currently requires ")
{# https://github.com/liberapay/liberapay.com/issues/1525 #}
<div class="alert alert-danger">{{ _(
"The payment processor ({name}) isn't able to process {currency} direct debits "
Expand Down Expand Up @@ -311,7 +311,7 @@ title = _("Funding your donations")
) }}</p>
% if not route.has_been_charged_successfully()
<p class="alert alert-warning">{{ _(
"Your bank can reject this payment. We recommend sending a copy of "
Copy link
Contributor Author

@comradekingu comradekingu Jan 28, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"We" is invoked without merit. It adds complexity.
Much longer.

"Your bank can reject this payment. Send a copy of "
"{link_start}the mandate{link_end} to your bank if you're not sure "
"that it properly handles {currency} direct debit instructions.",
link_start='<a href="%s">'|safe % route.get_mandate_url(),
Expand All @@ -324,8 +324,8 @@ title = _("Funding your donations")
% if tell_payer_to_fill_profile
<hr>
<p>{{ _(
"Since you've chosen to make a public donation, we recommend that you "
"complete your public profile."
"Complete your public profile to have something to show "
"along with your public donation."
) }}</p>
<a class="btn btn-primary" href="{{ payer.path('edit/username') }}">{{
_("Edit your profile")
Expand Down
12 changes: 6 additions & 6 deletions www/%username/patrons/index.spt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,27 +46,27 @@ subhead = _("Patrons")
<input type="hidden" name="csrf_token" value="{{ csrf_token }}" />
% if patron_visibilities == 0
<p class="text-info">{{ glyphicon('info-sign') }} {{ _(
"Liberapay now supports non-anonymous donations, do you want to know "
"Liberapay now supports non-anonymous donations. Do you want to know "
"who your patrons are?"
) }}</p>
<p class="buttons">
<button class="btn btn-primary" name="see_patrons" value="yes">{{ _(
"Enable non-anonymous donations"
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Presumably this can't be disabled and on, so "enable" adds complexity.

"Allow non-anonymous donations"
) }}</button>
&nbsp;&nbsp;
<button class="btn btn-default" name="see_patrons" value="no">{{ _("No") }}</button>
</p>
% elif patron_visibilities > 1
<p class="text-muted">{{ _(
"You have opted-in to see who your patrons are. If you change your mind, "
"then {link_start}click here to disable non-anonymous donations{link_end}.",
"then {link_start}click here to turn off non-anonymous donations{link_end}.",
link_start='<button class="link" name="see_patrons" value="no">'|safe,
link_end='</button>'|safe
) }}</p>
% else
<p class="text-muted">{{ _(
"You've chosen not to see who your patrons are. If you change your mind, "
"then {link_start}click here to enable non-anonymous donations{link_end}.",
Copy link
Contributor Author

@comradekingu comradekingu Jan 28, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It isn't clear what "enable" would do here.
Donations aren't in a passive state, so it may appear scary to not know (considering more options become available).

"then {link_start}click here to allow non-anonymous donations{link_end}.",
link_start='<button class="link" name="see_patrons" value="yes">'|safe,
link_end='</button>'|safe
) }}</p>
Expand All @@ -76,10 +76,10 @@ subhead = _("Patrons")
% if patron_visibilities > 1
<h3>{{ _("Data export") }}</h3>
<p><a href="{{ participant.path('patrons/export.csv?scope=active') }}">{{ fontawesome('download') }} {{
_("Download the list of currently active patrons")
Copy link
Contributor Author

@comradekingu comradekingu Jan 28, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"currently" is redundant. Am I missing something here?
Is it possible to be active in a capacity that isn't current?

Edit: "Donators" and "patrons" are both used elsewhere, but that is less of an issue.
Edit2: If there is no way to be active and non-current, this is a pleonasm. That is not a style.
Verbosity is a different matter entirely.

_("Download the list of active patrons")
}}</a></p>
<p><a href="{{ participant.path('patrons/export.csv?scope=all') }}">{{ fontawesome('download') }} {{
_("Download the record of all patrons in the last ten years")
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"In" is superfluous. It also makes it more of a garden-path sentence.

_("Download the record of all patrons the last ten years")
}}</a></p>

% if participant.is_person
Expand Down