* @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'
20 files changed:
if @trace and @trace.visible? and
(@trace.public? or @trace.user == @user)
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'
else
flash[:notice] = t 'trace.view.trace_not_found'
redirect_to :controller => 'trace', :action => 'list'
@trace = Trace.find(params[:id])
if @user and @trace.user == @user
@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]
if params[:trace]
@trace.description = params[:trace][:description]
@trace.tagstring = params[:trace][:tagstring]
-<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 %>">
<img src="<%= url_for :controller => 'trace', :action => 'picture', :id => @trace.id, :display_name => @trace.user.display_name %>">
-<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 %>">
<% if @trace.inserted %>
<img src="<%= url_for :controller => 'trace', :action => 'picture', :id => @trace.id, :display_name => @trace.user.display_name %>">
make_public: "Зрабіць гэты трэк агульнадаступным назаўсёды"
edit_track: "Змяніць бягучы трэк"
delete_track: "Выдаліць гэты трэк"
make_public: "Зрабіць гэты трэк агульнадаступным назаўсёды"
edit_track: "Змяніць бягучы трэк"
delete_track: "Выдаліць гэты трэк"
- viewing_trace: "Прагляд трэку {{name}}"
+ heading: "Прагляд трэку {{name}}"
trace_not_found: "Трэк не знойдзены!"
trace_paging_nav:
showing: "Прагляд старонкі"
trace_not_found: "Трэк не знойдзены!"
trace_paging_nav:
showing: "Прагляд старонкі"
make_public: "Mache diesen Track öffentlich"
edit_track: "Diesen Track bearbeiten"
delete_track: "Diesen Track löschen"
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"
trace_not_found: "Track nicht gefunden!"
trace_paging_nav:
showing: "Zeige Seite"
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:
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:"
filename: "Filename:"
download: "download"
uploaded_at: "Uploaded at:"
trace_optionals:
tags: "Tags"
view:
trace_optionals:
tags: "Tags"
view:
+ title: "Viewing trace {{name}}"
+ heading: "Viewing trace {{name}}"
pending: "PENDING"
filename: "Filename:"
download: "download"
pending: "PENDING"
filename: "Filename:"
download: "download"
make_public: "Make this track public permanently"
edit_track: "Edit this track"
delete_track: "Delete this track"
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"
trace_not_found: "Trace not found!"
trace_paging_nav:
showing: "Showing page"
make_public: "Hacer esta traza pública de forma permanente"
edit_track: "Editar esta traza"
delete_track: "Borrar esta traza"
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"
trace_not_found: "¡No se ha encontrado la traza!"
trace_paging_nav:
showing: "Mostrando página"
make_public: "Make this track public permanently"
edit_track: "Edit this track"
delete_track: "Delete this track"
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"
trace_not_found: "Trace not found!"
trace_paging_nav:
showing: "Showing page"
make_public: "Make this track public permanently"
edit_track: "Edit this track"
delete_track: "Delete this track"
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"
trace_not_found: "Trace not found!"
trace_paging_nav:
showing: "Showing page"
make_public: "Rendi pubblico questo tracciato in modo permanente"
edit_track: "Modifica questo tracciato"
delete_track: "Elimina questo tracciato"
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"
trace_not_found: "Tracciato non trovato!"
trace_paging_nav:
showing: "Visualizzata la pagina"
make_public: "このトラックを今後公開する"
edit_track: "このトラックの編集"
delete_track: "このトラックの削除"
make_public: "このトラックを今後公開する"
edit_track: "このトラックの編集"
delete_track: "このトラックの削除"
- viewing_trace: "トレース{{name}}の表示"
+ heading: "トレース{{name}}の表示"
trace_not_found: "トレースが見つかりません!"
trace_paging_nav:
showing: "ページ表示"
trace_not_found: "トレースが見つかりません!"
trace_paging_nav:
showing: "ページ表示"
make_public: "Make this track public permanently"
edit_track: "Edit this track"
delete_track: "Delete this track"
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"
trace_not_found: "Trace not found!"
trace_paging_nav:
showing: "Showing page"
make_public: "Deze track permanent openbaar maken"
edit_track: "Deze track bewerken"
delete_track: "Deze track wissen"
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"
trace_not_found: "Track niet gevonden!"
trace_paging_nav:
showing: "Pagina"
make_public: "Na stałe oznacz ten ślad jako publiczny"
edit_track: "Edytuj ten ślad"
delete_track: "Wykasuj ten ślad"
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"
trace_not_found: "Ślad nie znaleziony!"
trace_paging_nav:
showing: "Widoczna jest strona"
make_public: "Torne esta trilha permanentemente pública"
edit_track: "Edite esta trilha"
delete_track: "Apague esta trilha"
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"
trace_not_found: "Trilha não encontrada!"
trace_paging_nav:
showing: "Mostrando página"
make_public: "Сделать этот трек публичным бессрочно"
edit_track: "Редактировать свойства"
delete_track: "Удалить трек"
make_public: "Сделать этот трек публичным бессрочно"
edit_track: "Редактировать свойства"
delete_track: "Удалить трек"
- viewing_trace: "Просмотр трека {{name}}"
+ heading: "Просмотр трека {{name}}"
trace_not_found: "Трек не найден!"
trace_paging_nav:
showing: "Страница"
trace_not_found: "Трек не найден!"
trace_paging_nav:
showing: "Страница"
make_public: "Naj ta sled postane trajno javna"
edit_track: "Uredi to sled"
delete_track: "Izbriši to sled"
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"
trace_not_found: "Sledi ni bilo mogoče najti!"
trace_paging_nav:
showing: "Prikaz strani"
make_public: "Make this track public permanently"
edit_track: "Edit this track"
delete_track: "Delete this track"
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"
trace_not_found: "Trace not found!"
trace_paging_nav:
showing: "Showing page"
make_public: "永久公开这条路径"
edit_track: "编辑这条路径"
delete_track: "删除这条路径"
make_public: "永久公开这条路径"
edit_track: "编辑这条路径"
delete_track: "删除这条路径"
- viewing_trace: "查看路径 {{name}}"
+ heading: "查看路径 {{name}}"
trace_not_found: "路径为找到!"
trace_paging_nav:
showing: "显示页"
trace_not_found: "路径为找到!"
trace_paging_nav:
showing: "显示页"
make_public: "將這個追蹤永遠標記為公開"
edit_track: "編輯這個追蹤"
delete_track: "刪除這個追蹤"
make_public: "將這個追蹤永遠標記為公開"
edit_track: "編輯這個追蹤"
delete_track: "刪除這個追蹤"
- viewing_trace: "正在檢視追蹤 {{name}}"
+ heading: "正在檢視追蹤 {{name}}"
trace_not_found: "找不到追蹤!"
trace_paging_nav:
showing: "正在顯示頁面"
trace_not_found: "找不到追蹤!"
trace_paging_nav:
showing: "正在顯示頁面"