From bbf5561e868ec84da03a4a5c2f24dad979cc8386 Mon Sep 17 00:00:00 2001 From: Dan Stowell Date: Wed, 18 Sep 2013 22:31:05 +0100 Subject: [PATCH 01/28] browse page: improve css for h4 headings - give more room for content - make less clunky overlaps when not enough room --- app/assets/stylesheets/common.css.scss | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss index aac527628e..9925c38b5a 100644 --- a/app/assets/stylesheets/common.css.scss +++ b/app/assets/stylesheets/common.css.scss @@ -1301,6 +1301,7 @@ ul.results-list li { border-bottom: 1px solid #ccc; } border-top: 1px solid #ccc; margin-top: $lineheight/2; padding-top: $lineheight/2; + clear: left; &:first-child { margin-top: 0; } @@ -1324,9 +1325,10 @@ ul.results-list li { border-bottom: 1px solid #ccc; } } h4 { float: left; - width: 33.3333%; + width: 15%; display: inline-block; vertical-align: top; + clear: left; } } From 7371ae984429ce8ad7bf307448727b8d6f1a20a6 Mon Sep 17 00:00:00 2001 From: Dan Stowell Date: Thu, 19 Sep 2013 20:03:12 +0100 Subject: [PATCH 02/28] browse page: collect "download xml" & "edit" links w other right-hand action links --- app/views/browse/_map.html.erb | 35 ++++++++++++++++++++++ app/views/browse/node.html.erb | 6 +--- app/views/browse/node_history.html.erb | 1 - app/views/browse/relation.html.erb | 3 +- app/views/browse/relation_history.html.erb | 3 +- app/views/browse/way.html.erb | 4 +-- app/views/browse/way_history.html.erb | 3 +- 7 files changed, 40 insertions(+), 15 deletions(-) diff --git a/app/views/browse/_map.html.erb b/app/views/browse/_map.html.erb index ed703665d1..7d6137402c 100644 --- a/app/views/browse/_map.html.erb +++ b/app/views/browse/_map.html.erb @@ -72,6 +72,41 @@ <% end %> + <% + if map.instance_of? Changeset + %> + + <% + elsif map.instance_of? OldNode + %> + + <% + elsif map.instance_of? OldWay + %> + + <% + elsif map.instance_of? OldRelation + %> + + <% + elsif !(map.instance_of? Note) + %> + + <% + end + %> + <% else %> <%= t 'browse.map.deleted' %> <% end %> diff --git a/app/views/browse/node.html.erb b/app/views/browse/node.html.erb index f41562a7fe..80cd7c179b 100644 --- a/app/views/browse/node.html.erb +++ b/app/views/browse/node.html.erb @@ -9,11 +9,7 @@ <% content_for :heading do %>

<%= t'browse.node.node_title', :node_name => @name %>

<% end %> <%= render :partial => "navigation" %> @@ -24,4 +20,4 @@
<%= render :partial => "node_details", :object => @node %> -
\ No newline at end of file + diff --git a/app/views/browse/node_history.html.erb b/app/views/browse/node_history.html.erb index e37f0e037f..3904a6d436 100644 --- a/app/views/browse/node_history.html.erb +++ b/app/views/browse/node_history.html.erb @@ -9,7 +9,6 @@ <% content_for :heading do %>

<%= raw t'browse.node_history.node_history_title', :node_name => link_to(h(@name), :action => "node", :id => @node.id) %>

<% end %> diff --git a/app/views/browse/relation.html.erb b/app/views/browse/relation.html.erb index 3ba3550548..97e357b2a3 100644 --- a/app/views/browse/relation.html.erb +++ b/app/views/browse/relation.html.erb @@ -9,7 +9,6 @@ <% content_for :heading do %>

<%= t'browse.relation.relation_title', :relation_name => @name %>

<% end %> @@ -18,4 +17,4 @@
<%= render :partial => "relation_details", :object => @relation %> -
\ No newline at end of file + diff --git a/app/views/browse/relation_history.html.erb b/app/views/browse/relation_history.html.erb index e0640d9007..58e0ebde63 100644 --- a/app/views/browse/relation_history.html.erb +++ b/app/views/browse/relation_history.html.erb @@ -9,7 +9,6 @@ <% content_for :heading do %>

<%= raw t'browse.relation_history.relation_history_title', :relation_name => link_to(h(@name), :action => "relation", :id => @relation.id) %>

<% end %> @@ -19,4 +18,4 @@ <% @relation.old_relations.reverse.each do |relation| %> <%= render :partial => "relation_details", :object => relation %> <% end %> - \ No newline at end of file + diff --git a/app/views/browse/way.html.erb b/app/views/browse/way.html.erb index 15a0dcad82..ad9275812c 100644 --- a/app/views/browse/way.html.erb +++ b/app/views/browse/way.html.erb @@ -9,9 +9,7 @@ <% content_for :heading do %>

<%= t'browse.way.way_title', :way_name => @name %>

<% end %> @@ -20,4 +18,4 @@
<%= render :partial => "way_details", :object => @way %> -
\ No newline at end of file + diff --git a/app/views/browse/way_history.html.erb b/app/views/browse/way_history.html.erb index 49058edc10..f58fdfe531 100644 --- a/app/views/browse/way_history.html.erb +++ b/app/views/browse/way_history.html.erb @@ -9,7 +9,6 @@ <% content_for :heading do %>

<%= raw t'browse.way_history.way_history_title', :way_name => link_to(h(@name), :action => "way", :id => @way.id) %>

<% end %> @@ -19,4 +18,4 @@ <% @way.old_ways.reverse.each do |way| %> <%= render :partial => "way_details", :object => way %> <% end %> - \ No newline at end of file + From 7dc49f31f2434b0769782e06efe562847403141d Mon Sep 17 00:00:00 2001 From: Dan Stowell Date: Thu, 19 Sep 2013 20:37:36 +0100 Subject: [PATCH 03/28] browse page: collapse "last edited" info rows into a sentence under the heading --- app/views/browse/_common_details.html.erb | 38 ++----------------- app/views/browse/_common_editsummary.html.erb | 23 +++++++++++ app/views/browse/changeset.html.erb | 6 +-- app/views/browse/node.html.erb | 8 ++-- app/views/browse/relation.html.erb | 8 ++-- app/views/browse/way.html.erb | 7 ++-- config/locales/en.yml | 12 +++--- 7 files changed, 48 insertions(+), 54 deletions(-) create mode 100644 app/views/browse/_common_editsummary.html.erb diff --git a/app/views/browse/_common_details.html.erb b/app/views/browse/_common_details.html.erb index 7c8165c67f..43916f54b6 100644 --- a/app/views/browse/_common_details.html.erb +++ b/app/views/browse/_common_details.html.erb @@ -1,39 +1,9 @@ -
-
- <% if common_details.visible? %> -

<%= t 'browse.common_details.edited_at' %>

- <% else %> -

<%= t 'browse.common_details.deleted_at' %>

- <% end %> -

<%= l common_details.timestamp %>

-
- - <% if common_details.changeset.user.data_public? %> -
- <% if common_details.visible? %> -

<%= t 'browse.common_details.edited_by' %>

- <% else %> -

<%= t 'browse.common_details.deleted_by' %>

- <% end %> -

<%= link_to h(common_details.changeset.user.display_name), :controller => "user", :action => "view", :display_name => common_details.changeset.user.display_name %>

-
- <% end %> - -
-

<%= t 'browse.common_details.version' %>

-

<%= h(common_details.version) %>

-
- -
-

<%= t 'browse.common_details.in_changeset' %>

-

<%= link_to common_details.changeset_id, :action => :changeset, :id => common_details.changeset_id %>

-
- - <% if common_details.changeset.tags['comment'].present? %> +<% if common_details.changeset.tags['comment'].present? %> +

<%= t 'browse.common_details.changeset_comment' %>

<%= linkify(h(common_details.changeset.tags['comment'])) %>

- <% end %> -
+
+<% end %> <%= render :partial => "tag_details", :object => common_details %> diff --git a/app/views/browse/_common_editsummary.html.erb b/app/views/browse/_common_editsummary.html.erb new file mode 100644 index 0000000000..c38330411a --- /dev/null +++ b/app/views/browse/_common_editsummary.html.erb @@ -0,0 +1,23 @@ + <% if common_editsummary.visible? %> + <%= t 'browse.common_details.edited_at' %> + <% else %> + <%= t 'browse.common_details.deleted_at' %> + <% end %> + <%= l common_editsummary.timestamp %> + + <% if common_editsummary.changeset.user.data_public? %> + <% if common_editsummary.visible? %> + <%= t 'browse.common_details.edited_by' %> + <% else %> + <%= t 'browse.common_details.deleted_by' %> + <% end %> + <%= link_to h(common_editsummary.changeset.user.display_name), :controller => "user", :action => "view", :display_name => common_editsummary.changeset.user.display_name %> + <% end %> + + · + + <%= t 'browse.common_details.version' %> + <%= h(common_editsummary.version) %> + <%= t 'browse.common_details.in_changeset' %> + <%= link_to common_editsummary.changeset_id, :action => :changeset, :id => common_editsummary.changeset_id %> + diff --git a/app/views/browse/changeset.html.erb b/app/views/browse/changeset.html.erb index 96a5280a53..d186abfbe3 100644 --- a/app/views/browse/changeset.html.erb +++ b/app/views/browse/changeset.html.erb @@ -4,10 +4,6 @@ <% content_for :heading do %>

<%= t 'browse.changeset.changeset', :id => @changeset.id %>

-
    -
  • <%= link_to(t('browse.changeset.changesetxml'), :controller => "changeset", :action => "read") %>
    • -
  • <%= link_to(t('browse.changeset.osmchangexml'), :controller => "changeset", :action => "download") %>
    • -
<% end %> <%= render :partial => "navigation" %> @@ -15,4 +11,4 @@ <% if @changeset.has_valid_bbox? %> <%= render :partial => "map", :object => @changeset %> <% end %> -<%= render :partial => "changeset_details", :object => @changeset %> \ No newline at end of file +<%= render :partial => "changeset_details", :object => @changeset %> diff --git a/app/views/browse/node.html.erb b/app/views/browse/node.html.erb index 80cd7c179b..3ff48fa242 100644 --- a/app/views/browse/node.html.erb +++ b/app/views/browse/node.html.erb @@ -8,9 +8,11 @@ <% content_for :heading do %>

<%= t'browse.node.node_title', :node_name => @name %>

-
    -
  • <%= link_to(t('browse.node.view_history'), :action => "node_history") %>
    • -
+ + <%= render :partial => "common_editsummary", :object => @node %> + + (<%= link_to(t('browse.node.view_history'), :action => "node_history") %>) + <% end %> <%= render :partial => "navigation" %> diff --git a/app/views/browse/relation.html.erb b/app/views/browse/relation.html.erb index 97e357b2a3..839054040c 100644 --- a/app/views/browse/relation.html.erb +++ b/app/views/browse/relation.html.erb @@ -8,9 +8,11 @@ <% content_for :heading do %>

<%= t'browse.relation.relation_title', :relation_name => @name %>

-
    -
  • <%= link_to(t('browse.relation.view_history'), :action => "relation_history") %>
    • -
+ + <%= render :partial => "common_editsummary", :object => @relation %> + + (<%= link_to(t('browse.relation.view_history'), :action => "relation_history") %>) + <% end %> <%= render :partial => "navigation" %> <%= render :partial => "map", :object => @relation %> diff --git a/app/views/browse/way.html.erb b/app/views/browse/way.html.erb index ad9275812c..f41e2fc210 100644 --- a/app/views/browse/way.html.erb +++ b/app/views/browse/way.html.erb @@ -8,9 +8,10 @@ <% content_for :heading do %>

<%= t'browse.way.way_title', :way_name => @name %>

-
    -
  • <%= link_to(t('browse.way.view_history'), :action => "way_history") %>
    • -
+ + <%= render :partial => "common_editsummary", :object => @way %> + + (<%= link_to(t('browse.way.view_history'), :action => "way_history") %>) <% end %> <%= render :partial => "navigation" %> diff --git a/config/locales/en.yml b/config/locales/en.yml index a1e26baebe..6e2bd52d86 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -144,12 +144,12 @@ en: one: "Has the following %{count} relation:" other: "Has the following %{count} relations:" common_details: - edited_at: "Edited at:" - edited_by: "Edited by:" - deleted_at: "Deleted at:" - deleted_by: "Deleted by:" - version: "Version:" - in_changeset: "In changeset:" + edited_at: "Edited" + edited_by: "by" + deleted_at: "Deleted at" + deleted_by: "by" + version: "Version" + in_changeset: "in changeset" changeset_comment: "Comment:" containing_relation: entry: "Relation %{relation_name}" From 47f7afe5ebc519f8ab9405d90ffcf07443c9a471 Mon Sep 17 00:00:00 2001 From: Dan Stowell Date: Thu, 19 Sep 2013 20:57:51 +0100 Subject: [PATCH 04/28] browse page: float browse-nav to right-hand side --- app/assets/stylesheets/common.css.scss | 5 +++-- app/views/browse/changeset.html.erb | 3 +-- app/views/browse/node.html.erb | 3 +-- app/views/browse/relation.html.erb | 2 +- app/views/browse/way.html.erb | 2 +- 5 files changed, 7 insertions(+), 8 deletions(-) diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss index 9925c38b5a..300d15054a 100644 --- a/app/assets/stylesheets/common.css.scss +++ b/app/assets/stylesheets/common.css.scss @@ -1942,8 +1942,9 @@ ul.secondary-actions { margin-bottom: 0; margin-left: 0; &.pager { - display: inline-block; - margin-right: 60px; + display: inline; + margin-right: 30px; + float: right; } > li { display: block; diff --git a/app/views/browse/changeset.html.erb b/app/views/browse/changeset.html.erb index d186abfbe3..5d3e3058cf 100644 --- a/app/views/browse/changeset.html.erb +++ b/app/views/browse/changeset.html.erb @@ -4,10 +4,9 @@ <% content_for :heading do %>

<%= t 'browse.changeset.changeset', :id => @changeset.id %>

+ <%= render :partial => "navigation" %> <% end %> -<%= render :partial => "navigation" %> - <% if @changeset.has_valid_bbox? %> <%= render :partial => "map", :object => @changeset %> <% end %> diff --git a/app/views/browse/node.html.erb b/app/views/browse/node.html.erb index 3ff48fa242..2652a97fca 100644 --- a/app/views/browse/node.html.erb +++ b/app/views/browse/node.html.erb @@ -8,14 +8,13 @@ <% content_for :heading do %>

<%= t'browse.node.node_title', :node_name => @name %>

+ <%= render :partial => "navigation" %> <%= render :partial => "common_editsummary", :object => @node %> (<%= link_to(t('browse.node.view_history'), :action => "node_history") %>) <% end %> -<%= render :partial => "navigation" %> - <% if @node.visible -%> <%= render :partial => "map", :object => @node %> <% end -%> diff --git a/app/views/browse/relation.html.erb b/app/views/browse/relation.html.erb index 839054040c..10f4d4f0b2 100644 --- a/app/views/browse/relation.html.erb +++ b/app/views/browse/relation.html.erb @@ -8,13 +8,13 @@ <% content_for :heading do %>

<%= t'browse.relation.relation_title', :relation_name => @name %>

+ <%= render :partial => "navigation" %> <%= render :partial => "common_editsummary", :object => @relation %> (<%= link_to(t('browse.relation.view_history'), :action => "relation_history") %>) <% end %> -<%= render :partial => "navigation" %> <%= render :partial => "map", :object => @relation %>
diff --git a/app/views/browse/way.html.erb b/app/views/browse/way.html.erb index f41e2fc210..fe6110125b 100644 --- a/app/views/browse/way.html.erb +++ b/app/views/browse/way.html.erb @@ -8,13 +8,13 @@ <% content_for :heading do %>

<%= t'browse.way.way_title', :way_name => @name %>

+ <%= render :partial => "navigation" %> <%= render :partial => "common_editsummary", :object => @way %> (<%= link_to(t('browse.way.view_history'), :action => "way_history") %>) <% end %> -<%= render :partial => "navigation" %> <%= render :partial => "map", :object => @way %>
From c2d2b0993dfd732a765eefbc8bd97390258c413c Mon Sep 17 00:00:00 2001 From: Dan Stowell Date: Thu, 19 Sep 2013 21:00:19 +0100 Subject: [PATCH 05/28] browse page: less wordy headers for changeset content panes --- config/locales/en.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/config/locales/en.yml b/config/locales/en.yml index 6e2bd52d86..2e0545933b 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -135,14 +135,14 @@ en: show_area_box: "Show Area Box" box: "box" has_nodes: - one: "Has the following %{count} node:" - other: "Has the following %{count} nodes:" + one: "Has %{count} node:" + other: "Has %{count} nodes:" has_ways: - one: "Has the following %{count} way:" - other: "Has the following %{count} ways:" + one: "Has %{count} way:" + other: "Has %{count} ways:" has_relations: - one: "Has the following %{count} relation:" - other: "Has the following %{count} relations:" + one: "Has %{count} relation:" + other: "Has %{count} relations:" common_details: edited_at: "Edited" edited_by: "by" From bebdbaec54e937d74519decd0e1d15ad99641167 Mon Sep 17 00:00:00 2001 From: Dan Stowell Date: Thu, 19 Sep 2013 21:36:34 +0100 Subject: [PATCH 06/28] browse page: express last-edited time as user-friendly "time ago" --- app/views/browse/_common_editsummary.html.erb | 4 +++- config/locales/en.yml | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/views/browse/_common_editsummary.html.erb b/app/views/browse/_common_editsummary.html.erb index c38330411a..3703e0be0c 100644 --- a/app/views/browse/_common_editsummary.html.erb +++ b/app/views/browse/_common_editsummary.html.erb @@ -3,7 +3,9 @@ <% else %> <%= t 'browse.common_details.deleted_at' %> <% end %> - <%= l common_editsummary.timestamp %> + + <%= time_ago_in_words(common_editsummary.timestamp) %> <%= t 'browse.common_details.ago' %> + <% if common_editsummary.changeset.user.data_public? %> <% if common_editsummary.visible? %> diff --git a/config/locales/en.yml b/config/locales/en.yml index 2e0545933b..b7b87497b8 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -145,6 +145,7 @@ en: other: "Has %{count} relations:" common_details: edited_at: "Edited" + ago: "ago" edited_by: "by" deleted_at: "Deleted at" deleted_by: "by" From 93fe5a28e12b8aaeefd6a577e9a05e083e0d1382 Mon Sep 17 00:00:00 2001 From: Dan Stowell Date: Sat, 21 Sep 2013 11:26:01 +0100 Subject: [PATCH 07/28] browse page: undo my mistaken reordering of divs (fixes a clear:both issue on small screens) --- app/views/browse/_common_details.html.erb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/views/browse/_common_details.html.erb b/app/views/browse/_common_details.html.erb index 43916f54b6..169dd0de0c 100644 --- a/app/views/browse/_common_details.html.erb +++ b/app/views/browse/_common_details.html.erb @@ -1,9 +1,9 @@ -<% if common_details.changeset.tags['comment'].present? %> -
-
+
+
+ <%= render :partial => "tag_details", :object => common_details %> + <% if common_details.changeset.tags['comment'].present? %>

<%= t 'browse.common_details.changeset_comment' %>

<%= linkify(h(common_details.changeset.tags['comment'])) %>

-
+ <% end %>
-<% end %> -<%= render :partial => "tag_details", :object => common_details %> +
From c881ef4ee41a2d2862309fd7f53f17c311a8f8fa Mon Sep 17 00:00:00 2001 From: Dan Stowell Date: Sat, 21 Sep 2013 11:28:29 +0100 Subject: [PATCH 08/28] browse page: no top-border-bar for first child needed now --- app/assets/stylesheets/common.css.scss | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss index 300d15054a..95f182c5b8 100644 --- a/app/assets/stylesheets/common.css.scss +++ b/app/assets/stylesheets/common.css.scss @@ -1304,6 +1304,8 @@ ul.results-list li { border-bottom: 1px solid #ccc; } clear: left; &:first-child { margin-top: 0; + border-top: 0; + padding-top: 0; } .warning { background-color: #ffe0cc; From 63e1e7710a9a9a01cdbf566999e87c2f0ebb5888 Mon Sep 17 00:00:00 2001 From: Dan Stowell Date: Sat, 21 Sep 2013 14:41:58 +0100 Subject: [PATCH 09/28] browse page: better way of specifying "time ago" (for i18n) --- app/views/browse/_common_editsummary.html.erb | 2 +- config/locales/en.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/browse/_common_editsummary.html.erb b/app/views/browse/_common_editsummary.html.erb index 3703e0be0c..fda494cb83 100644 --- a/app/views/browse/_common_editsummary.html.erb +++ b/app/views/browse/_common_editsummary.html.erb @@ -4,7 +4,7 @@ <%= t 'browse.common_details.deleted_at' %> <% end %> - <%= time_ago_in_words(common_editsummary.timestamp) %> <%= t 'browse.common_details.ago' %> + <%= t 'browse.common_details.ago', :time_in_words_ago => time_ago_in_words(common_editsummary.timestamp) %> <% if common_editsummary.changeset.user.data_public? %> diff --git a/config/locales/en.yml b/config/locales/en.yml index b7b87497b8..3a96356fcb 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -145,7 +145,7 @@ en: other: "Has %{count} relations:" common_details: edited_at: "Edited" - ago: "ago" + ago: "%{time_in_words_ago} ago" edited_by: "by" deleted_at: "Deleted at" deleted_by: "by" From cd8b516835465cc2c799e3f570cc2d6aff50ee65 Mon Sep 17 00:00:00 2001 From: Dan Stowell Date: Sat, 21 Sep 2013 15:53:29 +0100 Subject: [PATCH 10/28] browse page: more approachable headings (involves slightly rejigging the way printable_name() invokes i18n) --- app/helpers/browse_helper.rb | 23 +++++++++++++++---- app/views/browse/_changeset_details.html.erb | 8 +++---- .../browse/_containing_relation.html.erb | 4 ++-- app/views/browse/_node_details.html.erb | 2 +- app/views/browse/_relation_member.html.erb | 4 ++-- app/views/browse/_way_details.html.erb | 4 ++-- app/views/browse/node.html.erb | 3 ++- app/views/browse/node_history.html.erb | 3 ++- app/views/browse/relation.html.erb | 3 ++- app/views/browse/relation_history.html.erb | 3 ++- app/views/browse/way.html.erb | 3 ++- app/views/browse/way_history.html.erb | 3 ++- config/locales/en.yml | 8 ++++--- 13 files changed, 46 insertions(+), 25 deletions(-) diff --git a/app/helpers/browse_helper.rb b/app/helpers/browse_helper.rb index c4e4d425a5..252f30d386 100644 --- a/app/helpers/browse_helper.rb +++ b/app/helpers/browse_helper.rb @@ -3,24 +3,37 @@ def link_to_page(page, page_param) return link_to(page, page_param => page) end - def printable_name(object, version=false) + def printable_name(object, type, version=false) if object.id.is_a?(Array) id = object.id[0] else id = object.id end - name = t 'printable_name.with_id', :id => id.to_s + name = t 'printable_name.with_id', :id => id.to_s, :type => type if version - name = t 'printable_name.with_version', :id => name, :version => object.version.to_s + name = t 'printable_name.with_version', :id => name, :type => type, :version => object.version.to_s end # don't look at object tags if redacted, so as to avoid giving # away redacted version tag information. unless object.redacted? + nametag = false if object.tags.include? "name:#{I18n.locale}" - name = t 'printable_name.with_name', :name => object.tags["name:#{I18n.locale}"].to_s, :id => name + nametag = object.tags["name:#{I18n.locale}"].to_s elsif object.tags.include? 'name' - name = t 'printable_name.with_name', :name => object.tags['name'].to_s, :id => name + nametag = object.tags['name'].to_s + end + + if nametag + if type + name = t 'printable_name.with_name_type', :name => nametag, :type => type, :id => name + else + name = t 'printable_name.with_name', :name => nametag, :id => name + end + else + if type + name = t 'printable_name.with_type', :type => type, :id => name + end end end diff --git a/app/views/browse/_changeset_details.html.erb b/app/views/browse/_changeset_details.html.erb index 7a0deac50d..0699bd379f 100644 --- a/app/views/browse/_changeset_details.html.erb +++ b/app/views/browse/_changeset_details.html.erb @@ -41,7 +41,7 @@

<%= t 'browse.changeset_details.has_nodes', :count => @node_pages.item_count %>

    <% @nodes.each do |node| %> -
  • <%= link_to h(printable_name(node, true)), { :action => "node", :id => node.node_id.to_s }, :class => link_class('node', node), :title => link_title(node) %>
    • +
  • <%= link_to h(printable_name(node, false, true)), { :action => "node", :id => node.node_id.to_s }, :class => link_class('node', node), :title => link_title(node) %>
    • <% end %>
@@ -53,7 +53,7 @@

<%= t 'browse.changeset_details.has_ways', :count => @way_pages.item_count %>

    <% @ways.each do |way| %> -
  • <%= link_to h(printable_name(way, true)), { :action => "way", :id => way.way_id.to_s }, :class => link_class('way', way), :title => link_title(way) %>
    • +
  • <%= link_to h(printable_name(way, false, true)), { :action => "way", :id => way.way_id.to_s }, :class => link_class('way', way), :title => link_title(way) %>
    • <% end %> <%= #render :partial => "containing_relation", :collection => changeset_details.containing_relation_members @@ -68,11 +68,11 @@

    <%= t 'browse.changeset_details.has_relations', :count => @relation_pages.item_count %>

      <% @relations.each do |relation| %> -
    • <%= link_to h(printable_name(relation, true)), { :action => "relation", :id => relation.relation_id.to_s }, :class => link_class('relation', relation), :title => link_title(relation) %>
      • +
    • <%= link_to h(printable_name(relation, false, true)), { :action => "relation", :id => relation.relation_id.to_s }, :class => link_class('relation', relation), :title => link_title(relation) %>
      • <% end %>
<%= render :partial => 'paging_nav', :locals => { :pages => @relation_pages, :page_param => "relation_page" } %> <% end %> -
\ No newline at end of file + diff --git a/app/views/browse/_containing_relation.html.erb b/app/views/browse/_containing_relation.html.erb index de41d92471..ac6cfd6966 100644 --- a/app/views/browse/_containing_relation.html.erb +++ b/app/views/browse/_containing_relation.html.erb @@ -1,8 +1,8 @@
  • <%= - linked_name = link_to h(printable_name(containing_relation.relation)), :action => "relation", :id => containing_relation.relation.id.to_s + linked_name = link_to h(printable_name(containing_relation.relation, false)), :action => "relation", :id => containing_relation.relation.id.to_s if containing_relation.member_role.blank? raw t 'browse.containing_relation.entry', :relation_name => linked_name else raw t 'browse.containing_relation.entry_role', :relation_name => linked_name, :relation_role => h(containing_relation.member_role) end -%>
    • \ No newline at end of file +%> diff --git a/app/views/browse/_node_details.html.erb b/app/views/browse/_node_details.html.erb index 8dec338d69..4b651dc7d0 100644 --- a/app/views/browse/_node_details.html.erb +++ b/app/views/browse/_node_details.html.erb @@ -18,7 +18,7 @@

    <%= t 'browse.node_details.part_of' %>

      <% node_details.ways.each do |way| %> -
    • <%= link_to h(printable_name(way)), { :action => "way", :id => way.id.to_s }, :class => link_class('way', way), :title => link_title(way) %>
      • +
    • <%= link_to h(printable_name(way, t('browse.way.way'))), { :action => "way", :id => way.id.to_s }, :class => link_class('way', way), :title => link_title(way) %>
      • <% end %> <%= render :partial => "containing_relation", :collection => node_details.containing_relation_members %>
    diff --git a/app/views/browse/_relation_member.html.erb b/app/views/browse/_relation_member.html.erb index 2673df3c35..a5fbb43780 100644 --- a/app/views/browse/_relation_member.html.erb +++ b/app/views/browse/_relation_member.html.erb @@ -1,6 +1,6 @@ <% member_class = link_class(relation_member.member_type.downcase, relation_member.member) - linked_name = link_to h(printable_name(relation_member.member)), { :action => relation_member.member_type.downcase, :id => relation_member.member_id.to_s }, :title => link_title(relation_member.member) + linked_name = link_to h(printable_name(relation_member.member, false)), { :action => relation_member.member_type.downcase, :id => relation_member.member_id.to_s }, :title => link_title(relation_member.member) type_str = t'browse.relation_member.type.' + relation_member.member_type.downcase %>
  • <%= @@ -9,4 +9,4 @@ else raw t'browse.relation_member.entry_role', :type => type_str, :name => linked_name, :role => h(relation_member.member_role) end - %>
    • \ No newline at end of file + %> diff --git a/app/views/browse/_way_details.html.erb b/app/views/browse/_way_details.html.erb index 6bff887b3c..511900b9fb 100644 --- a/app/views/browse/_way_details.html.erb +++ b/app/views/browse/_way_details.html.erb @@ -12,10 +12,10 @@
      <% way_details.way_nodes.each do |wn| %>
    • - <%= link_to h(printable_name(wn.node)), { :action => "node", :id => wn.node_id.to_s }, :class => link_class('node', wn.node), :title => link_title(wn.node) %> + <%= link_to h(printable_name(wn.node, false)), { :action => "node", :id => wn.node_id.to_s }, :class => link_class('node', wn.node), :title => link_title(wn.node) %> <% related_ways = wn.node.ways.reject { |w| w.id == wn.way_id } %> <% if related_ways.size > 0 then %> - (<%= raw t 'browse.way_details.also_part_of', :count => related_ways.size, :related_ways => related_ways.map { |w| link_to(h(printable_name(w)), { :action => "way", :id => w.id.to_s }, :class => link_class('way', w), :title => link_title(w) ) }.to_sentence %>) + (<%= raw t 'browse.way_details.also_part_of', :count => related_ways.size, :related_ways => related_ways.map { |w| link_to(h(printable_name(w, false)), { :action => "way", :id => w.id.to_s }, :class => link_class('way', w), :title => link_title(w) ) }.to_sentence %>) <% end %>
      • <% end %> diff --git a/app/views/browse/node.html.erb b/app/views/browse/node.html.erb index 2652a97fca..ea7f6c6d5d 100644 --- a/app/views/browse/node.html.erb +++ b/app/views/browse/node.html.erb @@ -1,5 +1,6 @@ <% -@name = printable_name @node +@type = t('browse.node.node') +@name = printable_name @node, @type @title = t('browse.node.node') + ' | ' + @name %> <% content_for :head do %> diff --git a/app/views/browse/node_history.html.erb b/app/views/browse/node_history.html.erb index 3904a6d436..ccd4642e70 100644 --- a/app/views/browse/node_history.html.erb +++ b/app/views/browse/node_history.html.erb @@ -1,5 +1,6 @@ <% -@name = printable_name @node +@type = t('browse.node.node') +@name = printable_name @node, @type @title = t('browse.node_history.node_history') + ' | ' + @name %> <% content_for :head do %> diff --git a/app/views/browse/relation.html.erb b/app/views/browse/relation.html.erb index 10f4d4f0b2..ed773583a8 100644 --- a/app/views/browse/relation.html.erb +++ b/app/views/browse/relation.html.erb @@ -1,5 +1,6 @@ <% -@name = printable_name @relation +@type = t('browse.relation.relation') +@name = printable_name @relation, @type @title = t('browse.relation.relation') + ' | ' + @name %> <% content_for :head do %> diff --git a/app/views/browse/relation_history.html.erb b/app/views/browse/relation_history.html.erb index 58e0ebde63..4450c2dfa5 100644 --- a/app/views/browse/relation_history.html.erb +++ b/app/views/browse/relation_history.html.erb @@ -1,5 +1,6 @@ <% -@name = printable_name @relation +@type = t('browse.relation.relation') +@name = printable_name @relation, @type @title = t('browse.relation_history.relation_history') + ' | ' + @name %> <% content_for :head do %> diff --git a/app/views/browse/way.html.erb b/app/views/browse/way.html.erb index fe6110125b..7fec219733 100644 --- a/app/views/browse/way.html.erb +++ b/app/views/browse/way.html.erb @@ -1,5 +1,6 @@ <% -@name = printable_name @way +@type = t('browse.way.way') +@name = printable_name @way, @type @title = t('browse.way.way') + ' | ' + @name %> <% content_for :head do %> diff --git a/app/views/browse/way_history.html.erb b/app/views/browse/way_history.html.erb index f58fdfe531..2f76e4efc1 100644 --- a/app/views/browse/way_history.html.erb +++ b/app/views/browse/way_history.html.erb @@ -1,5 +1,6 @@ <% -@name = printable_name @way +@type = t('browse.way.way') +@name = printable_name @way, @type @title = t('browse.way_history.way_history') + ' | ' + @name %> <% content_for :head do %> diff --git a/config/locales/en.yml b/config/locales/en.yml index 3a96356fcb..b04d7e1545 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -80,6 +80,8 @@ en: with_id: "%{id}" with_version: "%{id}, v%{version}" with_name: "%{name} (%{id})" + with_type: "%{type} %{id}" + with_name_type: "%{name} (%{type} %{id})" editor: default: "Default (currently %{name})" potlatch: @@ -180,7 +182,7 @@ en: view_details: "View details" node: node: "Node" - node_title: "Node: %{node_name}" + node_title: "%{node_name}" download_xml: "Download XML" view_history: "View history" edit: "Edit node" @@ -225,7 +227,7 @@ en: relation: "Relation" relation: relation: "Relation" - relation_title: "Relation: %{relation_name}" + relation_title: "%{relation_name}" download_xml: "Download XML" view_history: "View history" start_rjs: @@ -285,7 +287,7 @@ en: view_details: "View details" way: way: "Way" - way_title: "Way: %{way_name}" + way_title: "%{way_name}" download_xml: "Download XML" view_history: "View history" edit: "Edit way" From 2da012dddca058c2b7add297743a410e91e7ae78 Mon Sep 17 00:00:00 2001 From: Dan Stowell Date: Sat, 21 Sep 2013 15:58:37 +0100 Subject: [PATCH 11/28] browse page: ensure neat render (no spurious top bar) when no-tags-no-comment --- app/views/browse/_common_details.html.erb | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/app/views/browse/_common_details.html.erb b/app/views/browse/_common_details.html.erb index 169dd0de0c..f31787b6a2 100644 --- a/app/views/browse/_common_details.html.erb +++ b/app/views/browse/_common_details.html.erb @@ -1,9 +1,11 @@ -
      -
      - <%= render :partial => "tag_details", :object => common_details %> - <% if common_details.changeset.tags['comment'].present? %> -

      <%= t 'browse.common_details.changeset_comment' %>

      -

      <%= linkify(h(common_details.changeset.tags['comment'])) %>

      - <% end %> +<% if common_details.changeset.tags['comment'].present? or (not common_details.tags.empty?) %> +
      +
      + <%= render :partial => "tag_details", :object => common_details %> + <% if common_details.changeset.tags['comment'].present? %> +

      <%= t 'browse.common_details.changeset_comment' %>

      +

      <%= linkify(h(common_details.changeset.tags['comment'])) %>

      + <% end %> +
      -
      +<% end %> From ae5bdb2df6fc644e3d8155fd19eb62297ffe4f74 Mon Sep 17 00:00:00 2001 From: Dan Stowell Date: Sun, 22 Sep 2013 19:20:15 +0100 Subject: [PATCH 12/28] browse page: formatting tweaks for small-screen mode --- app/assets/stylesheets/common.css.scss | 3 +-- app/assets/stylesheets/large.css | 4 ++++ app/assets/stylesheets/small.css.scss | 3 +++ app/views/browse/_node_details.html.erb | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss index 95f182c5b8..69979e9237 100644 --- a/app/assets/stylesheets/common.css.scss +++ b/app/assets/stylesheets/common.css.scss @@ -1327,7 +1327,7 @@ ul.results-list li { border-bottom: 1px solid #ccc; } } h4 { float: left; - width: 15%; + width: 18%; display: inline-block; vertical-align: top; clear: left; @@ -1946,7 +1946,6 @@ ul.secondary-actions { &.pager { display: inline; margin-right: 30px; - float: right; } > li { display: block; diff --git a/app/assets/stylesheets/large.css b/app/assets/stylesheets/large.css index 050272b773..f407619318 100644 --- a/app/assets/stylesheets/large.css +++ b/app/assets/stylesheets/large.css @@ -1 +1,5 @@ /* Styles specific to large screens */ +ul.secondary-actions.pager { + float: right; + } +} diff --git a/app/assets/stylesheets/small.css.scss b/app/assets/stylesheets/small.css.scss index 419abeac4e..791b1271a2 100644 --- a/app/assets/stylesheets/small.css.scss +++ b/app/assets/stylesheets/small.css.scss @@ -87,6 +87,8 @@ h2, h3, h4 { #browse_map ul.secondary-actions { float: right; font-size: 10px; + margin-left: 5px; + margin-right: 5px; } #map { @@ -216,6 +218,7 @@ p.search_results_entry { /* Rules for the browse pages */ +.browse_details.common div, .browse-section.common div{ clear: both; } diff --git a/app/views/browse/_node_details.html.erb b/app/views/browse/_node_details.html.erb index 4b651dc7d0..0c39fc0553 100644 --- a/app/views/browse/_node_details.html.erb +++ b/app/views/browse/_node_details.html.erb @@ -1,4 +1,4 @@ -
      +
      <% if node_details.redacted? %>
      <%= t 'browse.redacted.message_html', :type => t('browse.redacted.type.node'), :redaction_link => link_to(t('browse.redacted.redaction', :id => node_details.redaction.id), node_details.redaction), :version => node_details.version %> From 43b3f8a0c3ad1a6441eb26b9cc98012e68940dca Mon Sep 17 00:00:00 2001 From: Dan Stowell Date: Sat, 28 Sep 2013 14:26:29 +0100 Subject: [PATCH 13/28] browse page: printable_name() opt args converted to named hash options --- app/helpers/browse_helper.rb | 20 +++++++++++-------- app/views/browse/_changeset_details.html.erb | 6 +++--- .../browse/_containing_relation.html.erb | 2 +- app/views/browse/_node_details.html.erb | 2 +- app/views/browse/_relation_member.html.erb | 2 +- app/views/browse/_way_details.html.erb | 4 ++-- app/views/browse/node.html.erb | 3 +-- app/views/browse/node_history.html.erb | 3 +-- app/views/browse/relation.html.erb | 3 +-- app/views/browse/relation_history.html.erb | 3 +-- app/views/browse/way.html.erb | 3 +-- app/views/browse/way_history.html.erb | 3 +-- 12 files changed, 26 insertions(+), 28 deletions(-) diff --git a/app/helpers/browse_helper.rb b/app/helpers/browse_helper.rb index 252f30d386..1455b778c4 100644 --- a/app/helpers/browse_helper.rb +++ b/app/helpers/browse_helper.rb @@ -3,15 +3,19 @@ def link_to_page(page, page_param) return link_to(page, page_param => page) end - def printable_name(object, type, version=false) + def printable_name(object, options={}) + options = { + :type => false, # :type can be set to a string indicating object type, such as t('browse.way.way') + :version => false + }.merge(options) if object.id.is_a?(Array) id = object.id[0] else id = object.id end - name = t 'printable_name.with_id', :id => id.to_s, :type => type - if version - name = t 'printable_name.with_version', :id => name, :type => type, :version => object.version.to_s + name = t 'printable_name.with_id', :id => id.to_s, :type => options[:type] + if options[:version] + name = t 'printable_name.with_version', :id => name, :type => options[:type], :version => object.version.to_s end # don't look at object tags if redacted, so as to avoid giving @@ -25,14 +29,14 @@ def printable_name(object, type, version=false) end if nametag - if type - name = t 'printable_name.with_name_type', :name => nametag, :type => type, :id => name + if options[:type] + name = t 'printable_name.with_name_type', :name => nametag, :type => options[:type], :id => name else name = t 'printable_name.with_name', :name => nametag, :id => name end else - if type - name = t 'printable_name.with_type', :type => type, :id => name + if options[:type] + name = t 'printable_name.with_type', :type => options[:type], :id => name end end end diff --git a/app/views/browse/_changeset_details.html.erb b/app/views/browse/_changeset_details.html.erb index 0699bd379f..8147ea20d8 100644 --- a/app/views/browse/_changeset_details.html.erb +++ b/app/views/browse/_changeset_details.html.erb @@ -41,7 +41,7 @@

      <%= t 'browse.changeset_details.has_nodes', :count => @node_pages.item_count %>

        <% @nodes.each do |node| %> -
      • <%= link_to h(printable_name(node, false, true)), { :action => "node", :id => node.node_id.to_s }, :class => link_class('node', node), :title => link_title(node) %>
        • +
      • <%= link_to h(printable_name(node, {:version => true})), { :action => "node", :id => node.node_id.to_s }, :class => link_class('node', node), :title => link_title(node) %>
        • <% end %>
      @@ -53,7 +53,7 @@

      <%= t 'browse.changeset_details.has_ways', :count => @way_pages.item_count %>

        <% @ways.each do |way| %> -
      • <%= link_to h(printable_name(way, false, true)), { :action => "way", :id => way.way_id.to_s }, :class => link_class('way', way), :title => link_title(way) %>
        • +
      • <%= link_to h(printable_name(way, {:version => true})), { :action => "way", :id => way.way_id.to_s }, :class => link_class('way', way), :title => link_title(way) %>
        • <% end %> <%= #render :partial => "containing_relation", :collection => changeset_details.containing_relation_members @@ -68,7 +68,7 @@

        <%= t 'browse.changeset_details.has_relations', :count => @relation_pages.item_count %>

          <% @relations.each do |relation| %> -
        • <%= link_to h(printable_name(relation, false, true)), { :action => "relation", :id => relation.relation_id.to_s }, :class => link_class('relation', relation), :title => link_title(relation) %>
          • +
        • <%= link_to h(printable_name(relation, {:version => true})), { :action => "relation", :id => relation.relation_id.to_s }, :class => link_class('relation', relation), :title => link_title(relation) %>
          • <% end %>
      diff --git a/app/views/browse/_containing_relation.html.erb b/app/views/browse/_containing_relation.html.erb index ac6cfd6966..f3404a7957 100644 --- a/app/views/browse/_containing_relation.html.erb +++ b/app/views/browse/_containing_relation.html.erb @@ -1,5 +1,5 @@
    • <%= - linked_name = link_to h(printable_name(containing_relation.relation, false)), :action => "relation", :id => containing_relation.relation.id.to_s + linked_name = link_to h(printable_name(containing_relation.relation)), :action => "relation", :id => containing_relation.relation.id.to_s if containing_relation.member_role.blank? raw t 'browse.containing_relation.entry', :relation_name => linked_name else diff --git a/app/views/browse/_node_details.html.erb b/app/views/browse/_node_details.html.erb index 0c39fc0553..1e8dace8b5 100644 --- a/app/views/browse/_node_details.html.erb +++ b/app/views/browse/_node_details.html.erb @@ -18,7 +18,7 @@

      <%= t 'browse.node_details.part_of' %>

        <% node_details.ways.each do |way| %> -
      • <%= link_to h(printable_name(way, t('browse.way.way'))), { :action => "way", :id => way.id.to_s }, :class => link_class('way', way), :title => link_title(way) %>
        • +
      • <%= link_to h(printable_name(way, {:type => t('browse.way.way')})), { :action => "way", :id => way.id.to_s }, :class => link_class('way', way), :title => link_title(way) %>
        • <% end %> <%= render :partial => "containing_relation", :collection => node_details.containing_relation_members %>
      diff --git a/app/views/browse/_relation_member.html.erb b/app/views/browse/_relation_member.html.erb index a5fbb43780..19560d5d41 100644 --- a/app/views/browse/_relation_member.html.erb +++ b/app/views/browse/_relation_member.html.erb @@ -1,6 +1,6 @@ <% member_class = link_class(relation_member.member_type.downcase, relation_member.member) - linked_name = link_to h(printable_name(relation_member.member, false)), { :action => relation_member.member_type.downcase, :id => relation_member.member_id.to_s }, :title => link_title(relation_member.member) + linked_name = link_to h(printable_name(relation_member.member)), { :action => relation_member.member_type.downcase, :id => relation_member.member_id.to_s }, :title => link_title(relation_member.member) type_str = t'browse.relation_member.type.' + relation_member.member_type.downcase %>
    • <%= diff --git a/app/views/browse/_way_details.html.erb b/app/views/browse/_way_details.html.erb index 511900b9fb..6bff887b3c 100644 --- a/app/views/browse/_way_details.html.erb +++ b/app/views/browse/_way_details.html.erb @@ -12,10 +12,10 @@
        <% way_details.way_nodes.each do |wn| %>
      • - <%= link_to h(printable_name(wn.node, false)), { :action => "node", :id => wn.node_id.to_s }, :class => link_class('node', wn.node), :title => link_title(wn.node) %> + <%= link_to h(printable_name(wn.node)), { :action => "node", :id => wn.node_id.to_s }, :class => link_class('node', wn.node), :title => link_title(wn.node) %> <% related_ways = wn.node.ways.reject { |w| w.id == wn.way_id } %> <% if related_ways.size > 0 then %> - (<%= raw t 'browse.way_details.also_part_of', :count => related_ways.size, :related_ways => related_ways.map { |w| link_to(h(printable_name(w, false)), { :action => "way", :id => w.id.to_s }, :class => link_class('way', w), :title => link_title(w) ) }.to_sentence %>) + (<%= raw t 'browse.way_details.also_part_of', :count => related_ways.size, :related_ways => related_ways.map { |w| link_to(h(printable_name(w)), { :action => "way", :id => w.id.to_s }, :class => link_class('way', w), :title => link_title(w) ) }.to_sentence %>) <% end %>
        • <% end %> diff --git a/app/views/browse/node.html.erb b/app/views/browse/node.html.erb index ea7f6c6d5d..0bd083795e 100644 --- a/app/views/browse/node.html.erb +++ b/app/views/browse/node.html.erb @@ -1,6 +1,5 @@ <% -@type = t('browse.node.node') -@name = printable_name @node, @type +@name = printable_name @node, {:type => t('browse.node.node')} @title = t('browse.node.node') + ' | ' + @name %> <% content_for :head do %> diff --git a/app/views/browse/node_history.html.erb b/app/views/browse/node_history.html.erb index ccd4642e70..840c361e32 100644 --- a/app/views/browse/node_history.html.erb +++ b/app/views/browse/node_history.html.erb @@ -1,6 +1,5 @@ <% -@type = t('browse.node.node') -@name = printable_name @node, @type +@name = printable_name @node, {:type => t('browse.node.node')} @title = t('browse.node_history.node_history') + ' | ' + @name %> <% content_for :head do %> diff --git a/app/views/browse/relation.html.erb b/app/views/browse/relation.html.erb index ed773583a8..256e6994f1 100644 --- a/app/views/browse/relation.html.erb +++ b/app/views/browse/relation.html.erb @@ -1,6 +1,5 @@ <% -@type = t('browse.relation.relation') -@name = printable_name @relation, @type +@name = printable_name @relation, {:type => t('browse.relation.relation')} @title = t('browse.relation.relation') + ' | ' + @name %> <% content_for :head do %> diff --git a/app/views/browse/relation_history.html.erb b/app/views/browse/relation_history.html.erb index 4450c2dfa5..826cb038ef 100644 --- a/app/views/browse/relation_history.html.erb +++ b/app/views/browse/relation_history.html.erb @@ -1,6 +1,5 @@ <% -@type = t('browse.relation.relation') -@name = printable_name @relation, @type +@name = printable_name @relation, {:type => t('browse.relation.relation')} @title = t('browse.relation_history.relation_history') + ' | ' + @name %> <% content_for :head do %> diff --git a/app/views/browse/way.html.erb b/app/views/browse/way.html.erb index 7fec219733..813b663b8e 100644 --- a/app/views/browse/way.html.erb +++ b/app/views/browse/way.html.erb @@ -1,6 +1,5 @@ <% -@type = t('browse.way.way') -@name = printable_name @way, @type +@name = printable_name @way, {:type => t('browse.way.way')} @title = t('browse.way.way') + ' | ' + @name %> <% content_for :head do %> diff --git a/app/views/browse/way_history.html.erb b/app/views/browse/way_history.html.erb index 2f76e4efc1..821771d89e 100644 --- a/app/views/browse/way_history.html.erb +++ b/app/views/browse/way_history.html.erb @@ -1,6 +1,5 @@ <% -@type = t('browse.way.way') -@name = printable_name @way, @type +@name = printable_name @way, {:type => t('browse.way.way')} @title = t('browse.way_history.way_history') + ' | ' + @name %> <% content_for :head do %> From 6c48876bd0dd6567faa965481812cbf3e0d3608c Mon Sep 17 00:00:00 2001 From: Dan Stowell Date: Sat, 28 Sep 2013 15:02:06 +0100 Subject: [PATCH 14/28] browse page: full rather than "lego" i18n strings for editsummary --- app/views/browse/_common_editsummary.html.erb | 35 +++++++++---------- config/locales/en.yml | 11 +++--- 2 files changed, 21 insertions(+), 25 deletions(-) diff --git a/app/views/browse/_common_editsummary.html.erb b/app/views/browse/_common_editsummary.html.erb index fda494cb83..4bfdc76ced 100644 --- a/app/views/browse/_common_editsummary.html.erb +++ b/app/views/browse/_common_editsummary.html.erb @@ -1,25 +1,22 @@ - <% if common_editsummary.visible? %> - <%= t 'browse.common_details.edited_at' %> - <% else %> - <%= t 'browse.common_details.deleted_at' %> - <% end %> +<% +@agohtml = "%s" % [l(common_editsummary.timestamp), t('browse.common_details.ago', :time_in_words_ago => time_ago_in_words(common_editsummary.timestamp))] - <%= t 'browse.common_details.ago', :time_in_words_ago => time_ago_in_words(common_editsummary.timestamp) %> - - - <% if common_editsummary.changeset.user.data_public? %> - <% if common_editsummary.visible? %> - <%= t 'browse.common_details.edited_by' %> - <% else %> - <%= t 'browse.common_details.deleted_by' %> - <% end %> - <%= link_to h(common_editsummary.changeset.user.display_name), :controller => "user", :action => "view", :display_name => common_editsummary.changeset.user.display_name %> +if common_editsummary.changeset.user.data_public? + @userhtml = link_to h(common_editsummary.changeset.user.display_name), :controller => "user", :action => "view", :display_name => common_editsummary.changeset.user.display_name + if common_editsummary.visible? %> + <%= raw t 'browse.common_details.edited_ago_by', :time_in_words_ago => @agohtml, :user => @userhtml %> + <% else %> + <%= raw t 'browse.common_details.deleted_ago_by', :time_in_words_ago => @agohtml, :user => @userhtml %> + <% end %> +<% else %> + <% if common_editsummary.visible? %> + <%= raw t 'browse.common_details.edited_ago', :time_in_words_ago => @agohtml %> + <% else %> + <%= raw t 'browse.common_details.deleted_ago', :time_in_words_ago => @agohtml %> <% end %> +<% end %> · - <%= t 'browse.common_details.version' %> - <%= h(common_editsummary.version) %> - <%= t 'browse.common_details.in_changeset' %> - <%= link_to common_editsummary.changeset_id, :action => :changeset, :id => common_editsummary.changeset_id %> + <%= raw t 'browse.common_details.version_in_changeset', :version => common_editsummary.version, :changeset => link_to(common_editsummary.changeset_id, :action => :changeset, :id => common_editsummary.changeset_id) %> diff --git a/config/locales/en.yml b/config/locales/en.yml index b04d7e1545..cb4941bc04 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -146,13 +146,12 @@ en: one: "Has %{count} relation:" other: "Has %{count} relations:" common_details: - edited_at: "Edited" ago: "%{time_in_words_ago} ago" - edited_by: "by" - deleted_at: "Deleted at" - deleted_by: "by" - version: "Version" - in_changeset: "in changeset" + edited_ago_by: "Edited %{time_in_words_ago} by %{user}" + edited_ago: "Edited %{time_in_words_ago}" + deleted_ago_by: "Deleted %{time_in_words_ago} by %{user}" + deleted_ago: "Deleted %{time_in_words_ago}" + version_in_changeset: "Version %{version} in changeset %{changeset}" changeset_comment: "Comment:" containing_relation: entry: "Relation %{relation_name}" From 64b98e08c74c932369aca6d9fdb9582e794d75f2 Mon Sep 17 00:00:00 2001 From: Dan Stowell Date: Sat, 28 Sep 2013 15:11:30 +0100 Subject: [PATCH 15/28] browse page: reinstate version metadata on history page --- app/views/browse/node_history.html.erb | 5 +++++ app/views/browse/relation_history.html.erb | 5 +++++ app/views/browse/way_history.html.erb | 5 +++++ 3 files changed, 15 insertions(+) diff --git a/app/views/browse/node_history.html.erb b/app/views/browse/node_history.html.erb index 840c361e32..44e0edc1d0 100644 --- a/app/views/browse/node_history.html.erb +++ b/app/views/browse/node_history.html.erb @@ -19,6 +19,11 @@
        <% @node.old_nodes.reverse.each do |node| %> +
        +
        +
        <%= render :partial => "common_editsummary", :object => node %>
        +
        +
        <%= render :partial => "node_details", :object => node %> <% end %>
        diff --git a/app/views/browse/relation_history.html.erb b/app/views/browse/relation_history.html.erb index 826cb038ef..a995d5b93a 100644 --- a/app/views/browse/relation_history.html.erb +++ b/app/views/browse/relation_history.html.erb @@ -16,6 +16,11 @@ <%= render :partial => "map", :object => @relation %>
        <% @relation.old_relations.reverse.each do |relation| %> +
        +
        +
        <%= render :partial => "common_editsummary", :object => relation %>
        +
        +
        <%= render :partial => "relation_details", :object => relation %> <% end %>
        diff --git a/app/views/browse/way_history.html.erb b/app/views/browse/way_history.html.erb index 821771d89e..0ddf0833af 100644 --- a/app/views/browse/way_history.html.erb +++ b/app/views/browse/way_history.html.erb @@ -16,6 +16,11 @@ <%= render :partial => "map", :object => @way %>
        <% @way.old_ways.reverse.each do |way| %> +
        +
        +
        <%= render :partial => "common_editsummary", :object => way %>
        +
        +
        <%= render :partial => "way_details", :object => way %> <% end %>
        From 45a056f1aac2dfb2e05a811b453452c5f99e96c7 Mon Sep 17 00:00:00 2001 From: Dan Stowell Date: Sat, 28 Sep 2013 15:16:41 +0100 Subject: [PATCH 16/28] browse page: remove title translations that are now no-op --- app/views/browse/node.html.erb | 2 +- app/views/browse/relation.html.erb | 2 +- app/views/browse/way.html.erb | 2 +- config/locales/en.yml | 3 --- 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/app/views/browse/node.html.erb b/app/views/browse/node.html.erb index 0bd083795e..8613564f24 100644 --- a/app/views/browse/node.html.erb +++ b/app/views/browse/node.html.erb @@ -7,7 +7,7 @@ <% end %> <% content_for :heading do %> -

        <%= t'browse.node.node_title', :node_name => @name %>

        +

        <%= @name %>

        <%= render :partial => "navigation" %> <%= render :partial => "common_editsummary", :object => @node %> diff --git a/app/views/browse/relation.html.erb b/app/views/browse/relation.html.erb index 256e6994f1..44f901872e 100644 --- a/app/views/browse/relation.html.erb +++ b/app/views/browse/relation.html.erb @@ -7,7 +7,7 @@ <% end %> <% content_for :heading do %> -

        <%= t'browse.relation.relation_title', :relation_name => @name %>

        +

        <%= @name %>

        <%= render :partial => "navigation" %> <%= render :partial => "common_editsummary", :object => @relation %> diff --git a/app/views/browse/way.html.erb b/app/views/browse/way.html.erb index 813b663b8e..e69fc1bd12 100644 --- a/app/views/browse/way.html.erb +++ b/app/views/browse/way.html.erb @@ -7,7 +7,7 @@ <% end %> <% content_for :heading do %> -

        <%= t'browse.way.way_title', :way_name => @name %>

        +

        <%= @name %>

        <%= render :partial => "navigation" %> <%= render :partial => "common_editsummary", :object => @way %> diff --git a/config/locales/en.yml b/config/locales/en.yml index cb4941bc04..e60aa5a4c5 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -181,7 +181,6 @@ en: view_details: "View details" node: node: "Node" - node_title: "%{node_name}" download_xml: "Download XML" view_history: "View history" edit: "Edit node" @@ -226,7 +225,6 @@ en: relation: "Relation" relation: relation: "Relation" - relation_title: "%{relation_name}" download_xml: "Download XML" view_history: "View history" start_rjs: @@ -286,7 +284,6 @@ en: view_details: "View details" way: way: "Way" - way_title: "%{way_name}" download_xml: "Download XML" view_history: "View history" edit: "Edit way" From d0b8718f3cf0405635a00f81d05f5f69adb434cc Mon Sep 17 00:00:00 2001 From: Dan Stowell Date: Tue, 8 Oct 2013 20:04:39 +0100 Subject: [PATCH 17/28] bugfix: remove superfluous bracket in css --- app/assets/stylesheets/large.css | 1 - 1 file changed, 1 deletion(-) diff --git a/app/assets/stylesheets/large.css b/app/assets/stylesheets/large.css index f407619318..6f3050a9b3 100644 --- a/app/assets/stylesheets/large.css +++ b/app/assets/stylesheets/large.css @@ -1,5 +1,4 @@ /* Styles specific to large screens */ ul.secondary-actions.pager { float: right; - } } From 6e18e7637d6ea069c1d316664aebffe77348eb91 Mon Sep 17 00:00:00 2001 From: Dan Stowell Date: Tue, 8 Oct 2013 20:30:25 +0100 Subject: [PATCH 18/28] browse pages: use common "pager" style across large and small --- app/assets/stylesheets/common.css.scss | 5 +++-- app/assets/stylesheets/large.css | 3 --- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss index 69979e9237..749f517f73 100644 --- a/app/assets/stylesheets/common.css.scss +++ b/app/assets/stylesheets/common.css.scss @@ -1944,8 +1944,9 @@ ul.secondary-actions { margin-bottom: 0; margin-left: 0; &.pager { - display: inline; - margin-right: 30px; + display: inline-block; + margin-right: 20px; + float: right; } > li { display: block; diff --git a/app/assets/stylesheets/large.css b/app/assets/stylesheets/large.css index 6f3050a9b3..050272b773 100644 --- a/app/assets/stylesheets/large.css +++ b/app/assets/stylesheets/large.css @@ -1,4 +1 @@ /* Styles specific to large screens */ -ul.secondary-actions.pager { - float: right; -} From 83d787a66cb60a1fe36dbe58aa3cb2e0eef5de82 Mon Sep 17 00:00:00 2001 From: Dan Stowell Date: Tue, 8 Oct 2013 20:49:28 +0100 Subject: [PATCH 19/28] browse page: improve line-wrapping of the new edit summary --- app/assets/stylesheets/common.css.scss | 3 +++ app/views/browse/_common_editsummary.html.erb | 4 +++- app/views/browse/node.html.erb | 2 +- app/views/browse/relation.html.erb | 2 +- app/views/browse/way.html.erb | 2 +- 5 files changed, 9 insertions(+), 4 deletions(-) diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss index 749f517f73..7cf06f04db 100644 --- a/app/assets/stylesheets/common.css.scss +++ b/app/assets/stylesheets/common.css.scss @@ -1228,6 +1228,9 @@ ul.results-list li { border-bottom: 1px solid #ccc; } margin-top: $lineheight/2; margin-bottom: 0px; } + div.edit_summary_chunk { + display: inline-block; + } } /* Rules for small maps in content areas */ diff --git a/app/views/browse/_common_editsummary.html.erb b/app/views/browse/_common_editsummary.html.erb index 4bfdc76ced..d58296a7ec 100644 --- a/app/views/browse/_common_editsummary.html.erb +++ b/app/views/browse/_common_editsummary.html.erb @@ -1,3 +1,4 @@ +
        <% @agohtml = "%s" % [l(common_editsummary.timestamp), t('browse.common_details.ago', :time_in_words_ago => time_ago_in_words(common_editsummary.timestamp))] @@ -15,8 +16,9 @@ if common_editsummary.changeset.user.data_public? <%= raw t 'browse.common_details.deleted_ago', :time_in_words_ago => @agohtml %> <% end %> <% end %> +
        · - <%= raw t 'browse.common_details.version_in_changeset', :version => common_editsummary.version, :changeset => link_to(common_editsummary.changeset_id, :action => :changeset, :id => common_editsummary.changeset_id) %> +
        <%= raw t 'browse.common_details.version_in_changeset', :version => common_editsummary.version, :changeset => link_to(common_editsummary.changeset_id, :action => :changeset, :id => common_editsummary.changeset_id) %>
        diff --git a/app/views/browse/node.html.erb b/app/views/browse/node.html.erb index 8613564f24..3a547c85c4 100644 --- a/app/views/browse/node.html.erb +++ b/app/views/browse/node.html.erb @@ -12,7 +12,7 @@ <%= render :partial => "common_editsummary", :object => @node %> - (<%= link_to(t('browse.node.view_history'), :action => "node_history") %>) +
        (<%= link_to(t('browse.node.view_history'), :action => "node_history") %>)
        <% end %> <% if @node.visible -%> diff --git a/app/views/browse/relation.html.erb b/app/views/browse/relation.html.erb index 44f901872e..f7a84aa6ba 100644 --- a/app/views/browse/relation.html.erb +++ b/app/views/browse/relation.html.erb @@ -12,7 +12,7 @@ <%= render :partial => "common_editsummary", :object => @relation %> - (<%= link_to(t('browse.relation.view_history'), :action => "relation_history") %>) +
        (<%= link_to(t('browse.relation.view_history'), :action => "relation_history") %>)
        <% end %> <%= render :partial => "map", :object => @relation %> diff --git a/app/views/browse/way.html.erb b/app/views/browse/way.html.erb index e69fc1bd12..9540269a95 100644 --- a/app/views/browse/way.html.erb +++ b/app/views/browse/way.html.erb @@ -12,7 +12,7 @@ <%= render :partial => "common_editsummary", :object => @way %> - (<%= link_to(t('browse.way.view_history'), :action => "way_history") %>) +
        (<%= link_to(t('browse.way.view_history'), :action => "way_history") %>)
        <% end %> <%= render :partial => "map", :object => @way %> From f091f7588e9885c4b6d86b8680c6d93a736a9e91 Mon Sep 17 00:00:00 2001 From: Dan Stowell Date: Tue, 8 Oct 2013 21:16:00 +0100 Subject: [PATCH 20/28] update locales to remove three browse.*.*_title keys no longer used --- config/locales/af.yml | 2 -- config/locales/aln.yml | 3 --- config/locales/ar.yml | 3 --- config/locales/arz.yml | 3 --- config/locales/ast.yml | 3 --- config/locales/az.yml | 3 --- config/locales/be-Tarask.yml | 3 --- config/locales/be.yml | 3 --- config/locales/bg.yml | 1 - config/locales/br.yml | 3 --- config/locales/bs.yml | 3 --- config/locales/ca.yml | 3 --- config/locales/cs.yml | 3 --- config/locales/da.yml | 3 --- config/locales/de.yml | 3 --- config/locales/diq.yml | 2 -- config/locales/dsb.yml | 3 --- config/locales/el.yml | 3 --- config/locales/eo.yml | 3 --- config/locales/es.yml | 3 --- config/locales/et.yml | 3 --- config/locales/eu.yml | 3 --- config/locales/fa.yml | 3 --- config/locales/fi.yml | 3 --- config/locales/fr.yml | 3 --- config/locales/fur.yml | 3 --- config/locales/gcf.yml | 1 - config/locales/gl.yml | 3 --- config/locales/gsw.yml | 3 --- config/locales/he.yml | 3 --- config/locales/hi.yml | 3 --- config/locales/hr.yml | 3 --- config/locales/hsb.yml | 3 --- config/locales/hu.yml | 3 --- config/locales/ia.yml | 3 --- config/locales/id.yml | 3 --- config/locales/is.yml | 3 --- config/locales/it.yml | 3 --- config/locales/ja.yml | 3 --- config/locales/ka.yml | 3 --- config/locales/km.yml | 2 -- config/locales/ko.yml | 3 --- config/locales/ksh.yml | 1 - config/locales/lb.yml | 3 --- config/locales/lt.yml | 3 --- config/locales/lv.yml | 3 --- config/locales/mk.yml | 3 --- config/locales/mr.yml | 1 - config/locales/ms.yml | 3 --- config/locales/nb.yml | 3 --- config/locales/nds.yml | 2 -- config/locales/ne.yml | 3 --- config/locales/nl.yml | 3 --- config/locales/nn.yml | 3 --- config/locales/oc.yml | 3 --- config/locales/pa.yml | 2 -- config/locales/pl.yml | 3 --- config/locales/pt-BR.yml | 3 --- config/locales/pt.yml | 3 --- config/locales/ro.yml | 3 --- config/locales/ru.yml | 3 --- config/locales/sk.yml | 3 --- config/locales/sl.yml | 3 --- config/locales/sq.yml | 3 --- config/locales/sr-Latn.yml | 3 --- config/locales/sr.yml | 3 --- config/locales/sv.yml | 3 --- config/locales/ta.yml | 3 --- config/locales/te.yml | 1 - config/locales/tl.yml | 3 --- config/locales/tr.yml | 3 --- config/locales/uk.yml | 3 --- config/locales/vi.yml | 3 --- config/locales/zh-CN.yml | 3 --- config/locales/zh-TW.yml | 3 --- 75 files changed, 210 deletions(-) diff --git a/config/locales/af.yml b/config/locales/af.yml index 9261794600..d7d8fadb6b 100644 --- a/config/locales/af.yml +++ b/config/locales/af.yml @@ -95,7 +95,6 @@ af: download_xml: Laai XML af edit: wysig node: Node - node_title: "Node: %{node_name}" view_history: wys geskiedenis node_details: coordinates: "Koördinate:" @@ -174,7 +173,6 @@ af: edit: wysig view_history: besigtig geskiedenis way: Weg - way_title: "Weg: %{way_name}" way_details: also_part_of: one: ook deel van weg %{related_ways} diff --git a/config/locales/aln.yml b/config/locales/aln.yml index dc72a5457e..3dc6c33657 100644 --- a/config/locales/aln.yml +++ b/config/locales/aln.yml @@ -146,7 +146,6 @@ aln: download_xml: Merre me XML edit: ndrro node: Nyje - node_title: "Nyja: %{node_name}" view_history: kqyre historinë node_details: coordinates: "Koordinatat:" @@ -169,7 +168,6 @@ aln: relation: download_xml: Shkarkoje XML relation: Lidhja - relation_title: "Lidhja: %{relation_name}" view_history: Kshyre historinë relation_details: members: "Anëtarët:" @@ -234,7 +232,6 @@ aln: edit: ndrro view_history: kqyre historine way: Udhë - way_title: "Udhë: %{way_name}" way_details: also_part_of: one: edhe kjo asht pjes e udhës %{related_ways} diff --git a/config/locales/ar.yml b/config/locales/ar.yml index 6c7e5b94ba..57f29dc9b8 100644 --- a/config/locales/ar.yml +++ b/config/locales/ar.yml @@ -160,7 +160,6 @@ ar: download_xml: نزّل إكس إم أل edit: تعديل العقدة node: عقدة - node_title: "عقدة: %{node_name}" view_history: شاهد الخط الزمني node_details: coordinates: "إحداثيات:" @@ -189,7 +188,6 @@ ar: relation: download_xml: نزّل إكس إم إل relation: العلاقة - relation_title: "العلاقة: %{relation_name}" view_history: شاهد الخط الزمني relation_details: members: "الأعضاء:" @@ -253,7 +251,6 @@ ar: edit: تعديل الطريق view_history: شاهد الخط الزمني way: طريق - way_title: "طريق: %{way_name}" way_details: also_part_of: one: أيضًا جزء من الطريق %{related_ways} diff --git a/config/locales/arz.yml b/config/locales/arz.yml index e2a1c67f85..513670adf9 100644 --- a/config/locales/arz.yml +++ b/config/locales/arz.yml @@ -136,7 +136,6 @@ arz: download_xml: نزّل إكس إم أل edit: عدّل node: عقدة - node_title: "عقدة: %{node_name}" view_history: اعرض التاريخ node_details: coordinates: "إحداثيات:" @@ -159,7 +158,6 @@ arz: relation: download_xml: نزّل إكس إم إل relation: العلاقة - relation_title: "العلاقة: %{relation_name}" view_history: اعرض التاريخ relation_details: members: "الأعضاء:" @@ -213,7 +211,6 @@ arz: edit: عدّل view_history: اعرض التاريخ way: طريق - way_title: "طريق: %{way_name}" way_details: also_part_of: one: أيضًا جزء من الطريق %{related_ways} diff --git a/config/locales/ast.yml b/config/locales/ast.yml index 649231c674..a7a95063f4 100644 --- a/config/locales/ast.yml +++ b/config/locales/ast.yml @@ -151,7 +151,6 @@ ast: download_xml: Descargar XML edit: Editar nodiu node: Nodiu - node_title: "Nodiu: %{node_name}" view_history: Ver historial node_details: coordinates: "Coordenaes:" @@ -192,7 +191,6 @@ ast: relation: download_xml: Descargar XML relation: Rellación - relation_title: "Rellación: %{relation_name}" view_history: Ver historial relation_details: members: "Miembros:" @@ -261,7 +259,6 @@ ast: edit: Editar vía view_history: Ver historial way: Vía - way_title: "Vía: %{way_name}" way_details: also_part_of: one: parte de la vía %{related_ways} diff --git a/config/locales/az.yml b/config/locales/az.yml index 3bb767983e..d1d3119e8c 100644 --- a/config/locales/az.yml +++ b/config/locales/az.yml @@ -143,7 +143,6 @@ az: download_xml: XML kimi yüklə edit: Nöqtəni redaktə etmək node: Nöqtə - node_title: "Nöqtə: %{node_name}" view_history: Tarixçəyə bax node_details: coordinates: "Koordinatlar:" @@ -173,7 +172,6 @@ az: relation: download_xml: XML kimi yüklə relation: Əlaqə - relation_title: "Əlaqə: %{relation_name}" view_history: Tarixçəyə bax relation_details: members: "İştirakçılar:" @@ -240,7 +238,6 @@ az: edit: Xətti redaktə etmək view_history: Tarixçəyə bax way: Xətt - way_title: "Xətt: %{way_name}" way_details: also_part_of: one: "%{related_ways} xəttin tərkibindədir" diff --git a/config/locales/be-Tarask.yml b/config/locales/be-Tarask.yml index e114fd2183..95038916a5 100644 --- a/config/locales/be-Tarask.yml +++ b/config/locales/be-Tarask.yml @@ -148,7 +148,6 @@ be-Tarask: download_xml: Загрузіць XML edit: рэдагаваць node: Вузел - node_title: "Вузел: %{node_name}" view_history: паказаць гісторыю node_details: coordinates: "Каардынаты:" @@ -176,7 +175,6 @@ be-Tarask: relation: download_xml: Загрузіць XML relation: Адносіны - relation_title: "Адносіны: %{relation_name}" view_history: Праглядзець гісторыю relation_details: members: "Элемэнты:" @@ -243,7 +241,6 @@ be-Tarask: edit: Рэдагаваць дарогу view_history: Праглядзець гісторыю way: Шлях - way_title: "Шлях: %{way_name}" way_details: also_part_of: one: таксама частка дарогі %{related_ways} diff --git a/config/locales/be.yml b/config/locales/be.yml index 205fc5c1a7..d68275e02d 100644 --- a/config/locales/be.yml +++ b/config/locales/be.yml @@ -99,7 +99,6 @@ be: download: "%{download_xml_link} ці %{view_history_link}" download_xml: Сцягнуць XML node: Вузел - node_title: "Вузел: %{node_name}" view_history: прагледзіць гісторыю node_details: coordinates: "Каардынаты:" @@ -122,7 +121,6 @@ be: download: "%{download_xml_link} ці %{view_history_link}" download_xml: Сцягнуць XML relation: Сувязь - relation_title: "Сувязь: %{relation_name}" view_history: прагледзець гісторыю relation_details: members: "Удзельнікі:" @@ -168,7 +166,6 @@ be: download_xml: Сцягнуць XML view_history: прагледзець гісторыю way: Шлях - way_title: "Шлях: %{way_name}" way_details: also_part_of: one: таксама частка шляху %{related_ways} diff --git a/config/locales/bg.yml b/config/locales/bg.yml index aa5f7557e1..78b6d0a3cc 100644 --- a/config/locales/bg.yml +++ b/config/locales/bg.yml @@ -38,7 +38,6 @@ bg: download_xml: Изтегляне на XML edit: редактиране node: Възел - node_title: "Възел: %{node_name}" view_history: преглед на историята node_details: coordinates: "Координати:" diff --git a/config/locales/br.yml b/config/locales/br.yml index e6884f7108..10d0714da0 100644 --- a/config/locales/br.yml +++ b/config/locales/br.yml @@ -155,7 +155,6 @@ br: download_xml: Pellgargañ XML edit: ↓Aozañ ar skoulm node: Skoulm - node_title: "Skoulm : %{node_name}" view_history: ↓Gwelet an istor node_details: coordinates: "Daveennoù :" @@ -196,7 +195,6 @@ br: relation: download_xml: Pellgargañ XML relation: Darempred - relation_title: "Darempred : %{relation_name}" view_history: ↓Gwelet an istor relation_details: members: "Izili :" @@ -265,7 +263,6 @@ br: edit: ↓Aozañ an hent view_history: ↓Gwelet an istor way: Hent - way_title: "Hent : %{way_name}" way_details: also_part_of: one: lodenn eus an hent %{related_ways} diff --git a/config/locales/bs.yml b/config/locales/bs.yml index 42ea3a364b..430be1e0ec 100644 --- a/config/locales/bs.yml +++ b/config/locales/bs.yml @@ -153,7 +153,6 @@ bs: download_xml: Preuzmi XML edit: Urediti čvor node: Čvor - node_title: "Čvor: %{node_name}" view_history: Pregled historije node_details: coordinates: "Koordinate:" @@ -183,7 +182,6 @@ bs: relation: download_xml: Preuzeti XML relation: Relacija - relation_title: "Relacija: %{relation_name}" view_history: Pregled historije relation_details: members: "Članovi:" @@ -251,7 +249,6 @@ bs: edit: Urediti putanju view_history: Pregled historije way: Putanja - way_title: "Putanja: %{way_name}" way_details: also_part_of: one: takođe dio putanje %{related_ways} diff --git a/config/locales/ca.yml b/config/locales/ca.yml index 13b50ab46b..fe67cf13b5 100644 --- a/config/locales/ca.yml +++ b/config/locales/ca.yml @@ -170,7 +170,6 @@ ca: download_xml: Baixa l'XML edit: Modifica el node node: Node - node_title: "Node: %{node_name}" view_history: Mostra l'historial node_details: coordinates: "Coordenades:" @@ -211,7 +210,6 @@ ca: relation: download_xml: Baixa l'XML relation: Relació - relation_title: "Relació: %{relation_name}" view_history: Mostra l'historial relation_details: members: "Membres:" @@ -280,7 +278,6 @@ ca: edit: Modifica la via view_history: Mostra l'historial way: Via - way_title: "Via: %{way_name}" way_details: also_part_of: one: part de la via %{related_ways} diff --git a/config/locales/cs.yml b/config/locales/cs.yml index e38802795e..922116732b 100644 --- a/config/locales/cs.yml +++ b/config/locales/cs.yml @@ -168,7 +168,6 @@ cs: download_xml: Stáhnout XML edit: Upravit uzel node: Uzel - node_title: "Uzel: %{node_name}" view_history: Zobrazit historii node_details: coordinates: "Souřadnice:" @@ -209,7 +208,6 @@ cs: relation: download_xml: Stáhnout XML relation: Relace - relation_title: "Relace: %{relation_name}" view_history: Zobrazit historii relation_details: members: "Členové:" @@ -278,7 +276,6 @@ cs: edit: Upravit cestu view_history: Zobrazit historii way: Cesta - way_title: "Cesta: %{way_name}" way_details: also_part_of: one: patří do cesty %{related_ways} diff --git a/config/locales/da.yml b/config/locales/da.yml index 62cad941f3..a3fa69f861 100644 --- a/config/locales/da.yml +++ b/config/locales/da.yml @@ -166,7 +166,6 @@ da: download_xml: Hent XML edit: Redigér punkt node: Punkt - node_title: "Punkt: %{node_name}" view_history: Vis historik node_details: coordinates: "Koordinater:" @@ -207,7 +206,6 @@ da: relation: download_xml: Hent XML relation: Relation - relation_title: "Relation: %{relation_name}" view_history: Vis historik relation_details: members: "Medlemmer:" @@ -276,7 +274,6 @@ da: edit: Redigér vej view_history: Vis historik way: Vej - way_title: "Vej: %{way_name}" way_details: also_part_of: one: del af vejen %{related_ways} diff --git a/config/locales/de.yml b/config/locales/de.yml index f964d89982..bb8d4942b0 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -180,7 +180,6 @@ de: download_xml: XML herunterladen edit: Knoten bearbeiten node: Knoten - node_title: "Knoten: %{node_name}" view_history: Chronik anzeigen node_details: coordinates: "Koordinaten:" @@ -221,7 +220,6 @@ de: relation: download_xml: XML herunterladen relation: Relation - relation_title: "Relation: %{relation_name}" view_history: Chronik anzeigen relation_details: members: "Mitglieder:" @@ -290,7 +288,6 @@ de: edit: Weg bearbeiten view_history: Chronik anzeigen way: Weg - way_title: "Weg: %{way_name}" way_details: also_part_of: one: Teil des Wegs %{related_ways} diff --git a/config/locales/diq.yml b/config/locales/diq.yml index f93b6fa692..9e4aca7eb1 100644 --- a/config/locales/diq.yml +++ b/config/locales/diq.yml @@ -125,7 +125,6 @@ diq: download_xml: XML ron edit: Mevurne node: Qedyin - node_title: "Herun: %{node_name}" view_history: Tarixi bıvin node_details: coordinates: "Koordinati:" @@ -204,7 +203,6 @@ diq: edit: Raya vurnayışi view_history: Tarixi bıvin way: Ray - way_title: "Ray: %{way_name}" way_details: nodes: "Qedyayışi:" part_of: "Letey:" diff --git a/config/locales/dsb.yml b/config/locales/dsb.yml index b822652ead..ea6e6e98fe 100644 --- a/config/locales/dsb.yml +++ b/config/locales/dsb.yml @@ -153,7 +153,6 @@ dsb: download_xml: XML ześěgnuś edit: Suk wobźěłaś node: Nuk - node_title: "Suk: %{node_name}" view_history: Historiju pokazaś node_details: coordinates: "Koordinaty:" @@ -183,7 +182,6 @@ dsb: relation: download_xml: XML ześěgnuś relation: Relacija - relation_title: "Relacija: %{relation_name}" view_history: Historiju pokazaś relation_details: members: "Cłonki:" @@ -251,7 +249,6 @@ dsb: edit: Puś wobźěłaś view_history: Historiju pokazaś way: Puś - way_title: "Puś: %{way_name}" way_details: also_part_of: few: źěl puśow %{related_ways} diff --git a/config/locales/el.yml b/config/locales/el.yml index 9875255384..995ae20a93 100644 --- a/config/locales/el.yml +++ b/config/locales/el.yml @@ -168,7 +168,6 @@ el: download_xml: Λήψη XML edit: Επεξεργασία κόμβου node: Κόμβος - node_title: "Κόμβος: %{node_name}" view_history: Προβολή ιστορικού node_details: coordinates: "Συντεταγμένες:" @@ -209,7 +208,6 @@ el: relation: download_xml: Λήψη XML relation: Σχέση - relation_title: "Σχέση: %{relation_name}" view_history: Προβολή ιστορικού relation_details: members: "Μέλη:" @@ -279,7 +277,6 @@ el: edit: Επεξεργασία διαδρομής view_history: Προβολή ιστορικού way: Διαδρομή - way_title: "Διαδρομή: %{way_name}" way_details: also_part_of: one: μέρος της διαδρομής %{related_ways} diff --git a/config/locales/eo.yml b/config/locales/eo.yml index 83bbfea49a..ebd1ea3855 100644 --- a/config/locales/eo.yml +++ b/config/locales/eo.yml @@ -145,7 +145,6 @@ eo: download_xml: Elŝuti XML edit: Redakti nodon node: Nodo - node_title: "Nodo: %{node_name}" view_history: Vidi historion node_details: coordinates: "Koordinatoj:" @@ -178,7 +177,6 @@ eo: relation: download_xml: Elŝuti XML relation: Rilato - relation_title: "Rilato: %{relation_name}" view_history: Vidi historion relation_details: members: "Anoj:" @@ -240,7 +238,6 @@ eo: edit: Redakti vojon view_history: Vidi historion way: Vojo - way_title: "Vojo: %{way_name}" way_details: also_part_of: one: ankaŭ parto de vojo %{related_ways} diff --git a/config/locales/es.yml b/config/locales/es.yml index aee290900e..1ba240fd1c 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -172,7 +172,6 @@ es: download_xml: Descargar XML edit: Editar nodo node: Nodo - node_title: "Nodo: %{node_name}" view_history: Ver historial node_details: coordinates: "Coordenadas:" @@ -213,7 +212,6 @@ es: relation: download_xml: Descargar XML relation: Relación - relation_title: "Relación %{relation_name}:" view_history: Ver historial relation_details: members: "Miembros:" @@ -282,7 +280,6 @@ es: edit: Editar vía view_history: Ver historial way: Vía - way_title: "Vía %{way_name}:" way_details: also_part_of: one: parte del camino %{related_ways} diff --git a/config/locales/et.yml b/config/locales/et.yml index 5f6a3da928..04fd460944 100644 --- a/config/locales/et.yml +++ b/config/locales/et.yml @@ -138,7 +138,6 @@ et: download_xml: Laadi XML edit: Muuda sõlme node: sõlm - node_title: "Sõlm: %{node_name}" view_history: Vaata ajalugu node_details: coordinates: "Koordinaadid:" @@ -177,7 +176,6 @@ et: relation: download_xml: Laadi XML relation: relatsioon - relation_title: "Relatsioon: %{relation_name}" view_history: Vaata ajalugu relation_details: members: "Liikmed:" @@ -244,7 +242,6 @@ et: edit: Muuda joont view_history: Vaata ajalugu way: Joon - way_title: "Joon: %{way_name}" way_details: also_part_of: one: on osa joonest %{related_ways} diff --git a/config/locales/eu.yml b/config/locales/eu.yml index d206dff115..e9ffae095c 100644 --- a/config/locales/eu.yml +++ b/config/locales/eu.yml @@ -75,7 +75,6 @@ eu: download_xml: XML jaitsi edit: aldatu node: Nodo - node_title: "%{node_name} nodoa" view_history: historia ikusi node_details: coordinates: "Koordenatuak:" @@ -90,7 +89,6 @@ eu: relation: download_xml: XML jaitsi relation: Erlazio - relation_title: "%{relation_name} erlazioa" view_history: historia ikusi relation_details: members: "Kideak:" @@ -135,7 +133,6 @@ eu: edit: Bidea aldatu view_history: Historia ikusi way: Bide - way_title: "%{way_name} bidea" way_details: nodes: "Nodoak:" way_history: diff --git a/config/locales/fa.yml b/config/locales/fa.yml index 518927d8f1..31c56d53ab 100644 --- a/config/locales/fa.yml +++ b/config/locales/fa.yml @@ -138,7 +138,6 @@ fa: download_xml: بارگیری XML edit: ویرایش node: گره - node_title: "گره: %{node_name}" view_history: نمایش تاریخچه node_details: coordinates: "مختصات:" @@ -168,7 +167,6 @@ fa: relation: download_xml: بارگیری XML relation: ارتباط - relation_title: "ارتباطات: %{relation_name}" view_history: نمایش تاریخچه relation_details: members: "اعضا:" @@ -235,7 +233,6 @@ fa: edit: ویرایش view_history: نمایش تاریخچه way: راه - way_title: "راه: %{way_name}" way_details: also_part_of: other: "همچنین بخشی از مسیرها %{related_ways} " diff --git a/config/locales/fi.yml b/config/locales/fi.yml index 98d16b4510..43ccc942e4 100644 --- a/config/locales/fi.yml +++ b/config/locales/fi.yml @@ -166,7 +166,6 @@ fi: download_xml: Lataa XML edit: Muokkaa pistettä node: Piste - node_title: "Piste: %{node_name}" view_history: Näytä historia node_details: coordinates: "Koordinaatit:" @@ -205,7 +204,6 @@ fi: relation: download_xml: Lataa XML relation: Relaatio - relation_title: "Relaatio: %{relation_name}" view_history: Näytä historia relation_details: members: "Jäsenet:" @@ -274,7 +272,6 @@ fi: edit: Muokkaa polkua view_history: Näytä historia way: Polku - way_title: "Polku: %{way_name}" way_details: also_part_of: one: on myös osana polkua %{related_ways} diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 34d407b9d6..68451da67f 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -182,7 +182,6 @@ fr: download_xml: Télécharger en XML edit: Modifier le nœud node: Nœud - node_title: "Nœud : %{node_name}" view_history: Afficher l’historique node_details: coordinates: "Coordonnées :" @@ -223,7 +222,6 @@ fr: relation: download_xml: Télécharger en XML relation: Relation - relation_title: "Relation : %{relation_name}" view_history: Afficher l’historique relation_details: members: "Membres :" @@ -292,7 +290,6 @@ fr: edit: Modifier la route view_history: Afficher l’historique way: Chemin - way_title: "Chemin : %{way_name}" way_details: also_part_of: one: partie du chemin %{related_ways} diff --git a/config/locales/fur.yml b/config/locales/fur.yml index 434a72f10a..aaa91f1388 100644 --- a/config/locales/fur.yml +++ b/config/locales/fur.yml @@ -134,7 +134,6 @@ fur: download_xml: Discjame XML edit: Cambie il grop node: Grop - node_title: "Grop: %{node_name}" view_history: Cjale il storic node_details: coordinates: "Coordenadis:" @@ -173,7 +172,6 @@ fur: relation: download_xml: Discjame XML relation: Relazion - relation_title: "Relazion: %{relation_name}" view_history: Cjale il storic relation_details: members: "Membris:" @@ -240,7 +238,6 @@ fur: edit: Cambie la vie view_history: Cjale il storic way: Vie - way_title: "Vie: %{way_name}" way_details: also_part_of: one: part de vie %{related_ways} diff --git a/config/locales/gcf.yml b/config/locales/gcf.yml index 2c551cc0fc..8e13233a54 100644 --- a/config/locales/gcf.yml +++ b/config/locales/gcf.yml @@ -34,7 +34,6 @@ gcf: download: Chajé %{download_xml_link} ouben %{view_history_link} download_xml: Chajé XML node: Pwen - node_title: "Pwen : %{node_name}" view_history: Vwè istwa la node_details: part_of: "Adan:" diff --git a/config/locales/gl.yml b/config/locales/gl.yml index a5d32e9116..68bb9df23c 100644 --- a/config/locales/gl.yml +++ b/config/locales/gl.yml @@ -154,7 +154,6 @@ gl: download_xml: Descargar en XML edit: Editar o nodo node: Nodo - node_title: "Nodo: %{node_name}" view_history: Ver o historial node_details: coordinates: "Coordenadas:" @@ -195,7 +194,6 @@ gl: relation: download_xml: Descargar en XML relation: Relación - relation_title: "Relación: %{relation_name}" view_history: Ver o historial relation_details: members: "Membros:" @@ -264,7 +262,6 @@ gl: edit: Editar o camiño view_history: Ver o historial way: Camiño - way_title: "Camiño: %{way_name}" way_details: also_part_of: one: parte do camiño %{related_ways} diff --git a/config/locales/gsw.yml b/config/locales/gsw.yml index 6c57f26a9e..8f026570ca 100644 --- a/config/locales/gsw.yml +++ b/config/locales/gsw.yml @@ -60,7 +60,6 @@ gsw: download_xml: XML abelade edit: Bearbeite node: Chnote - node_title: "Chnote: %{node_name}" view_history: Gschicht aazeige node_details: coordinates: "Koordinate:" @@ -85,7 +84,6 @@ gsw: download: "%{download_xml_link} oder %{view_history_link}" download_xml: XML abelade relation: Relation - relation_title: "Relation: %{relation_name}" view_history: Chronik aazeige relation_details: members: "Mitglider:" @@ -145,7 +143,6 @@ gsw: edit: Bearbeite view_history: Gschicht aazeige way: Wäg - way_title: "Wäg: %{way_name}" way_details: also_part_of: one: Au Teil vum Wäg %{related_ways} diff --git a/config/locales/he.yml b/config/locales/he.yml index dd06c10827..1686bbf915 100644 --- a/config/locales/he.yml +++ b/config/locales/he.yml @@ -162,7 +162,6 @@ he: download_xml: הורדת XML edit: עריכת צומת node: צומת - node_title: "צומת: %{node_name}" view_history: צפייה בהיסטוריה node_details: coordinates: "נקודות ציון:" @@ -203,7 +202,6 @@ he: relation: download_xml: הורדת XML relation: יחס - relation_title: "יחס: %{relation_name}" view_history: צפייה בהיסטוריה relation_details: members: "איברים:" @@ -272,7 +270,6 @@ he: edit: עריכת דרך view_history: צפייה בהיסטוריה way: דרך - way_title: "דרך: %{way_name}" way_details: also_part_of: one: חלק מהדרך %{related_ways} diff --git a/config/locales/hi.yml b/config/locales/hi.yml index f9eaea97a0..49e7aecc0c 100644 --- a/config/locales/hi.yml +++ b/config/locales/hi.yml @@ -86,7 +86,6 @@ hi: download: "%{download_xml_link} या %{view_history_link}" edit: संपादन node: आसंधि - node_title: "आसंधि: %{node_name}" view_history: इतिहास देखें node_details: coordinates: "निर्देशांक:" @@ -108,7 +107,6 @@ hi: relation: download: "%{download_xml_link} या %{view_history_link}" relation: संबंध - relation_title: "संबंध: %{relation_name}" view_history: इतिहास देखें relation_details: members: "सदस्य:" @@ -157,7 +155,6 @@ hi: edit: संपादन view_history: इतिहास देखें way: रस्ता - way_title: "रास्ते का नाम: %{way_name}" way_details: nodes: "आसंधि:" part_of: "इनका हिस्सा:" diff --git a/config/locales/hr.yml b/config/locales/hr.yml index 9699ae5687..5d31839ab4 100644 --- a/config/locales/hr.yml +++ b/config/locales/hr.yml @@ -147,7 +147,6 @@ hr: download_xml: Preuzimanje XML edit: uredi node: Točka - node_title: "Točka: %{node_name}" view_history: prikaži povijest node_details: coordinates: "Koordinate:" @@ -170,7 +169,6 @@ hr: relation: download_xml: Preuzimanje XML relation: Relacija - relation_title: "Relacija: %{relation_name}" view_history: prikaži povijest relation_details: members: "Članovi:" @@ -237,7 +235,6 @@ hr: edit: uredi view_history: prikaži povijest way: Put - way_title: "Put: %{way_name}" way_details: also_part_of: one: također dio puta %{related_ways} diff --git a/config/locales/hsb.yml b/config/locales/hsb.yml index 246e8787ce..603bf27e3b 100644 --- a/config/locales/hsb.yml +++ b/config/locales/hsb.yml @@ -153,7 +153,6 @@ hsb: download_xml: XML sćahnyć edit: Suk wobdźěłać node: Suk - node_title: "Suk: %{node_name}" view_history: Stawizny pokazać node_details: coordinates: "Koordinaty:" @@ -183,7 +182,6 @@ hsb: relation: download_xml: XML sćahnyć relation: Relacija - relation_title: "Relacija: %{relation_name}" view_history: Stawizny pokazać relation_details: members: "Čłonojo:" @@ -251,7 +249,6 @@ hsb: edit: Puć wobdźěłać view_history: Stawizny pokazać way: Puć - way_title: "Puć: %{way_name}" way_details: also_part_of: few: tež dźěl pućow %{related_ways} diff --git a/config/locales/hu.yml b/config/locales/hu.yml index 2af1951bb5..52108a6548 100644 --- a/config/locales/hu.yml +++ b/config/locales/hu.yml @@ -162,7 +162,6 @@ hu: download_xml: XML letöltése edit: Pont szerkesztése node: Pont - node_title: "Pont: %{node_name}" view_history: Előzmények megtekintése node_details: coordinates: "Koordináták:" @@ -203,7 +202,6 @@ hu: relation: download_xml: XML letöltése relation: Kapcsolat - relation_title: "Kapcsolat: %{relation_name}" view_history: Előzmények megtekintése relation_details: members: "Tagok:" @@ -272,7 +270,6 @@ hu: edit: Szerkesztés view_history: Előzmények megtekintése way: Vonal - way_title: "Vonal: %{way_name}" way_details: also_part_of: one: "%{related_ways} vonal része" diff --git a/config/locales/ia.yml b/config/locales/ia.yml index 58fed2f96e..6d30c6a3a7 100644 --- a/config/locales/ia.yml +++ b/config/locales/ia.yml @@ -152,7 +152,6 @@ ia: download_xml: Discargar XML edit: Modificar nodo node: Nodo - node_title: "Nodo: %{node_name}" view_history: Vider historia node_details: coordinates: "Coordinatas:" @@ -193,7 +192,6 @@ ia: relation: download_xml: Discargar XML relation: Relation - relation_title: "Relation: %{relation_name}" view_history: Vider historia relation_details: members: "Membros:" @@ -262,7 +260,6 @@ ia: edit: Modificar via view_history: Vider historia way: Via - way_title: "Via: %{way_name}" way_details: also_part_of: one: parte del via %{related_ways} diff --git a/config/locales/id.yml b/config/locales/id.yml index caa664a332..9e25eca762 100644 --- a/config/locales/id.yml +++ b/config/locales/id.yml @@ -159,7 +159,6 @@ id: download_xml: Download XML edit: Edit node/titik node: Node/Titik - node_title: "Node/Titik: %{node_name}" view_history: Lihat riwayat node_details: coordinates: "Koordinat:" @@ -200,7 +199,6 @@ id: relation: download_xml: Download XML relation: Relasi - relation_title: "Relasi: %{relation_name}" view_history: Lihat riwayat relation_details: members: "Anggota:" @@ -269,7 +267,6 @@ id: edit: Edit way/garis view_history: Lihat riwayat way: Way/Garis - way_title: "Garis: %{way_name}" way_details: also_part_of: one: merupakan bagian dari way/garis %{related_ways} diff --git a/config/locales/is.yml b/config/locales/is.yml index 1f725a0d95..037f5702c5 100644 --- a/config/locales/is.yml +++ b/config/locales/is.yml @@ -139,7 +139,6 @@ is: download_xml: Sækja hnútinn á XML sniði edit: breyta node: Hnútur - node_title: "Hnútur: %{node_name}" view_history: sýna breytingarsögu node_details: coordinates: "Hnit:" @@ -162,7 +161,6 @@ is: relation: download_xml: Sækja á XML sniði relation: Vensl - relation_title: "Vensl: %{relation_name}" view_history: sýna breytingarsögu relation_details: members: "Stök:" @@ -227,7 +225,6 @@ is: edit: breyta view_history: sýna breytingarsögu way: Vegur - way_title: "Vegur: %{way_name}" way_details: also_part_of: one: einnig hluti af %{related_ways} diff --git a/config/locales/it.yml b/config/locales/it.yml index 0b7258eb40..2b31f334c6 100644 --- a/config/locales/it.yml +++ b/config/locales/it.yml @@ -169,7 +169,6 @@ it: download_xml: Scarica XML edit: Modifica nodo node: Nodo - node_title: "Nodo: %{node_name}" view_history: Visualizza cronologia node_details: coordinates: "Coordinate:" @@ -210,7 +209,6 @@ it: relation: download_xml: Scarica XML relation: Relazione - relation_title: "Relazione: %{relation_name}" view_history: Visualizza cronologia relation_details: members: "Membri:" @@ -279,7 +277,6 @@ it: edit: Modifica percorso view_history: Visualizza cronologia way: Percorso - way_title: "Percorso: %{way_name}" way_details: also_part_of: one: parte del percorso %{related_ways} diff --git a/config/locales/ja.yml b/config/locales/ja.yml index 73b4a831fb..a299765c3a 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -162,7 +162,6 @@ ja: download_xml: XML をダウンロード edit: ノードを編集 node: ノード - node_title: "ノード: %{node_name}" view_history: 履歴を表示 node_details: coordinates: "座標:" @@ -203,7 +202,6 @@ ja: relation: download_xml: XML をダウンロード relation: リレーション - relation_title: "リレーション: %{relation_name}" view_history: 履歴を表示 relation_details: members: "メンバー:" @@ -272,7 +270,6 @@ ja: edit: ウェイを編集 view_history: 履歴を表示 way: ウェイ - way_title: "ウェイ: %{way_name}" way_details: also_part_of: other: ウェイ %{related_ways} の一部 diff --git a/config/locales/ka.yml b/config/locales/ka.yml index 2efe55f7e9..25dd6a2bb9 100644 --- a/config/locales/ka.yml +++ b/config/locales/ka.yml @@ -121,7 +121,6 @@ ka: download_xml: გადმოწერა XML edit: კვანძის რედაქტირება node: კვანძი - node_title: "კვანძი: %{node_name}" view_history: ისტორიის ხილვა node_details: coordinates: "კოორდინატები:" @@ -157,7 +156,6 @@ ka: relation: download_xml: გადმოწერა XML relation: ურთიერთობა - relation_title: "ურთიერთობა: %{relation_name}" view_history: ისტორიის ხილვა relation_details: members: "წევრები:" @@ -216,7 +214,6 @@ ka: edit: კვანძის რედაქტირება view_history: ისტორიის ხილვა way: გზა - way_title: "გზა: %{way_name}" way_details: also_part_of: one: გზის ნაწილი %{related_ways} diff --git a/config/locales/km.yml b/config/locales/km.yml index 3741759a73..ca76536f5a 100644 --- a/config/locales/km.yml +++ b/config/locales/km.yml @@ -121,7 +121,6 @@ km: download: "%{download_xml_link} ឬ %{view_history_link}" download_xml: ទាញយក XML relation: ទំនាក់ទំនង - relation_title: ទំនាក់ទំនង៖ %{relation_name} view_history: មើលប្រវត្តិ​ relation_details: members: សមាជិក​៖ @@ -164,7 +163,6 @@ km: edit: កែប្រែ​ view_history: មើលប្រវត្តិ​ way: ផ្លូវ​ - way_title: ផ្លូវ​៖ %{way_name} way_details: also_part_of: one: ជាផ្នែកនៃ​ផ្លូវ %{related_ways} ផងដែរ​ diff --git a/config/locales/ko.yml b/config/locales/ko.yml index e2765d1113..d9b611a4e3 100644 --- a/config/locales/ko.yml +++ b/config/locales/ko.yml @@ -150,7 +150,6 @@ ko: download_xml: XML 다운로드 edit: 노드 편집 node: 노드 - node_title: "노드: %{node_name}" view_history: 내역 보기 node_details: coordinates: "좌표:" @@ -191,7 +190,6 @@ ko: relation: download_xml: XML 다운로드 relation: 관계 - relation_title: "관계: %{relation_name}" view_history: 내역 보기 relation_details: members: "멤버:" @@ -260,7 +258,6 @@ ko: edit: 길 편집 view_history: 내역 보기 way: 길 - way_title: "길: %{way_name}" way_details: also_part_of: one: "%{related_ways} 길의 일부" diff --git a/config/locales/ksh.yml b/config/locales/ksh.yml index 86e54522e3..af56a95b50 100644 --- a/config/locales/ksh.yml +++ b/config/locales/ksh.yml @@ -51,7 +51,6 @@ ksh: loading: Aam Laade … node: node: Krüzpungk - node_title: "Krüzpungk: %{node_name}" node_details: coordinates: "Ko'oodinaate:" node_history: diff --git a/config/locales/lb.yml b/config/locales/lb.yml index 0e96b8d939..3d82242c48 100644 --- a/config/locales/lb.yml +++ b/config/locales/lb.yml @@ -87,7 +87,6 @@ lb: download_xml: XML eroflueden edit: Knuet änneren node: Knuet - node_title: "Knuet: %{node_name}" view_history: Versioune weisen node_details: coordinates: "Koordinaten:" @@ -111,7 +110,6 @@ lb: relation: download_xml: XML eroflueden relation: Relatioun - relation_title: "Relatioun: %{relation_name}" view_history: Versioune weisen relation_details: members: "Memberen:" @@ -164,7 +162,6 @@ lb: edit: Wee änneren view_history: Versioune weisen way: Wee - way_title: "Wee: %{way_name}" way_details: nodes: "Kniet:" part_of: "Deel vu(n):" diff --git a/config/locales/lt.yml b/config/locales/lt.yml index 0d75b28a68..06043d7a4b 100644 --- a/config/locales/lt.yml +++ b/config/locales/lt.yml @@ -158,7 +158,6 @@ lt: download_xml: Atsisiųsti XML edit: Redaguoti tašką node: Taškas - node_title: "Taškas: %{node_name}" view_history: Rodyti istoriją node_details: coordinates: "Koordinatės:" @@ -199,7 +198,6 @@ lt: relation: download_xml: Atsisiųsti XML relation: Ryšys - relation_title: "Ryšys: %{relation_name}" view_history: Rodyti istoriją relation_details: members: "Nariai:" @@ -268,7 +266,6 @@ lt: edit: Redaguoti kelią view_history: Rodyti istoriją way: Kelias - way_title: "Kelias: %{way_name}" way_details: also_part_of: one: dalis kelio %{related_ways} diff --git a/config/locales/lv.yml b/config/locales/lv.yml index 50ce876d62..b00c861a67 100644 --- a/config/locales/lv.yml +++ b/config/locales/lv.yml @@ -160,7 +160,6 @@ lv: download_xml: Lejupielādēt XML edit: Labot punktu node: Punkts - node_title: "Punkts: %{node_name}" view_history: Skatīt vēsturi node_details: coordinates: "Koordinātas:" @@ -201,7 +200,6 @@ lv: relation: download_xml: Lejupielādēt XML relation: Relācija - relation_title: "Relācija: %{relation_name}" view_history: Skatīt vēsturi relation_details: members: "Locekļi:" @@ -270,7 +268,6 @@ lv: edit: Labot ceļu view_history: Skatīt vēsturi way: Līnija - way_title: "Līnija: %{way_name}" way_details: also_part_of: one: daļa no ceļa %{related_ways} diff --git a/config/locales/mk.yml b/config/locales/mk.yml index 400704d872..528b5463ca 100644 --- a/config/locales/mk.yml +++ b/config/locales/mk.yml @@ -152,7 +152,6 @@ mk: download_xml: Преземи XML edit: Уреди јазол node: Јазол - node_title: "Јазол: %{node_name}" view_history: Погл. историја node_details: coordinates: "Координати:" @@ -193,7 +192,6 @@ mk: relation: download_xml: Преземи XML relation: Однос - relation_title: "Однос: %{relation_name}" view_history: Погл. историја relation_details: members: "Членови:" @@ -262,7 +260,6 @@ mk: edit: Уреди пат view_history: Погл. историја way: Пат - way_title: "Пат: %{way_name}" way_details: also_part_of: one: дел од патот %{related_ways} diff --git a/config/locales/mr.yml b/config/locales/mr.yml index 711e7d3618..29d084cf0e 100644 --- a/config/locales/mr.yml +++ b/config/locales/mr.yml @@ -193,7 +193,6 @@ mr: edit: मार्गाचे संपादन करा view_history: इतिहास बघा way: मार्ग - way_title: मार्ग:%{way_name} way_details: nodes: "निस्पंद:" part_of: "चा भाग:" diff --git a/config/locales/ms.yml b/config/locales/ms.yml index e038ca9f6c..50023bf92d 100644 --- a/config/locales/ms.yml +++ b/config/locales/ms.yml @@ -146,7 +146,6 @@ ms: download_xml: Muat Turun XML edit: Sunting nod node: Nod - node_title: "Nod: %{node_name}" view_history: Lihat sejarah node_details: coordinates: "Koordinat:" @@ -187,7 +186,6 @@ ms: relation: download_xml: Muat Turun XML relation: Hubungan - relation_title: "Hubungan: %{relation_name}" view_history: Lihat sejarah relation_details: members: "Anggota:" @@ -256,7 +254,6 @@ ms: edit: Sunting jalan view_history: Lihat sejarah way: Jalan - way_title: "Jalan: %{way_name}" way_details: also_part_of: one: sebahagian daripada jalan %{related_ways} diff --git a/config/locales/nb.yml b/config/locales/nb.yml index de60aa8bee..4334d81f13 100644 --- a/config/locales/nb.yml +++ b/config/locales/nb.yml @@ -163,7 +163,6 @@ nb: download_xml: Last ned XML edit: Rediger node node: Node - node_title: "Node: %{node_name}" view_history: Vis historikk node_details: coordinates: "Koordinater:" @@ -204,7 +203,6 @@ nb: relation: download_xml: Last ned XML relation: Relasjon - relation_title: "Relasjon: %{relation_name}" view_history: Vis historikk relation_details: members: "Medlemmer:" @@ -273,7 +271,6 @@ nb: edit: Rediger vei view_history: Vis historikk way: Vei - way_title: "Vei: %{way_name}" way_details: also_part_of: one: også del av veien %{related_ways} diff --git a/config/locales/nds.yml b/config/locales/nds.yml index 6759b694b8..873962cfd5 100644 --- a/config/locales/nds.yml +++ b/config/locales/nds.yml @@ -66,7 +66,6 @@ nds: download_xml: XML dalladen edit: ännern node: Knütt - node_title: "Knütt: %{node_name}" view_history: Geschicht wiesen node_details: coordinates: "Koordinaten:" @@ -128,7 +127,6 @@ nds: edit: ännern view_history: Geschicht wiesen way: Weg - way_title: "Weg: %{way_name}" way_details: nodes: "Knütten:" part_of: "Deel von:" diff --git a/config/locales/ne.yml b/config/locales/ne.yml index 04f2d058d4..a65eba3401 100644 --- a/config/locales/ne.yml +++ b/config/locales/ne.yml @@ -48,7 +48,6 @@ ne: download_xml: " XML डाउनलोड गर्ने" edit: सम्पादन node: नोड - node_title: "नोड: %{node_name}" view_history: इतिहास हेर्ने node_details: coordinates: "अक्षांशहरु:" @@ -73,7 +72,6 @@ ne: download: "%{download_xml_link} वा %{view_history_link}" download_xml: " XML डाउनलोड गर्ने" relation: सम्बन्ध - relation_title: "सम्बन्ध: %{relation_name}" view_history: इतिहास हेर्ने relation_details: members: "सदस्यहरु:" @@ -130,7 +128,6 @@ ne: edit: सम्पादन view_history: इतिहास हेर्ने way: बाटो - way_title: "बाटो: %{way_name}" way_details: nodes: "नोडहरु:" part_of: "को खण्ड:" diff --git a/config/locales/nl.yml b/config/locales/nl.yml index 836d3de53d..8103cdbcc1 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -160,7 +160,6 @@ nl: download_xml: XML downloaden edit: Bewerken node: Node - node_title: "Node: %{node_name}" view_history: Geschiedenis weergeven node_details: coordinates: "Coördinaten:" @@ -201,7 +200,6 @@ nl: relation: download_xml: XML downloaden relation: Relatie - relation_title: "Relatie: %{relation_name}" view_history: Geschiedenis weergeven relation_details: members: "Leden:" @@ -270,7 +268,6 @@ nl: edit: Weg bewerken view_history: Geschiedenis weergeven way: Weg - way_title: "Weg: %{way_name}" way_details: also_part_of: one: onderdeel van %{related_ways} diff --git a/config/locales/nn.yml b/config/locales/nn.yml index 0f50353f30..f441740e18 100644 --- a/config/locales/nn.yml +++ b/config/locales/nn.yml @@ -166,7 +166,6 @@ nn: download_xml: Last ned XML edit: Rediger node node: Node - node_title: "Node: %{node_name}" view_history: Sjå historikken node_details: coordinates: "Koordinatar:" @@ -206,7 +205,6 @@ nn: relation: download_xml: Last ned XML relation: Relasjon - relation_title: "Relasjon: %{relation_name}" view_history: Sjå historikken relation_details: members: "Medlemmar:" @@ -276,7 +274,6 @@ nn: edit: Rediger veg view_history: Sjå historikken way: Veg - way_title: "Veg: %{way_name}" way_details: also_part_of: one: del av vegen %{related_ways} diff --git a/config/locales/oc.yml b/config/locales/oc.yml index 056d541b29..b3c31ad7cf 100644 --- a/config/locales/oc.yml +++ b/config/locales/oc.yml @@ -143,7 +143,6 @@ oc: download_xml: Telecargar XML edit: Modificar lo nosèl node: Punt - node_title: "Punt : %{node_name}" view_history: Afichar l’istoric node_details: coordinates: "Coordenadas :" @@ -184,7 +183,6 @@ oc: relation: download_xml: Telecargar en XML relation: Relacion - relation_title: "Relacion : %{relation_name}" view_history: Afichar l’istoric relation_details: members: "Membres :" @@ -251,7 +249,6 @@ oc: edit: Modificar la rota view_history: Afichar l’istoric way: Camin - way_title: "Camin : %{way_name}" way_details: also_part_of: one: partida del camin %{related_ways} diff --git a/config/locales/pa.yml b/config/locales/pa.yml index 49f836573a..5267c18e87 100644 --- a/config/locales/pa.yml +++ b/config/locales/pa.yml @@ -109,7 +109,6 @@ pa: download_xml: XML ਡਾਊਨਲੋਡ ਕਰੋ edit: ਸੋਧ ਗੱਠ node: ਨੋਡ - node_title: "ਨੋਡ: %{node_name}" view_history: ਅਤੀਤ ਵੇਖੋ node_details: coordinates: "ਧੁਰੇ:" @@ -144,7 +143,6 @@ pa: relation: download_xml: XML ਡਾਊਨਲੋਡ ਕਰੋ relation: ਸਬੰਧ - relation_title: "ਸਬੰਧ: %{relation_name}" view_history: ਅਤੀਤ ਵੇਖੋ relation_details: members: "ਮੈਂਬਰ:" diff --git a/config/locales/pl.yml b/config/locales/pl.yml index 7a1ebafb13..8e320531db 100644 --- a/config/locales/pl.yml +++ b/config/locales/pl.yml @@ -173,7 +173,6 @@ pl: download_xml: Pobierz XML edit: Edytuj węzeł node: Węzeł - node_title: "Węzeł: %{node_name}" view_history: Zobacz historię node_details: coordinates: "Współrzędne:" @@ -214,7 +213,6 @@ pl: relation: download_xml: Pobierz XML relation: Relacja - relation_title: "Relacja: %{relation_name}" view_history: Zobacz historię zmian relation_details: members: "Zawiera:" @@ -283,7 +281,6 @@ pl: edit: Edytuj view_history: Pokaż historię way: Droga - way_title: "Droga: %{way_name}" way_details: also_part_of: one: należy do drogi %{related_ways} diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml index eaaeaf448e..8386d05071 100644 --- a/config/locales/pt-BR.yml +++ b/config/locales/pt-BR.yml @@ -173,7 +173,6 @@ pt-BR: download_xml: Baixar XML edit: Editar nó node: Ponto - node_title: "Ponto: %{node_name}" view_history: Ver histórico node_details: coordinates: "Coordenadas:" @@ -214,7 +213,6 @@ pt-BR: relation: download_xml: Baixar XML relation: Relação - relation_title: "Relação: %{relation_name}" view_history: Ver histórico relation_details: members: "Membros:" @@ -284,7 +282,6 @@ pt-BR: edit: Editar caminho view_history: Ver histórico way: Caminho - way_title: "Caminho: %{way_name}" way_details: also_part_of: one: parte do caminho %{related_ways} diff --git a/config/locales/pt.yml b/config/locales/pt.yml index 8360dcdf2e..d89bbcc83d 100644 --- a/config/locales/pt.yml +++ b/config/locales/pt.yml @@ -167,7 +167,6 @@ pt: download_xml: Descarregar XML edit: Editar nó node: Nó - node_title: "Nó: %{node_name}" view_history: Ver histórico node_details: coordinates: "Coordenadas:" @@ -208,7 +207,6 @@ pt: relation: download_xml: Descarregar XML relation: Relação - relation_title: "Relação: %{relation_name}" view_history: Ver histórico relation_details: members: "Membros:" @@ -277,7 +275,6 @@ pt: edit: Editar linha view_history: Ver histórico way: Linha - way_title: "Linha: %{way_name}" way_details: also_part_of: one: parte da linha %{related_ways} diff --git a/config/locales/ro.yml b/config/locales/ro.yml index c92572ab95..b7ace49b44 100644 --- a/config/locales/ro.yml +++ b/config/locales/ro.yml @@ -141,7 +141,6 @@ ro: download_xml: Descarcă XML-ul edit: Editează nodul node: Nod - node_title: "Nod: %{node_name}" view_history: Vizualizează istoricul node_details: coordinates: "Coordonate:" @@ -171,7 +170,6 @@ ro: relation: download_xml: Descărcare XML relation: Relație - relation_title: "Relație: %{relation_name}" view_history: Vizualizează istoric relation_details: members: "Membri:" @@ -238,7 +236,6 @@ ro: edit: Editează drumul view_history: Vizualizează istoricul way: Cale - way_title: "Cale: %{way_name}" way_details: also_part_of: one: de asemenea parte din calea %{related_ways} diff --git a/config/locales/ru.yml b/config/locales/ru.yml index e9d59775b5..c7f2795efc 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -185,7 +185,6 @@ ru: download_xml: Скачать XML edit: Править точку node: Точка - node_title: "Точка: %{node_name}" view_history: Просмотр истории node_details: coordinates: "Координаты:" @@ -226,7 +225,6 @@ ru: relation: download_xml: Скачать XML relation: Отношение - relation_title: "Отношение: %{relation_name}" view_history: Просмотр истории relation_details: members: "Участники:" @@ -295,7 +293,6 @@ ru: edit: Править линию view_history: Просмотр истории way: линия - way_title: "Линия: %{way_name}" way_details: also_part_of: one: содержится в линии %{related_ways} diff --git a/config/locales/sk.yml b/config/locales/sk.yml index f3a118c70f..8c2eae73f5 100644 --- a/config/locales/sk.yml +++ b/config/locales/sk.yml @@ -162,7 +162,6 @@ sk: download_xml: Stiahnuť XML edit: Upraviť bod node: Bod - node_title: "Bod: %{node_name}" view_history: Zobraziť históriu node_details: coordinates: "Súradnice:" @@ -200,7 +199,6 @@ sk: relation: download_xml: Stiahnuť XML relation: Relácia - relation_title: "Relácia: %{relation_name}" view_history: Zobraziť históriu relation_details: members: "Členovia:" @@ -269,7 +267,6 @@ sk: edit: Upraviť cestu view_history: Zobraziť históriu way: Cesta - way_title: "Cesta: %{way_name}" way_details: also_part_of: one: časťou cesty %{related_ways} diff --git a/config/locales/sl.yml b/config/locales/sl.yml index 1790d4dd2f..40d9257d6a 100644 --- a/config/locales/sl.yml +++ b/config/locales/sl.yml @@ -160,7 +160,6 @@ sl: download_xml: prenesi XML edit: Uredi vozlišče node: Vozlišče - node_title: "Vozlišče: %{node_name}" view_history: Poglej zgodovino node_details: coordinates: "Koordinate:" @@ -201,7 +200,6 @@ sl: relation: download_xml: prenesi XML relation: Zveza - relation_title: "Zveza: %{relation_name}" view_history: Poglej zgodovino relation_details: members: "Člani:" @@ -270,7 +268,6 @@ sl: edit: Uredi pot view_history: Poglej zgodovino way: Pot - way_title: "Pot: %{way_name}" way_details: also_part_of: one: del poti %{related_ways} diff --git a/config/locales/sq.yml b/config/locales/sq.yml index 499d2232df..89ec36ecd1 100644 --- a/config/locales/sq.yml +++ b/config/locales/sq.yml @@ -153,7 +153,6 @@ sq: download_xml: Shkarko në XML edit: Redakto nyjen node: Pikë - node_title: "Pika: %{node_name}" view_history: Shiko historikun node_details: coordinates: "Koordinatat:" @@ -183,7 +182,6 @@ sq: relation: download_xml: Shkarkoje XML relation: Lidhja - relation_title: "Lidhja: %{relation_name}" view_history: Shiko historikun relation_details: members: "Anëtarët:" @@ -251,7 +249,6 @@ sq: edit: Ndrysho rrugën view_history: Shiko historikun way: Udhë - way_title: "Rruga: %{way_name}" way_details: also_part_of: one: edhe kjo asht pjes e Udhës %{related_ways} diff --git a/config/locales/sr-Latn.yml b/config/locales/sr-Latn.yml index ba8c0c95cf..e448faebbe 100644 --- a/config/locales/sr-Latn.yml +++ b/config/locales/sr-Latn.yml @@ -160,7 +160,6 @@ sr-Latn: download_xml: Preuzmi XML edit: Uredi čvor node: Čvor - node_title: "Čvor: %{node_name}" view_history: Pogledaj istoriju node_details: coordinates: "Koordinate:" @@ -190,7 +189,6 @@ sr-Latn: relation: download_xml: Preuzmi XML relation: Odnos - relation_title: "Odnos: %{relation_name}" view_history: Pogledaj istoriju relation_details: members: "Članovi:" @@ -258,7 +256,6 @@ sr-Latn: edit: Uredi putanju view_history: Pogledaj istoriju way: Putanja - way_title: "Putanja: %{way_name}" way_details: also_part_of: one: takođe deo putanje %{related_ways} diff --git a/config/locales/sr.yml b/config/locales/sr.yml index c6166292cf..837241223b 100644 --- a/config/locales/sr.yml +++ b/config/locales/sr.yml @@ -166,7 +166,6 @@ sr: download_xml: Преузми XML edit: Уреди чвор node: Чвор - node_title: "Чвор: %{node_name}" view_history: Погледај историју node_details: coordinates: "Координате:" @@ -205,7 +204,6 @@ sr: relation: download_xml: Преузми XML relation: Однос - relation_title: "Однос: %{relation_name}" view_history: Погледај историју relation_details: members: "Чланови:" @@ -274,7 +272,6 @@ sr: edit: Уреди путању view_history: Погледај историју way: Путања - way_title: "Путања: %{way_name}" way_details: also_part_of: one: такође део путање %{related_ways} diff --git a/config/locales/sv.yml b/config/locales/sv.yml index 1dddd8292d..3afe1fdbca 100644 --- a/config/locales/sv.yml +++ b/config/locales/sv.yml @@ -177,7 +177,6 @@ sv: download_xml: Ladda hem XML edit: Redigera nod node: Nod - node_title: "Nod: %{node_name}" view_history: Visa historik node_details: coordinates: "Koordinater:" @@ -218,7 +217,6 @@ sv: relation: download_xml: Ladda ner XML relation: Relation - relation_title: "Relation: %{relation_name}" view_history: Visa historik relation_details: members: "Medlemmar:" @@ -287,7 +285,6 @@ sv: edit: Redigera väg view_history: Visa historik way: Väg - way_title: "Väg: %{way_name}" way_details: also_part_of: one: del av väg %{related_ways} diff --git a/config/locales/ta.yml b/config/locales/ta.yml index aa580e1ac7..c1329be186 100644 --- a/config/locales/ta.yml +++ b/config/locales/ta.yml @@ -135,7 +135,6 @@ ta: download_xml: XML பதிவிறக்கு edit: தொகு node: சந்தி - node_title: "சந்தி: %{node_name}" view_history: வரலாற்றை பார்க்கவும் node_details: coordinates: "ஆயக்கூறுகள்:" @@ -161,7 +160,6 @@ ta: relation: download_xml: XML பதிவிறக்கு relation: தொடர்பு - relation_title: "தொடர்பு: %{relation_name}" view_history: வரலாறைப் பார்க்கவும் relation_details: members: "உறுப்பினர்கள்:" @@ -220,7 +218,6 @@ ta: edit: தொகு view_history: வரலாற்றை பார்க்கவும் way: வழி - way_title: "வழி: %{way_name}" way_details: nodes: "சந்திகள்:" way_history: diff --git a/config/locales/te.yml b/config/locales/te.yml index 5477dd1258..63ecaa992d 100644 --- a/config/locales/te.yml +++ b/config/locales/te.yml @@ -61,7 +61,6 @@ te: relation: download: "%{download_xml_link} లేదా %{view_history_link}" relation: సంబంధం - relation_title: "సంబంధం: %{relation_name}" view_history: చరిత్రని చూడండి relation_details: members: "సభ్యులు:" diff --git a/config/locales/tl.yml b/config/locales/tl.yml index ab9064914a..5caa2ba400 100644 --- a/config/locales/tl.yml +++ b/config/locales/tl.yml @@ -156,7 +156,6 @@ tl: download_xml: Ikargang paibaba ang XML edit: Baguhin ang buko node: Buko - node_title: "Buko : %{node_name}" view_history: Tingnan ang kasaysayan node_details: coordinates: "Mga tugmaang-pampook:" @@ -186,7 +185,6 @@ tl: relation: download_xml: Ikargang paibaba ang XML relation: Kaugnayan - relation_title: "Kaugnayan: %{relation_name}" view_history: Tingnan ang kasaysayan relation_details: members: "Mga kasapi:" @@ -254,7 +252,6 @@ tl: edit: Baguhin ang daan view_history: Tingnan ang kasaysayan way: Daan - way_title: "Daan: %{way_name}" way_details: also_part_of: one: bahagi rin ng daan na %{related_ways} diff --git a/config/locales/tr.yml b/config/locales/tr.yml index 90531f8d00..2c6c8ea46c 100644 --- a/config/locales/tr.yml +++ b/config/locales/tr.yml @@ -131,7 +131,6 @@ tr: node: download_xml: XML İndir node: Nokta - node_title: "Nokta: %{node_name}" view_history: Geçmişi görüntüle node_details: coordinates: "Koordinatları:" @@ -170,7 +169,6 @@ tr: relation: download_xml: XML indir relation: İlişki - relation_title: "Ilişki: %{relation_name}" view_history: Geçmişi görüntüle relation_details: members: "Elemanlar:" @@ -236,7 +234,6 @@ tr: edit: Yolunu düzenle view_history: Geçmişi görüntüle way: Yol - way_title: "Yol: %{way_name}" way_details: nodes: "Noktalar:" part_of: "Ortak parça:" diff --git a/config/locales/uk.yml b/config/locales/uk.yml index fe45a3c99f..54a91fc6dc 100644 --- a/config/locales/uk.yml +++ b/config/locales/uk.yml @@ -171,7 +171,6 @@ uk: download_xml: Завантажити XML edit: Редагувати точку node: Точка - node_title: "Точка: %{node_name}" view_history: Перегляд історії node_details: coordinates: "Координати:" @@ -212,7 +211,6 @@ uk: relation: download_xml: Завантажити XML relation: Зв’язок - relation_title: "Зв’язок: %{relation_name}" view_history: Перегляд історії relation_details: members: "Учасники:" @@ -281,7 +279,6 @@ uk: edit: Редагувати лінію view_history: Перегляд історії way: Лінія - way_title: "Лінія: %{way_name}" way_details: also_part_of: one: також є частиною лінії %{related_ways} diff --git a/config/locales/vi.yml b/config/locales/vi.yml index e00150f975..19a216fecd 100644 --- a/config/locales/vi.yml +++ b/config/locales/vi.yml @@ -154,7 +154,6 @@ vi: download_xml: Tải về XML edit: Sửa đổi nốt node: Nốt - node_title: "Nốt: %{node_name}" view_history: Xem lịch sử node_details: coordinates: "Tọa độ:" @@ -195,7 +194,6 @@ vi: relation: download_xml: Tải về XML relation: Quan hệ - relation_title: "Quan hệ: %{relation_name}" view_history: Xem lịch sử relation_details: members: "Thành viên:" @@ -264,7 +262,6 @@ vi: edit: Sửa đổi lối view_history: Xem lịch sử way: Lối - way_title: "Lối: %{way_name}" way_details: also_part_of: one: thuộc về lối %{related_ways} diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml index 89b9b7a0a0..90f62862af 100644 --- a/config/locales/zh-CN.yml +++ b/config/locales/zh-CN.yml @@ -164,7 +164,6 @@ zh-CN: download_xml: 下载 XML edit: 编辑节点 node: 节点 - node_title: 节点：%{node_name} view_history: 查看历史 node_details: coordinates: 坐标： @@ -205,7 +204,6 @@ zh-CN: relation: download_xml: 下载 XML relation: 关系 - relation_title: 关系：%{relation_name} view_history: 查看历史 relation_details: members: 成员： @@ -275,7 +273,6 @@ zh-CN: edit: 编辑路径 view_history: 查看历史 way: 路径 - way_title: 路径：%{way_name} way_details: also_part_of: 也是路径 %{related_ways} 的一部分 nodes: 节点： diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml index acbeef2b73..0b1e6d087d 100644 --- a/config/locales/zh-TW.yml +++ b/config/locales/zh-TW.yml @@ -158,7 +158,6 @@ zh-TW: download_xml: 下載 XML edit: 編輯節點 node: 節點 - node_title: 節點： %{node_name} view_history: 檢視歷史 node_details: coordinates: 座標： @@ -196,7 +195,6 @@ zh-TW: relation: download_xml: 下載 XML relation: 關係 - relation_title: 關係： %{relation_name} view_history: 檢視歷史 relation_details: members: 成員： @@ -265,7 +263,6 @@ zh-TW: edit: 編輯路徑 view_history: 檢視歷史 way: 路徑 - way_title: 路徑： %{way_name} way_details: also_part_of: one: 也是路徑 %{related_ways} 的一部分 From ca98e8d11b1e3ff58d48235f901a0a4db3f0c4d0 Mon Sep 17 00:00:00 2001 From: Dan Stowell Date: Tue, 8 Oct 2013 22:10:09 +0100 Subject: [PATCH 21/28] fix previous linebreak commit so it looks good on the history pages too --- app/assets/stylesheets/common.css.scss | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss index 7cf06f04db..f92afce913 100644 --- a/app/assets/stylesheets/common.css.scss +++ b/app/assets/stylesheets/common.css.scss @@ -1228,9 +1228,10 @@ ul.results-list li { border-bottom: 1px solid #ccc; } margin-top: $lineheight/2; margin-bottom: 0px; } - div.edit_summary_chunk { - display: inline-block; - } +} + +.edit_summary_chunk { + display: inline-block; } /* Rules for small maps in content areas */ From 8348c4e285d6e1d6890f98a50618e7c5e185de8c Mon Sep 17 00:00:00 2001 From: Dan Stowell Date: Tue, 8 Oct 2013 22:10:44 +0100 Subject: [PATCH 22/28] browse page: don't show edit summary stats if redacted --- app/views/browse/_common_editsummary.html.erb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/views/browse/_common_editsummary.html.erb b/app/views/browse/_common_editsummary.html.erb index d58296a7ec..28553c2ffa 100644 --- a/app/views/browse/_common_editsummary.html.erb +++ b/app/views/browse/_common_editsummary.html.erb @@ -1,3 +1,4 @@ +<% if !common_editsummary.redacted? %>
        <% @agohtml = "%s" % [l(common_editsummary.timestamp), t('browse.common_details.ago', :time_in_words_ago => time_ago_in_words(common_editsummary.timestamp))] @@ -21,4 +22,4 @@ if common_editsummary.changeset.user.data_public? ·
        <%= raw t 'browse.common_details.version_in_changeset', :version => common_editsummary.version, :changeset => link_to(common_editsummary.changeset_id, :action => :changeset, :id => common_editsummary.changeset_id) %>
        - +<% end %> From 3af7c2ab3d98c0873ca0dca09ae1fd83d1c38d36 Mon Sep 17 00:00:00 2001 From: Dan Stowell Date: Tue, 8 Oct 2013 23:05:31 +0100 Subject: [PATCH 23/28] browse page: update tests for redactions --- app/views/browse/_node_details.html.erb | 2 +- app/views/browse/_relation_details.html.erb | 2 +- app/views/browse/_way_details.html.erb | 2 +- test/functional/browse_controller_test.rb | 29 ++++++++++++--------- 4 files changed, 19 insertions(+), 16 deletions(-) diff --git a/app/views/browse/_node_details.html.erb b/app/views/browse/_node_details.html.erb index 1e8dace8b5..8734de9826 100644 --- a/app/views/browse/_node_details.html.erb +++ b/app/views/browse/_node_details.html.erb @@ -1,6 +1,6 @@
        <% if node_details.redacted? %> -
        +
        <%= t 'browse.redacted.message_html', :type => t('browse.redacted.type.node'), :redaction_link => link_to(t('browse.redacted.redaction', :id => node_details.redaction.id), node_details.redaction), :version => node_details.version %>
        <% else %> diff --git a/app/views/browse/_relation_details.html.erb b/app/views/browse/_relation_details.html.erb index 1c0f4c93c0..d39f63ad7e 100644 --- a/app/views/browse/_relation_details.html.erb +++ b/app/views/browse/_relation_details.html.erb @@ -1,6 +1,6 @@
        <% if relation_details.redacted? %> -
        +
        <%= t 'browse.redacted.message_html', :type => t('browse.redacted.type.relation'), :redaction_link => link_to(t('browse.redacted.redaction', :id => relation_details.redaction.id), relation_details.redaction), :version => relation_details.version %><
        <% else %> diff --git a/app/views/browse/_way_details.html.erb b/app/views/browse/_way_details.html.erb index 6bff887b3c..f0c6341cc8 100644 --- a/app/views/browse/_way_details.html.erb +++ b/app/views/browse/_way_details.html.erb @@ -1,6 +1,6 @@
        <% if way_details.redacted? %> -
        +
        <%= t 'browse.redacted.message_html', :type => t('browse.redacted.type.way'), :redaction_link => link_to(t('browse.redacted.redaction', :id => way_details.redaction.id), way_details.redaction), :version => way_details.version %>
        <% else %> diff --git a/test/functional/browse_controller_test.rb b/test/functional/browse_controller_test.rb index 87a3e74896..80d973dc01 100644 --- a/test/functional/browse_controller_test.rb +++ b/test/functional/browse_controller_test.rb @@ -93,9 +93,10 @@ def test_redacted_node_history # there are 2 revisions of the redacted node, but only one # should be showing details here. - assert_select "body div#content div.browse_details", 2 - assert_select "body div#content div.browse_details[id=1] div.common", 0 - assert_select "body div#content div.browse_details[id=2] div.common", 1 + assert_select "body div#content div.browse_details", 4 + assert_select "body div#content div.browse_details[id=1] div.redacted", 1 + assert_select "body div#content div.browse_details[id=1] div.geo", 0 + assert_select "body div#content div.browse_details[id=2] div.redacted", 0 end def test_redacted_way_history @@ -105,11 +106,13 @@ def test_redacted_way_history # there are 4 revisions of the redacted way, but only 2 # should be showing details here. - assert_select "body div#content div.browse_details", 4 - assert_select "body div#content div.browse_details[id=1] div.common", 1 - assert_select "body div#content div.browse_details[id=2] div.common", 0 - assert_select "body div#content div.browse_details[id=3] div.common", 0 - assert_select "body div#content div.browse_details[id=4] div.common", 1 + assert_select "body div#content div.browse_details", 8 + assert_select "body div#content div.browse_details[id=1] div.redacted", 0 + assert_select "body div#content div.browse_details[id=2] div.redacted", 1 + assert_select "body div#content div.browse_details[id=2] ul", 0 + assert_select "body div#content div.browse_details[id=3] div.redacted", 1 + assert_select "body div#content div.browse_details[id=3] ul", 0 + assert_select "body div#content div.browse_details[id=4] div.redacted", 0 end def test_redacted_relation_history @@ -119,11 +122,11 @@ def test_redacted_relation_history # there are 4 revisions of the redacted relation, but only 2 # should be showing details here. - assert_select "body div#content div.browse_details", 4 - assert_select "body div#content div.browse_details[id=1] div.common", 1 - assert_select "body div#content div.browse_details[id=2] div.common", 0 - assert_select "body div#content div.browse_details[id=3] div.common", 0 - assert_select "body div#content div.browse_details[id=4] div.common", 1 + assert_select "body div#content div.browse_details", 8 + assert_select "body div#content div.browse_details[id=1] div.redacted", 0 + assert_select "body div#content div.browse_details[id=2] div.redacted", 1 + assert_select "body div#content div.browse_details[id=3] div.redacted", 1 + assert_select "body div#content div.browse_details[id=4] div.redacted", 0 end # This is a convenience method for most of the above checks From b94c1c78df755a3b83293e7c9bbd39b6972c7dab Mon Sep 17 00:00:00 2001 From: Dan Stowell Date: Sun, 27 Oct 2013 21:31:23 +0000 Subject: [PATCH 24/28] browse page: move changeset's when+who info into heading, matching the others --- app/views/browse/_changeset_details.html.erb | 19 ------------------- app/views/browse/changeset.html.erb | 15 +++++++++++++++ config/locales/en.yml | 2 ++ 3 files changed, 17 insertions(+), 19 deletions(-) diff --git a/app/views/browse/_changeset_details.html.erb b/app/views/browse/_changeset_details.html.erb index 8147ea20d8..419ffa4a57 100644 --- a/app/views/browse/_changeset_details.html.erb +++ b/app/views/browse/_changeset_details.html.erb @@ -1,24 +1,5 @@
        -
        -
        -

        <%= t 'browse.changeset_details.created_at' %>

        -

        <%= l changeset_details.created_at %>

        -
        - -
        -

        <%= t 'browse.changeset_details.closed_at' %>

        -

        <%= l changeset_details.closed_at %>

        -
        - - <% if changeset_details.user.data_public? %> -
        -

        <%= t 'browse.changeset_details.belongs_to' %>

        -

        <%= link_to h(changeset_details.user.display_name), :controller => "user", :action => "view", :display_name => changeset_details.user.display_name %>

        -
        - <% end %> -
        - <%= render :partial => "tag_details", :object => changeset_details %>
        diff --git a/app/views/browse/changeset.html.erb b/app/views/browse/changeset.html.erb index 5d3e3058cf..4b24e9b201 100644 --- a/app/views/browse/changeset.html.erb +++ b/app/views/browse/changeset.html.erb @@ -5,6 +5,21 @@ <% content_for :heading do %>

        <%= t 'browse.changeset.changeset', :id => @changeset.id %>

        <%= render :partial => "navigation" %> + +
        <% + # this div is analogous to _common_editsummary.html.erb +@createdagohtml = "%s" % [l(@changeset.created_at), t('browse.common_details.ago', :time_in_words_ago => time_ago_in_words(@changeset.created_at))] +@closedagohtml = "%s" % [l(@changeset.closed_at), t('browse.common_details.ago', :time_in_words_ago => time_ago_in_words(@changeset.closed_at ))] + +if @changeset.user.data_public? + @userhtml = link_to h(@changeset.user.display_name), :controller => "user", :action => "view", :display_name => @changeset.user.display_name %> + <%= raw t 'browse.changeset.created_closed_ago_by', :created_in_words_ago => @createdagohtml, :closed_in_words_ago => @closedagohtml, :user => @userhtml %> +<% else %> + <%= raw t 'browse.changeset.created_closed_ago', :created_in_words_ago => @createdagohtml, :closed_in_words_ago => @closedagohtml %> +<% end %> +
        + + <% end %> <% if @changeset.has_valid_bbox? %> diff --git a/config/locales/en.yml b/config/locales/en.yml index e60aa5a4c5..d4c0669f81 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -102,6 +102,8 @@ en: changeset: "Changeset: %{id}" changesetxml: "Changeset XML" osmchangexml: "osmChange XML" + created_closed_ago_by: "Created %{created_in_words_ago}, closed %{closed_in_words_ago}, by %{user}" + created_closed_ago: "Created %{created_in_words_ago}, closed %{closed_in_words_ago}" feed: title: "Changeset %{id}" title_comment: "Changeset %{id} - %{comment}" From 471bc629f4c16d31771e4f8a0ee5aad0aafa339f Mon Sep 17 00:00:00 2001 From: Dan Stowell Date: Mon, 28 Oct 2013 22:56:44 +0000 Subject: [PATCH 25/28] browse page: fix misaligned "Comment" heading --- app/views/browse/_common_details.html.erb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/views/browse/_common_details.html.erb b/app/views/browse/_common_details.html.erb index f31787b6a2..655cee969c 100644 --- a/app/views/browse/_common_details.html.erb +++ b/app/views/browse/_common_details.html.erb @@ -3,8 +3,10 @@
        <%= render :partial => "tag_details", :object => common_details %> <% if common_details.changeset.tags['comment'].present? %> +

        <%= t 'browse.common_details.changeset_comment' %>

        <%= linkify(h(common_details.changeset.tags['comment'])) %>

        +
        <% end %>
        From 2e043a39511336e9aa859d01ec41524688d5c6db Mon Sep 17 00:00:00 2001 From: Dan Stowell Date: Sun, 3 Nov 2013 09:55:21 +0000 Subject: [PATCH 26/28] browse page: historylink inside versioninchangeset (not working for history pages yet) --- app/views/browse/_common_editsummary.html.erb | 2 +- app/views/browse/node.html.erb | 5 +---- app/views/browse/relation.html.erb | 5 +---- app/views/browse/way.html.erb | 4 +--- config/locales/en.yml | 8 ++++---- 5 files changed, 8 insertions(+), 16 deletions(-) diff --git a/app/views/browse/_common_editsummary.html.erb b/app/views/browse/_common_editsummary.html.erb index 28553c2ffa..e188784e8b 100644 --- a/app/views/browse/_common_editsummary.html.erb +++ b/app/views/browse/_common_editsummary.html.erb @@ -21,5 +21,5 @@ if common_editsummary.changeset.user.data_public? · -
        <%= raw t 'browse.common_details.version_in_changeset', :version => common_editsummary.version, :changeset => link_to(common_editsummary.changeset_id, :action => :changeset, :id => common_editsummary.changeset_id) %>
        +
        <%= raw t 'browse.common_details.version_in_changeset', :version => common_editsummary.version, :changeset => link_to(common_editsummary.changeset_id, :action => :changeset, :id => common_editsummary.changeset_id), :historylink => historylink %>
        <% end %> diff --git a/app/views/browse/node.html.erb b/app/views/browse/node.html.erb index 3a547c85c4..619b4de70d 100644 --- a/app/views/browse/node.html.erb +++ b/app/views/browse/node.html.erb @@ -10,10 +10,7 @@

        <%= @name %>

        <%= render :partial => "navigation" %> - <%= render :partial => "common_editsummary", :object => @node %> - -
        (<%= link_to(t('browse.node.view_history'), :action => "node_history") %>)
        - + <%= render :partial => "common_editsummary", :object => @node, :locals => {historylink: link_to(t('browse.node.view_history'), :action => "node_history")} %> <% end %> <% if @node.visible -%> <%= render :partial => "map", :object => @node %> diff --git a/app/views/browse/relation.html.erb b/app/views/browse/relation.html.erb index f7a84aa6ba..abf76f1f94 100644 --- a/app/views/browse/relation.html.erb +++ b/app/views/browse/relation.html.erb @@ -10,10 +10,7 @@

        <%= @name %>

        <%= render :partial => "navigation" %> - <%= render :partial => "common_editsummary", :object => @relation %> - -
        (<%= link_to(t('browse.relation.view_history'), :action => "relation_history") %>)
        - + <%= render :partial => "common_editsummary", :object => @relation, :locals => {historylink: link_to(t('browse.relation.view_history'), :action => "relation_history")} %> <% end %> <%= render :partial => "map", :object => @relation %> diff --git a/app/views/browse/way.html.erb b/app/views/browse/way.html.erb index 9540269a95..9d97bbc4d8 100644 --- a/app/views/browse/way.html.erb +++ b/app/views/browse/way.html.erb @@ -10,9 +10,7 @@

        <%= @name %>

        <%= render :partial => "navigation" %> - <%= render :partial => "common_editsummary", :object => @way %> - -
        (<%= link_to(t('browse.way.view_history'), :action => "way_history") %>)
        + <%= render :partial => "common_editsummary", :object => @way, :locals => {historylink: link_to(t('browse.way.view_history'), :action => "way_history")} %> <% end %> <%= render :partial => "map", :object => @way %> diff --git a/config/locales/en.yml b/config/locales/en.yml index d4c0669f81..0a7f9c356e 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -153,7 +153,7 @@ en: edited_ago: "Edited %{time_in_words_ago}" deleted_ago_by: "Deleted %{time_in_words_ago} by %{user}" deleted_ago: "Deleted %{time_in_words_ago}" - version_in_changeset: "Version %{version} in changeset %{changeset}" + version_in_changeset: "Version %{version} (%{historylink}) in changeset %{changeset}" changeset_comment: "Comment:" containing_relation: entry: "Relation %{relation_name}" @@ -184,7 +184,7 @@ en: node: node: "Node" download_xml: "Download XML" - view_history: "View history" + view_history: "view history" edit: "Edit node" not_found: sorry: "Sorry, the %{type} with the id %{id}, could not be found." @@ -228,7 +228,7 @@ en: relation: relation: "Relation" download_xml: "Download XML" - view_history: "View history" + view_history: "view history" start_rjs: notes_layer_name: "Browse Notes" data_layer_name: "Browse Map Data" @@ -287,7 +287,7 @@ en: way: way: "Way" download_xml: "Download XML" - view_history: "View history" + view_history: "view history" edit: "Edit way" note: title: "Note" From 19469ede46d740473061b689b4aee3790a758cb7 Mon Sep 17 00:00:00 2001 From: Dan Stowell Date: Sun, 3 Nov 2013 10:24:30 +0000 Subject: [PATCH 27/28] browse page: history link in version text --- app/views/browse/_common_editsummary.html.erb | 11 ++++++++++- app/views/browse/node.html.erb | 2 +- app/views/browse/relation.html.erb | 2 +- app/views/browse/way.html.erb | 2 +- config/locales/en.yml | 5 ++++- 5 files changed, 17 insertions(+), 5 deletions(-) diff --git a/app/views/browse/_common_editsummary.html.erb b/app/views/browse/_common_editsummary.html.erb index e188784e8b..567c099ecc 100644 --- a/app/views/browse/_common_editsummary.html.erb +++ b/app/views/browse/_common_editsummary.html.erb @@ -21,5 +21,14 @@ if common_editsummary.changeset.user.data_public? · -
        <%= raw t 'browse.common_details.version_in_changeset', :version => common_editsummary.version, :changeset => link_to(common_editsummary.changeset_id, :action => :changeset, :id => common_editsummary.changeset_id), :historylink => historylink %>
        + <% if defined? historyaction %> +
        <%= link_to(t('browse.common_details.version', :version => common_editsummary.version), url_for(:action => historyaction)) %>
        + <% else %> +
        <%= t 'browse.common_details.version', :version => common_editsummary.version %>
        + <% end %> + + · + +
        <%= raw t 'browse.common_details.in_changeset', :changeset => link_to(common_editsummary.changeset_id, :action => :changeset, :id => common_editsummary.changeset_id) %>
        + <% end %> diff --git a/app/views/browse/node.html.erb b/app/views/browse/node.html.erb index 619b4de70d..7a0016ec0b 100644 --- a/app/views/browse/node.html.erb +++ b/app/views/browse/node.html.erb @@ -10,7 +10,7 @@

        <%= @name %>

        <%= render :partial => "navigation" %> - <%= render :partial => "common_editsummary", :object => @node, :locals => {historylink: link_to(t('browse.node.view_history'), :action => "node_history")} %> + <%= render :partial => "common_editsummary", :object => @node, :locals => {historyaction: "node_history"} %> <% end %> <% if @node.visible -%> <%= render :partial => "map", :object => @node %> diff --git a/app/views/browse/relation.html.erb b/app/views/browse/relation.html.erb index abf76f1f94..9b672db1d2 100644 --- a/app/views/browse/relation.html.erb +++ b/app/views/browse/relation.html.erb @@ -10,7 +10,7 @@

        <%= @name %>

        <%= render :partial => "navigation" %> - <%= render :partial => "common_editsummary", :object => @relation, :locals => {historylink: link_to(t('browse.relation.view_history'), :action => "relation_history")} %> + <%= render :partial => "common_editsummary", :object => @relation, :locals => {historyaction: "relation_history"} %> <% end %> <%= render :partial => "map", :object => @relation %> diff --git a/app/views/browse/way.html.erb b/app/views/browse/way.html.erb index 9d97bbc4d8..8774b7ba2a 100644 --- a/app/views/browse/way.html.erb +++ b/app/views/browse/way.html.erb @@ -10,7 +10,7 @@

        <%= @name %>

        <%= render :partial => "navigation" %> - <%= render :partial => "common_editsummary", :object => @way, :locals => {historylink: link_to(t('browse.way.view_history'), :action => "way_history")} %> + <%= render :partial => "common_editsummary", :object => @way, :locals => {historyaction: "way_history"} %> <% end %> <%= render :partial => "map", :object => @way %> diff --git a/config/locales/en.yml b/config/locales/en.yml index 0a7f9c356e..a56a0885b1 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -153,8 +153,11 @@ en: edited_ago: "Edited %{time_in_words_ago}" deleted_ago_by: "Deleted %{time_in_words_ago} by %{user}" deleted_ago: "Deleted %{time_in_words_ago}" - version_in_changeset: "Version %{version} (%{historylink}) in changeset %{changeset}" + version_in_changeset: "Version %{version} in changeset %{changeset}" + version: "Version %{version}" + in_changeset: "In changeset %{changeset}" changeset_comment: "Comment:" + view_history: "View history" containing_relation: entry: "Relation %{relation_name}" entry_role: "Relation %{relation_name} (as %{relation_role})" From a634f12b0ff534b40d366f881a0b8f38b656e329 Mon Sep 17 00:00:00 2001 From: Dan Stowell Date: Mon, 4 Nov 2013 07:48:11 +0000 Subject: [PATCH 28/28] browse page: "View history" title for version link --- app/views/browse/_common_editsummary.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/browse/_common_editsummary.html.erb b/app/views/browse/_common_editsummary.html.erb index 567c099ecc..4a2ff412ab 100644 --- a/app/views/browse/_common_editsummary.html.erb +++ b/app/views/browse/_common_editsummary.html.erb @@ -22,7 +22,7 @@ if common_editsummary.changeset.user.data_public? · <% if defined? historyaction %> -
        <%= link_to(t('browse.common_details.version', :version => common_editsummary.version), url_for(:action => historyaction)) %>
        +
        <%= link_to(t('browse.common_details.version', :version => common_editsummary.version), url_for(:action => historyaction), :title => t('browse.common_details.view_history')) %>
        <% else %>
        <%= t 'browse.common_details.version', :version => common_editsummary.version %>
        <% end %>