minor change: diary entries per language linked (lists and rss feeds)
(again, since r15900 was rolled back in r15905, see #1946 - this time without adding a plugin)
This commit is contained in:
parent
6667a9ec4f
commit
00da8a9712
18 changed files with 19 additions and 19 deletions
|
@ -3,7 +3,7 @@
|
||||||
<% if diary_entry.latitude and diary_entry.longitude %>
|
<% if diary_entry.latitude and diary_entry.longitude %>
|
||||||
<%= t 'map.coordinates' %> <div class="geo" style="display: inline"><span class="latitude"><%= diary_entry.latitude %></span>; <span class="longitude"><%= diary_entry.longitude %></span></div> (<%=link_to (t 'map.view'), :controller => 'site', :action => 'index', :lat => diary_entry.latitude, :lon => diary_entry.longitude, :zoom => 14 %> / <%=link_to (t 'map.edit'), :controller => 'site', :action => 'edit', :lat => diary_entry.latitude, :lon => diary_entry.longitude, :zoom => 14 %>)<br/>
|
<%= t 'map.coordinates' %> <div class="geo" style="display: inline"><span class="latitude"><%= diary_entry.latitude %></span>; <span class="longitude"><%= diary_entry.longitude %></span></div> (<%=link_to (t 'map.view'), :controller => 'site', :action => 'index', :lat => diary_entry.latitude, :lon => diary_entry.longitude, :zoom => 14 %> / <%=link_to (t 'map.edit'), :controller => 'site', :action => 'edit', :lat => diary_entry.latitude, :lon => diary_entry.longitude, :zoom => 14 %>)<br/>
|
||||||
<% end %>
|
<% end %>
|
||||||
<%= t 'diary_entry.diary_entry.posted_by', :link_user => (link_to h(diary_entry.user.display_name), :controller => 'user', :action => 'view', :display_name => diary_entry.user.display_name), :created => l(diary_entry.created_at), :language => diary_entry.language.name %>
|
<%= t 'diary_entry.diary_entry.posted_by', :link_user => (link_to h(diary_entry.user.display_name), :controller => 'user', :action => 'view', :display_name => diary_entry.user.display_name), :created => l(diary_entry.created_at), :language_link => (link_to h(diary_entry.language.name), :controller => 'diary_entry', :action => 'list', :language => diary_entry.language_code) %>
|
||||||
<% if params[:action] == 'list' %>
|
<% if params[:action] == 'list' %>
|
||||||
<br />
|
<br />
|
||||||
<%= link_to t('diary_entry.diary_entry.comment_link'), :action => 'view', :display_name => diary_entry.user.display_name, :id => diary_entry.id, :anchor => 'newcomment' %>
|
<%= link_to t('diary_entry.diary_entry.comment_link'), :action => 'view', :display_name => diary_entry.user.display_name, :id => diary_entry.id, :anchor => 'newcomment' %>
|
||||||
|
|
|
@ -32,8 +32,8 @@
|
||||||
<br />
|
<br />
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
||||||
<%= rss_link_to :action => 'rss' %>
|
<%= rss_link_to :action => 'rss', :language => params[:language] %>
|
||||||
|
|
||||||
<% content_for :head do %>
|
<% content_for :head do %>
|
||||||
<%= auto_discovery_link_tag :atom, :action => 'rss' %>
|
<%= auto_discovery_link_tag :atom, :action => 'rss', :language => params[:language] %>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
|
@ -248,7 +248,7 @@ be:
|
||||||
no_such_user:
|
no_such_user:
|
||||||
body: "Прабачце, не існуе карыстальніка {{user}}. Праверце свой правапіс, ці, магчыма, вам далі няправільную спасылку."
|
body: "Прабачце, не існуе карыстальніка {{user}}. Праверце свой правапіс, ці, магчыма, вам далі няправільную спасылку."
|
||||||
diary_entry:
|
diary_entry:
|
||||||
posted_by: "Напісана {{link_user}} у {{created}} на {{language}}"
|
posted_by: "Напісана {{link_user}} у {{created}} на {{language_link}}"
|
||||||
comment_link: Каментаваць гэты запіс
|
comment_link: Каментаваць гэты запіс
|
||||||
reply_link: Адказаць на гэты запіс
|
reply_link: Адказаць на гэты запіс
|
||||||
comment_count:
|
comment_count:
|
||||||
|
|
|
@ -280,7 +280,7 @@ de:
|
||||||
heading: "Der Benutzer {{user}} existiert nicht"
|
heading: "Der Benutzer {{user}} existiert nicht"
|
||||||
body: "Wir konnten leider keinen Benutzer mit dem Namen {{user}} finden. Du hast dich möglicherweise vertippt oder du bist einem ungültigem Link gefolgt."
|
body: "Wir konnten leider keinen Benutzer mit dem Namen {{user}} finden. Du hast dich möglicherweise vertippt oder du bist einem ungültigem Link gefolgt."
|
||||||
diary_entry:
|
diary_entry:
|
||||||
posted_by: "Verfasst von {{link_user}} am {{created}} in {{language}}"
|
posted_by: "Verfasst von {{link_user}} am {{created}} in {{language_link}}"
|
||||||
comment_link: Kommentar zu diesem Eintrag
|
comment_link: Kommentar zu diesem Eintrag
|
||||||
reply_link: Auf diesen Eintrag antworten
|
reply_link: Auf diesen Eintrag antworten
|
||||||
comment_count:
|
comment_count:
|
||||||
|
|
|
@ -279,7 +279,7 @@ el:
|
||||||
heading: "Ο χρήστης {{user}} δεν υπάρχει"
|
heading: "Ο χρήστης {{user}} δεν υπάρχει"
|
||||||
body: "Συγγνώμη, δεν υπάρχει χρήστης με το όνομα {{user}}. Είναι πιθανό να υπάρχουν ορθογραφικά λάθη ή να είναι λάθος το link."
|
body: "Συγγνώμη, δεν υπάρχει χρήστης με το όνομα {{user}}. Είναι πιθανό να υπάρχουν ορθογραφικά λάθη ή να είναι λάθος το link."
|
||||||
diary_entry:
|
diary_entry:
|
||||||
posted_by: "Γράφτηκε απο το χρήστη {{link_user}} στις {{created}} στα {{language}}"
|
posted_by: "Γράφτηκε απο το χρήστη {{link_user}} στις {{created}} στα {{language_link}}"
|
||||||
comment_link: "Σχόλια για τη καταχώρηση"
|
comment_link: "Σχόλια για τη καταχώρηση"
|
||||||
reply_link: "Απάντηση στη καταχώρηση"
|
reply_link: "Απάντηση στη καταχώρηση"
|
||||||
comment_count:
|
comment_count:
|
||||||
|
|
|
@ -280,7 +280,7 @@ en:
|
||||||
heading: "The user {{user}} does not exist"
|
heading: "The user {{user}} does not exist"
|
||||||
body: "Sorry, there is no user with the name {{user}}. Please check your spelling, or maybe the link you clicked is wrong."
|
body: "Sorry, there is no user with the name {{user}}. Please check your spelling, or maybe the link you clicked is wrong."
|
||||||
diary_entry:
|
diary_entry:
|
||||||
posted_by: "Posted by {{link_user}} at {{created}} in {{language}}"
|
posted_by: "Posted by {{link_user}} at {{created}} in {{language_link}}"
|
||||||
comment_link: Comment on this entry
|
comment_link: Comment on this entry
|
||||||
reply_link: Reply to this entry
|
reply_link: Reply to this entry
|
||||||
comment_count:
|
comment_count:
|
||||||
|
|
|
@ -271,7 +271,7 @@ es:
|
||||||
heading: "El usuario {{user}} no existe"
|
heading: "El usuario {{user}} no existe"
|
||||||
body: "Lo sentimos, no hay ningún usuario llamado {{user}}. Por favor, comprueba que la dirección es correcta."
|
body: "Lo sentimos, no hay ningún usuario llamado {{user}}. Por favor, comprueba que la dirección es correcta."
|
||||||
diary_entry:
|
diary_entry:
|
||||||
posted_by: "Posteado por {{link_user}} en {{created}} en {{language}}"
|
posted_by: "Posteado por {{link_user}} en {{created}} en {{language_link}}"
|
||||||
comment_link: "Comentar esta entrada"
|
comment_link: "Comentar esta entrada"
|
||||||
reply_link: "Responder a la entrada"
|
reply_link: "Responder a la entrada"
|
||||||
comment_count:
|
comment_count:
|
||||||
|
|
|
@ -100,7 +100,7 @@ fr:
|
||||||
no_such_user:
|
no_such_user:
|
||||||
body: "Desolé, il n'y pas d'utilisateur avec le nom {{user}}. Veuillez vérifier l'orthographe, ou le lien que vous avez cliqué n'est pas valide."
|
body: "Desolé, il n'y pas d'utilisateur avec le nom {{user}}. Veuillez vérifier l'orthographe, ou le lien que vous avez cliqué n'est pas valide."
|
||||||
diary_entry:
|
diary_entry:
|
||||||
posted_by: "Posté par {{link_user}} à {{created}} en {{language}}"
|
posted_by: "Posté par {{link_user}} à {{created}} en {{language_link}}"
|
||||||
comment_link: "Commenter cette entrée"
|
comment_link: "Commenter cette entrée"
|
||||||
reply_link: "Répondre a cette entrée"
|
reply_link: "Répondre a cette entrée"
|
||||||
comment_count:
|
comment_count:
|
||||||
|
|
|
@ -249,7 +249,7 @@ he:
|
||||||
no_such_user:
|
no_such_user:
|
||||||
body: "Sorry, there is no user with the name {{user}}. Please check your spelling, or maybe the link you clicked is wrong."
|
body: "Sorry, there is no user with the name {{user}}. Please check your spelling, or maybe the link you clicked is wrong."
|
||||||
diary_entry:
|
diary_entry:
|
||||||
posted_by: "Posted by {{link_user}} at {{created}} in {{language}}"
|
posted_by: "Posted by {{link_user}} at {{created}} in {{language_link}}"
|
||||||
comment_link: Comment on this entry
|
comment_link: Comment on this entry
|
||||||
reply_link: Reply to this entry
|
reply_link: Reply to this entry
|
||||||
comment_count:
|
comment_count:
|
||||||
|
|
|
@ -276,7 +276,7 @@ hi:
|
||||||
no_such_user:
|
no_such_user:
|
||||||
body: "Sorry, there is no user with the name {{user}}. Please check your spelling, or maybe the link you clicked is wrong."
|
body: "Sorry, there is no user with the name {{user}}. Please check your spelling, or maybe the link you clicked is wrong."
|
||||||
diary_entry:
|
diary_entry:
|
||||||
posted_by: "Posted by {{link_user}} at {{created}} in {{language}}"
|
posted_by: "Posted by {{link_user}} at {{created}} in {{language_link}}"
|
||||||
comment_link: Comment on this entry
|
comment_link: Comment on this entry
|
||||||
reply_link: Reply to this entry
|
reply_link: Reply to this entry
|
||||||
comment_count:
|
comment_count:
|
||||||
|
|
|
@ -276,7 +276,7 @@ is:
|
||||||
heading: "Notandinn {{user}} er ekki til"
|
heading: "Notandinn {{user}} er ekki til"
|
||||||
body: "Það er ekki til notandi með nafninu {{user}}. Kannski slóstu nafnið rangt inn eða fylgdir ógildum tengli."
|
body: "Það er ekki til notandi með nafninu {{user}}. Kannski slóstu nafnið rangt inn eða fylgdir ógildum tengli."
|
||||||
diary_entry:
|
diary_entry:
|
||||||
posted_by: "Sett inn af {{link_user}} klukkan {{created}} á {{language}}"
|
posted_by: "Sett inn af {{link_user}} klukkan {{created}} á {{language_link}}"
|
||||||
comment_link: "Bæta við athugasemd"
|
comment_link: "Bæta við athugasemd"
|
||||||
reply_link: "Senda höfund skilaboð"
|
reply_link: "Senda höfund skilaboð"
|
||||||
comment_count:
|
comment_count:
|
||||||
|
|
|
@ -249,7 +249,7 @@ it:
|
||||||
no_such_user:
|
no_such_user:
|
||||||
body: "Spiacenti, non c'è alcun utente con il nome {{user}}. Controllare la digitazione, oppure potrebbe essere che il collegamento che si è seguito sia errato."
|
body: "Spiacenti, non c'è alcun utente con il nome {{user}}. Controllare la digitazione, oppure potrebbe essere che il collegamento che si è seguito sia errato."
|
||||||
diary_entry:
|
diary_entry:
|
||||||
posted_by: "Inviato da {{link_user}} il {{created}} in {{language}}"
|
posted_by: "Inviato da {{link_user}} il {{created}} in {{language_link}}"
|
||||||
comment_link: Commento su questa voce
|
comment_link: Commento su questa voce
|
||||||
reply_link: Rispondi a questa voce
|
reply_link: Rispondi a questa voce
|
||||||
comment_count:
|
comment_count:
|
||||||
|
|
|
@ -249,7 +249,7 @@ nl:
|
||||||
no_such_user:
|
no_such_user:
|
||||||
body: "Sorry, er is geen gebruiker met de naam {{user}}. Controleer de spelling, of misschien is de link waarop je geklikt hebt verkeerd."
|
body: "Sorry, er is geen gebruiker met de naam {{user}}. Controleer de spelling, of misschien is de link waarop je geklikt hebt verkeerd."
|
||||||
diary_entry:
|
diary_entry:
|
||||||
posted_by: "Geplaatst door {{link_user}} op {{created}} in het {{language}}"
|
posted_by: "Geplaatst door {{link_user}} op {{created}} in het {{language_link}}"
|
||||||
comment_link: Opmerking over dit artikel plaatsen
|
comment_link: Opmerking over dit artikel plaatsen
|
||||||
reply_link: Antwoorden op dit artikel
|
reply_link: Antwoorden op dit artikel
|
||||||
comment_count:
|
comment_count:
|
||||||
|
|
|
@ -249,7 +249,7 @@ pl:
|
||||||
no_such_user:
|
no_such_user:
|
||||||
body: "Niestety nie znaleziono użytkownika o nazwie {{user}}, sprawdź pisownię. Być może użyłeś(aś) linku który był niepoprawny."
|
body: "Niestety nie znaleziono użytkownika o nazwie {{user}}, sprawdź pisownię. Być może użyłeś(aś) linku który był niepoprawny."
|
||||||
diary_entry:
|
diary_entry:
|
||||||
posted_by: "Wpis od {{link_user}} z {{created}} w języku {{language}}"
|
posted_by: "Wpis od {{link_user}} z {{created}} w języku {{language_link}}"
|
||||||
comment_link: Skomentuj ten wpis
|
comment_link: Skomentuj ten wpis
|
||||||
reply_link: Odpowiedz na ten wpis
|
reply_link: Odpowiedz na ten wpis
|
||||||
comment_count:
|
comment_count:
|
||||||
|
|
|
@ -249,7 +249,7 @@ ru:
|
||||||
no_such_user:
|
no_such_user:
|
||||||
body: "К сожалению, пользователь с именем {{user}} не найден. Проверьте правильность ввода. Возможно ссылка, по которой вы перешли, неверна."
|
body: "К сожалению, пользователь с именем {{user}} не найден. Проверьте правильность ввода. Возможно ссылка, по которой вы перешли, неверна."
|
||||||
diary_entry:
|
diary_entry:
|
||||||
posted_by: "Опубликовано пользователем {{link_user}} в {{created}}, язык записи — {{language}}"
|
posted_by: "Опубликовано пользователем {{link_user}} в {{created}}, язык записи — {{language_link}}"
|
||||||
comment_link: Комментировать
|
comment_link: Комментировать
|
||||||
reply_link: Ответить
|
reply_link: Ответить
|
||||||
comment_count:
|
comment_count:
|
||||||
|
|
|
@ -279,7 +279,7 @@ sl:
|
||||||
heading: "Uporabnik {{user}} ne obstaja"
|
heading: "Uporabnik {{user}} ne obstaja"
|
||||||
body: "Oprostite, uporabnika z imenom {{user}} ni. Prosimo, preverite črkovanje in povezavo, ki ste jo kliknili."
|
body: "Oprostite, uporabnika z imenom {{user}} ni. Prosimo, preverite črkovanje in povezavo, ki ste jo kliknili."
|
||||||
diary_entry:
|
diary_entry:
|
||||||
posted_by: "Objavil {{link_user}} ob {{created}} v jeziku {{language}}"
|
posted_by: "Objavil {{link_user}} ob {{created}} v jeziku {{language_link}}"
|
||||||
comment_link: Komentiraj ta vnos
|
comment_link: Komentiraj ta vnos
|
||||||
reply_link: Odgovori na ta vnos
|
reply_link: Odgovori na ta vnos
|
||||||
comment_count:
|
comment_count:
|
||||||
|
|
|
@ -247,7 +247,7 @@ zh-CN:
|
||||||
no_such_user:
|
no_such_user:
|
||||||
body: "抱歉,没有名叫{{user}}的用户。请检查拼写,或者您点击的链接有误。"
|
body: "抱歉,没有名叫{{user}}的用户。请检查拼写,或者您点击的链接有误。"
|
||||||
diary_entry:
|
diary_entry:
|
||||||
posted_by: "Posted by {{link_user}} at {{created}} in {{language}}"
|
posted_by: "Posted by {{link_user}} at {{created}} in {{language_link}}"
|
||||||
comment_link: 关于此篇评论
|
comment_link: 关于此篇评论
|
||||||
reply_link: 对此篇进行回复
|
reply_link: 对此篇进行回复
|
||||||
comment_count:
|
comment_count:
|
||||||
|
|
|
@ -280,7 +280,7 @@ zh-TW:
|
||||||
heading: "使用者 {{user}} 不存在"
|
heading: "使用者 {{user}} 不存在"
|
||||||
body: "抱歉,沒有名為 {{user}} 的使用者。請檢查您的拼字,或者可能是按到錯誤的連結。"
|
body: "抱歉,沒有名為 {{user}} 的使用者。請檢查您的拼字,或者可能是按到錯誤的連結。"
|
||||||
diary_entry:
|
diary_entry:
|
||||||
posted_by: "由 {{link_user}} 於 {{created}} 以 {{language}} 張貼"
|
posted_by: "由 {{link_user}} 於 {{created}} 以 {{language_link}} 張貼"
|
||||||
comment_link: "對這個項目的評論"
|
comment_link: "對這個項目的評論"
|
||||||
reply_link: "回覆這個項目"
|
reply_link: "回覆這個項目"
|
||||||
comment_count:
|
comment_count:
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue