cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/pull/5513'

Browse source
This commit is contained in:
Tom Hughes 2025-01-18 11:45:38 +00:00
commit 8312ddfe0c
2 changed files with 0 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

13
app/views/accounts/edit.html.erb
View file

@ -29,19 +29,6 @@
<small class="form-text text-body-secondary">(<a href="<%= t ".openid.link" %>" target="_new"><%= t ".openid.link text" %></a>)</small> <small class="form-text text-body-secondary">(<a href="<%= t ".openid.link" %>" target="_new"><%= t ".openid.link text" %></a>)</small>
</fieldset> </fieldset>
<div class="mb-3">
<label class="form-label"><%= t ".public editing.heading" %></label>
<span class="form-text text-body-secondary">
<% if current_user.data_public? %>
<%= t ".public editing.enabled" %>
(<a href="<%= t ".public editing.enabled link" %>" target="_new"><%= t ".public editing.enabled link text" %></a>)
<% else %>
<%= t ".public editing.disabled" %>
(<a href="#public"><%= t ".public editing.disabled link text" %></a>)
<% end %>
</span>
</div>
<div class="mb-3"> <div class="mb-3">
<label class="form-label"><%= t ".contributor terms.heading" %></label> <label class="form-label"><%= t ".contributor terms.heading" %></label>
<span class="form-text text-body-secondary"> <span class="form-text text-body-secondary">

7
config/locales/en.yml
View file

@ -251,13 +251,6 @@ en:
openid: openid:
link: "https://wiki.openstreetmap.org/wiki/OpenID" link: "https://wiki.openstreetmap.org/wiki/OpenID"
link text: "what is this?" link text: "what is this?"
public editing:
heading: "Public editing"
enabled: "Enabled. Not anonymous and can edit data."
enabled link: "https://wiki.openstreetmap.org/wiki/Anonymous_edits"
enabled link text: "what is this?"
disabled: "Disabled and cannot edit data, all previous edits are anonymous."
disabled link text: "why can't I edit?"
contributor terms: contributor terms:
heading: "Contributor Terms" heading: "Contributor Terms"
agreed: "You have agreed to the new Contributor Terms." agreed: "You have agreed to the new Contributor Terms."