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

Avoid lego translations for coordinates

Browse source 
Use the i18n system for joining coordinate values together, while
avoiding making any changes or standardisation involving the exact
symbol used in each situation.

Refs #2732
This commit is contained in:
Andy Allan 2020-08-19 16:43:16 +02:00
parent afd051116d
commit 613b748c55
5 changed files with 21 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/views/browse/_common_details.html.erb
View file

@ -24,7 +24,10 @@
<% if @type == "node" and common_details.visible? %>
<div class="details geo">
<%= t "browse.location" %>
<%= link_to(tag.span(number_with_delimiter(common_details.lat), :class => "latitude") + ", " + tag.span(number_with_delimiter(common_details.lon), :class => "longitude"), root_path(:anchor => "map=18/#{common_details.lat}/#{common_details.lon}")) %>
<%= link_to(t(".coordinates_html",
:latitude => tag.span(number_with_delimiter(common_details.lat), :class => "latitude"),
:longitude => tag.span(number_with_delimiter(common_details.lon), :class => "longitude")),
root_path(:anchor => "map=18/#{common_details.lat}/#{common_details.lon}")) %>
</div>
<% end %>

5
app/views/browse/note.html.erb
View file

@ -19,7 +19,10 @@
<% end %>
<li>
<%= t "browse.location" %>
<%= link_to(tag.span(number_with_delimiter(@note.lat), :class => "latitude") + ", " + tag.span(number_with_delimiter(@note.lon), :class => "longitude"), root_path(:anchor => "map=18/#{@note.lat}/#{@note.lon}")) %>
<%= link_to(t(".coordinates_html",
:latitude => tag.span(number_with_delimiter(@note.lat), :class => "latitude"),
:longitude => tag.span(number_with_delimiter(@note.lon), :class => "longitude")),
root_path(:anchor => "map=18/#{@note.lat}/#{@note.lon}")) %>
</li>
</ul>
</div>

2
app/views/diary_entries/_location.html.erb
View file

@ -1,7 +1,7 @@
<%= t ".location" %>
<a href="<%= url_for :controller => "site", :action => "index", :anchor => "map=14/#{location.latitude}/#{location.longitude}" %>">
<abbr class="geo" title="<%= number_with_precision(location.latitude, :precision => 4) %>; <%= number_with_precision(location.longitude, :precision => 4) %>">
<abbr class="geo" title="<%= t ".coordinates", :latitude => number_with_precision(location.latitude, :precision => 4), :longitude => number_with_precision(location.longitude, :precision => 4) %>">
<%= describe_location location.latitude, location.longitude, 14, location.language_code %>
</abbr>
</a>

8
app/views/traces/show.html.erb
View file

@ -25,7 +25,13 @@
<td><%= number_with_delimiter(@trace.size) %></td></tr>
<tr>
<td><%= t ".start_coordinates" %></td>
<td><div class="d-inline"><span class="latitude"><%= @trace.latitude %></span>; <span class="longitude"><%= @trace.longitude %></span></div> (<%= link_to t(".map"), :controller => "site", :action => "index", :mlat => @trace.latitude, :mlon => @trace.longitude, :anchor => "map=14/#{@trace.latitude}/#{@trace.longitude}" %> / <%= link_to t(".edit"), :controller => "site", :action => "edit", :gpx => @trace.id, :anchor => "map=14/#{@trace.latitude}/#{@trace.longitude}" %>)</td>
<td>
<div class="d-inline">
<%= t ".coordinates_html",
:latitude => tag.span(number_with_delimiter(@trace.latitude), :class => "latitude"),
:longitude => tag.span(number_with_delimiter(@trace.longitude), :class => "longitude") %>
</div>
(<%= link_to t(".map"), :controller => "site", :action => "index", :mlat => @trace.latitude, :mlon => @trace.longitude, :anchor => "map=14/#{@trace.latitude}/#{@trace.longitude}" %> / <%= link_to t(".edit"), :controller => "site", :action => "edit", :gpx => @trace.id, :anchor => "map=14/#{@trace.latitude}/#{@trace.longitude}" %>)</td>
</tr>
<% end %>
<tr>

5
config/locales/en.yml
View file

@ -220,6 +220,8 @@ en:
view_history: "View History"
view_details: "View Details"
location: "Location:"
common_details:
coordinates_html: "%{latitude}, %{longitude}"
changeset:
title: "Changeset: %{id}"
belongs_to: "Author"
@ -318,6 +320,7 @@ en:
reopened_by_anonymous: "Reactivated by anonymous <abbr title='%{exact_time}'>%{when}</abbr>"
hidden_by: "Hidden by %{user} <abbr title='%{exact_time}'>%{when}</abbr>"
report: Report this note
coordinates_html: "%{latitude}, %{longitude}"
query:
title: "Query Features"
introduction: "Click on the map to find nearby features."
@ -423,6 +426,7 @@ en:
location: "Location:"
view: "View"
edit: "Edit"
coordinates: "%{latitude}; %{longitude}"
feed:
user:
title: "OpenStreetMap diary entries for %{user}"
@ -2043,6 +2047,7 @@ en:
uploaded: "Uploaded:"
points: "Points:"
start_coordinates: "Start coordinate:"
coordinates_html: "%{latitude}; %{longitude}"
map: "map"
edit: "edit"
owner: "Owner:"