-
-
Notifications
You must be signed in to change notification settings - Fork 215
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.
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
Fixes for recent strings #2120
base: master
Are you sure you want to change the base?
Fixes for recent strings #2120
Conversation
In my opinion none of the proposed changes is necessary, and most of them would actually make things worse. |
@@ -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)), |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
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.
Using stops instead of commas in some places may be better, I would also write that way. But I am not sure that using commas there is wrong. I wouldn't change anything unless I'm sure it's wrong as it is. |
@@ -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.", |
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Liberapay uses singular they.
There was a problem hiding this comment.
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=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.", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sentence splicing.
@@ -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, " |
There was a problem hiding this comment.
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.
@@ -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 " |
There was a problem hiding this comment.
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?
@@ -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 " |
There was a problem hiding this comment.
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.
@@ -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") |
There was a problem hiding this comment.
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.
}}</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") |
There was a problem hiding this comment.
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.
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}.", |
There was a problem hiding this comment.
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).
"who your patrons are?" | ||
) }}</p> | ||
<p class="buttons"> | ||
<button class="btn btn-primary" name="see_patrons" value="yes">{{ _( | ||
"Enable non-anonymous donations" |
There was a problem hiding this comment.
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.
@Changaco @jorgesumle |
@comradekingu, thanks for the explanation. I think that the only error is the comma splice (after reading Comma Splice Examples and How to Fix Them, I think that we need to fix that). The other corrections you proposed are mainly because you prefer simpler and less formal English, but I think that our more formal and verbose style is fine. |
@jorgesumle I proposed them because they are better, in ways I explained. A lot of them are undeniable errors, and I think all errors should be fixed. We should look to get all errors fixed, at the very least. |
@Changaco It is just a matter of avoiding issues. As an example "As Martin was a member of the board, they decided against the decision to allow the deconstruction." would be incomprehensible without interpreting as the language dictates. It is like changing the master branch naming to "main", only now the main lingua franca gets a lot harder to learn for people. |
No description provided.