Fixed up the <title>/<h2> mess in trace/edit and trace/view

 * @title was never set on trace editing, and thus <h2></h2> was produced
 * Changed split 'trace.view.viewing_trace' into 'trace.view.title' and 'trace.view.heading'
 * Introduced corresponding 'trace.edit.title' and 'trace.edit.heading'

diff --git a/app/controllers/trace_controller.rb b/app/controllers/trace_controller.rb
index 667f8577402cc822a2afe19b8947c9b49e57f87f..17b66796923f9e4021bb29a93733913e99f95fdc 100644 (file)
--- a/app/controllers/trace_controller.rb
+++ b/app/controllers/trace_controller.rb
@@ -111,7 +111,7 @@ class TraceController < ApplicationController
 
     if @trace and @trace.visible? and
        (@trace.public? or @trace.user == @user)
-      @title = t 'trace.view.viewing_trace', :name => @trace.name
+      @title = t 'trace.view.title', :name => @trace.name
     else
       flash[:notice] = t 'trace.view.trace_not_found'
       redirect_to :controller => 'trace', :action => 'list'
@@ -168,6 +168,7 @@ class TraceController < ApplicationController
     @trace = Trace.find(params[:id])
 
     if @user and @trace.user == @user
+      @title = t 'trace.edit.title', :name => @trace.name
       if params[:trace]
         @trace.description = params[:trace][:description]
         @trace.tagstring = params[:trace][:tagstring]

diff --git a/app/views/trace/edit.html.erb b/app/views/trace/edit.html.erb
index d3b655cc467b83fc79ebaedbdcd35be2b039d183..d8fc46f3e3755759bb665263a7fb3ce5fc662a2b 100644 (file)
--- a/app/views/trace/edit.html.erb
+++ b/app/views/trace/edit.html.erb
@@ -1,4 +1,4 @@
-<h2><%= h(@title) %></h2>
+<h2><%= t 'trace.edit.heading', :name => @trace.name %></h2>
 
 <img src="<%= url_for :controller => 'trace', :action => 'picture', :id => @trace.id, :display_name => @trace.user.display_name %>">
 

diff --git a/app/views/trace/view.html.erb b/app/views/trace/view.html.erb
index 65957b45da563b87dcf935a0daa774a5af91e4f0..80733844db285c7a9f107465248f3ff32ce1233f 100644 (file)
--- a/app/views/trace/view.html.erb
+++ b/app/views/trace/view.html.erb
@@ -1,4 +1,4 @@
-<h2><%= h(@title) %></h2>
+<h2><%= t 'trace.view.heading', :name => @trace.name %></h2>
 
   <% if @trace.inserted %>
     <img src="<%= url_for :controller => 'trace', :action => 'picture', :id => @trace.id, :display_name => @trace.user.display_name %>">

diff --git a/config/locales/be.yml b/config/locales/be.yml
index 2b1516e5da0e33131e64917f50aae6262e7528c1..000a70be92ba3d9feceb3d3237026bbf86689a47 100644 (file)
--- a/config/locales/be.yml
+++ b/config/locales/be.yml
@@ -485,7 +485,7 @@ be:
       make_public: "Зрабіць гэты трэк агульнадаступным назаўсёды"
       edit_track: "Змяніць бягучы трэк"
       delete_track: "Выдаліць гэты трэк"
-      viewing_trace: "Прагляд трэку {{name}}"
+      heading: "Прагляд трэку {{name}}"
       trace_not_found: "Трэк не знойдзены!"
     trace_paging_nav:
       showing: "Прагляд старонкі"

diff --git a/config/locales/de.yml b/config/locales/de.yml
index ab95e5b2ca14b417b9c3f94b4e26a1f261b0c6fb..69c0aced79f51f31fef212a9e64405bbf226af64 100644 (file)
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -616,7 +616,7 @@ de:
       make_public: "Mache diesen Track öffentlich"
       edit_track: "Diesen Track bearbeiten"
       delete_track: "Diesen Track löschen"
-      viewing_trace: "Track {{name}} betrachten"
+      heading: "Track {{name}} betrachten"
       trace_not_found: "Track nicht gefunden!"
     trace_paging_nav:
       showing: "Zeige Seite"

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 8bd0f085fbf16e0bdad25e1e22adb1581c3523ad..1bf9048e560daaed252ba0dfc306c6c4cfb49512 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -572,6 +572,8 @@ en:
       upload_trace: "Upload GPS Trace"
       trace_uploaded: "Your GPX file has been uploaded and is awaiting insertion in to the database. This will usually happen within half an hour, and an email will be sent to you on completion."
     edit:
+      title: "Editing trace {{name}}"
+      heading: "Editing trace {{name}}"
       filename: "Filename:"
       download: "download"
       uploaded_at: "Uploaded at:"
@@ -602,6 +604,8 @@ en:
     trace_optionals:
       tags: "Tags"
     view:
+      title: "Viewing trace {{name}}"
+      heading: "Viewing trace {{name}}"
       pending: "PENDING"
       filename: "Filename:"
       download: "download"
@@ -617,7 +621,6 @@ en:
       make_public: "Make this track public permanently"
       edit_track: "Edit this track"
       delete_track: "Delete this track"
-      viewing_trace: "Viewing trace {{name}}"
       trace_not_found: "Trace not found!"
     trace_paging_nav:
       showing: "Showing page"

diff --git a/config/locales/es.yml b/config/locales/es.yml
index d0a1d28d1339b305333705658e632580d606df45..26ff065b02c5b181d90ef6876bca4f90e8099902 100644 (file)
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -551,7 +551,7 @@ es:
       make_public: "Hacer esta traza pública de forma permanente"
       edit_track: "Editar esta traza"
       delete_track: "Borrar esta traza"
-      viewing_trace: "Viendo traza {{name}}"
+      heading: "Viendo traza {{name}}"
       trace_not_found: "¡No se ha encontrado la traza!"
     trace_paging_nav:
       showing: "Mostrando página"

diff --git a/config/locales/he.yml b/config/locales/he.yml
index 57e238396b14782fdbba6126fc43e65797ea6cf6..94c49602914bed30028d5176e6c160ec698a0fee 100644 (file)
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -488,7 +488,7 @@ he:
       make_public: "Make this track public permanently"
       edit_track: "Edit this track"
       delete_track: "Delete this track"
-      viewing_trace: "Viewing trace {{name}}"
+      heading: "Viewing trace {{name}}"
       trace_not_found: "Trace not found!"
     trace_paging_nav:
       showing: "Showing page"

diff --git a/config/locales/hi.yml b/config/locales/hi.yml
index 93b565892294bfc9b83a08f0fecca2d06a759eca..ee2c5ef2835e7a94b3aaef6262aa6246f1d2cdcf 100644 (file)
--- a/config/locales/hi.yml
+++ b/config/locales/hi.yml
@@ -552,7 +552,7 @@ hi:
       make_public: "Make this track public permanently"
       edit_track: "Edit this track"
       delete_track: "Delete this track"
-      viewing_trace: "Viewing trace {{name}}"
+      heading: "Viewing trace {{name}}"
       trace_not_found: "Trace not found!"
     trace_paging_nav:
       showing: "Showing page"

diff --git a/config/locales/it.yml b/config/locales/it.yml
index 869d467bea6815c5f18c47682680f4f6a66910de..200a5aa2f11080aeb29512c2f692ab35993f99f6 100644 (file)
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -486,7 +486,7 @@ it:
       make_public: "Rendi pubblico questo tracciato in modo permanente"
       edit_track: "Modifica questo tracciato"
       delete_track: "Elimina questo tracciato"
-      viewing_trace: "Visualizzazione del tracciato {{name}}"
+      heading: "Visualizzazione del tracciato {{name}}"
       trace_not_found: "Tracciato non trovato!"
     trace_paging_nav:
       showing: "Visualizzata la pagina"

diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 069999db657bfb6d6d191818de50befdfbf82aec..7f76c30b44769461bd4be6b245af78632b4ad639 100644 (file)
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -618,7 +618,7 @@ ja:
       make_public: "このトラックを今後公開する"
       edit_track: "このトラックの編集"
       delete_track: "このトラックの削除"
-      viewing_trace: "トレース{{name}}の表示"
+      heading: "トレース{{name}}の表示"
       trace_not_found: "トレースが見つかりません!"
     trace_paging_nav:
       showing: "ページ表示"

diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 332804274364dee746e4214ef824e8774f7e807d..1bb75ac50fabeeb6de8c54c72b1abedae4538ab1 100644 (file)
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -614,7 +614,7 @@ ko:
       make_public: "Make this track public permanently"
       edit_track: "Edit this track"
       delete_track: "Delete this track"
-      viewing_trace: "Viewing trace {{name}}"
+      heading: "Viewing trace {{name}}"
       trace_not_found: "Trace not found!"
     trace_paging_nav:
       showing: "Showing page"

diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 90fdc0e095eea57ac410e5b7ccc6fbab04fa630d..87f588f6e0dea3e8e4e7bb20a6d54030d53013d7 100644 (file)
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -486,7 +486,7 @@ nl:
       make_public: "Deze track permanent openbaar maken"
       edit_track: "Deze track bewerken"
       delete_track: "Deze track wissen"
-      viewing_trace: "Track {{name}} bekijken"
+      heading: "Track {{name}} bekijken"
       trace_not_found: "Track niet gevonden!"
     trace_paging_nav:
       showing: "Pagina"

diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 8ca69e7d7c8f9a8c8c94c3e14b3c8436aa02290b..17afacacfd48585ce8e54dfb0c5441014f7ce13e 100644 (file)
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -500,7 +500,7 @@ pl:
       make_public: "Na stałe oznacz ten ślad jako publiczny"
       edit_track: "Edytuj ten ślad"
       delete_track: "Wykasuj ten ślad"
-      viewing_trace: "Przeglądanie śladu {{name}}"
+      heading: "Przeglądanie śladu {{name}}"
       trace_not_found: "Ślad nie znaleziony!"
     trace_paging_nav:
       showing: "Widoczna jest strona"

diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index 1e9d64dbf394a7f69b298677d969832715cc4855..e53dd88335730ccc3be1ccabd1b7e33461e124e7 100644 (file)
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -614,7 +614,7 @@ OpenStreetMap em:"
       make_public: "Torne esta trilha permanentemente pública"
       edit_track: "Edite esta trilha"
       delete_track: "Apague esta trilha"
-      viewing_trace: "Visualizando trilha {{name}}"
+      heading: "Visualizando trilha {{name}}"
       trace_not_found: "Trilha não encontrada!"
     trace_paging_nav:
       showing: "Mostrando página"

diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 544a1d187c0bfee608efe4aa54fb3794a2edd125..a4022ddc4d1bed38ff8518b28b07d29c36ea9f8d 100644 (file)
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -486,7 +486,7 @@ ru:
       make_public: "Сделать этот трек публичным бессрочно"
       edit_track: "Редактировать свойства"
       delete_track: "Удалить трек"
-      viewing_trace: "Просмотр трека {{name}}"
+      heading: "Просмотр трека {{name}}"
       trace_not_found: "Трек не найден!"
     trace_paging_nav:
       showing: "Страница"

diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index 9c09d0b0c37ee5b66acf2ef048da4d319c0d6cd7..ab542855dc6b086d5fb3d53d5d3685b7d9236894 100644 (file)
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -593,7 +593,7 @@ sl:
       make_public: "Naj ta sled postane trajno javna"
       edit_track: "Uredi to sled"
       delete_track: "Izbriši to sled"
-      viewing_trace: "Prikaz sledi {{name}}" 
+      heading: "Prikaz sledi {{name}}" 
       trace_not_found: "Sledi ni bilo mogoče najti!" 
     trace_paging_nav:
       showing: "Prikaz strani"

diff --git a/config/locales/yo.yml b/config/locales/yo.yml
index e55c44e96854714ff05395bacd2a84c04c35c99d..82ed28cd8763576d100cab9151f6ffbfaee68707 100644 (file)
--- a/config/locales/yo.yml
+++ b/config/locales/yo.yml
@@ -614,7 +614,7 @@ yo:
       make_public: "Make this track public permanently"
       edit_track: "Edit this track"
       delete_track: "Delete this track"
-      viewing_trace: "Viewing trace {{name}}"
+      heading: "Viewing trace {{name}}"
       trace_not_found: "Trace not found!"
     trace_paging_nav:
       showing: "Showing page"

diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index f82200561f49aa2f04dac7ac876feda16992479c..83209757b62880507e0ca0be1fe7665dd3bf2a47 100644 (file)
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -511,7 +511,7 @@ zh-CN:
       make_public: "永久公开这条路径"
       edit_track: "编辑这条路径"
       delete_track: "删除这条路径"
-      viewing_trace: "查看路径 {{name}}"
+      heading: "查看路径 {{name}}"
       trace_not_found: "路径为找到!"
     trace_paging_nav:
       showing: "显示页"

diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index c93f5e0eb2f3a6da401ba8ea966d040def9eb1a5..e24e9a8cd8898337de719b1ce7ba3bd4eb356a49 100644 (file)
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -614,7 +614,7 @@ zh-TW:
       make_public: "將這個追蹤永遠標記為公開"
       edit_track: "編輯這個追蹤"
       delete_track: "刪除這個追蹤"
-      viewing_trace: "正在檢視追蹤 {{name}}"
+      heading: "正在檢視追蹤 {{name}}"
       trace_not_found: "找不到追蹤！"
     trace_paging_nav:
       showing: "正在顯示頁面"