diff --git a/app/views/diary_entry/_diary_entry.html.erb b/app/views/diary_entry/_diary_entry.html.erb index a855d7158..c69d26f8a 100644 --- a/app/views/diary_entry/_diary_entry.html.erb +++ b/app/views/diary_entry/_diary_entry.html.erb @@ -3,7 +3,7 @@ <% if diary_entry.latitude and diary_entry.longitude %> <%= t 'map.coordinates' %>
<%= diary_entry.latitude %>; <%= diary_entry.longitude %>
(<%=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 %>)
<% 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' %>
<%= link_to t('diary_entry.diary_entry.comment_link'), :action => 'view', :display_name => diary_entry.user.display_name, :id => diary_entry.id, :anchor => 'newcomment' %> diff --git a/app/views/diary_entry/list.html.erb b/app/views/diary_entry/list.html.erb index 00937d89e..ace466e9e 100644 --- a/app/views/diary_entry/list.html.erb +++ b/app/views/diary_entry/list.html.erb @@ -32,8 +32,8 @@
<% end %> -<%= rss_link_to :action => 'rss' %> +<%= rss_link_to :action => 'rss', :language => params[:language] %> <% content_for :head do %> -<%= auto_discovery_link_tag :atom, :action => 'rss' %> +<%= auto_discovery_link_tag :atom, :action => 'rss', :language => params[:language] %> <% end %> diff --git a/config/locales/be.yml b/config/locales/be.yml index e328761f2..2b1516e5d 100644 --- a/config/locales/be.yml +++ b/config/locales/be.yml @@ -248,7 +248,7 @@ be: no_such_user: body: "Прабачце, не існуе карыстальніка {{user}}. Праверце свой правапіс, ці, магчыма, вам далі няправільную спасылку." diary_entry: - posted_by: "Напісана {{link_user}} у {{created}} на {{language}}" + posted_by: "Напісана {{link_user}} у {{created}} на {{language_link}}" comment_link: Каментаваць гэты запіс reply_link: Адказаць на гэты запіс comment_count: diff --git a/config/locales/de.yml b/config/locales/de.yml index 08ad979dc..1bce55f02 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -280,7 +280,7 @@ de: 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." 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 reply_link: Auf diesen Eintrag antworten comment_count: diff --git a/config/locales/el.yml b/config/locales/el.yml index 2ceae3707..b3d3d862d 100644 --- a/config/locales/el.yml +++ b/config/locales/el.yml @@ -279,7 +279,7 @@ el: heading: "Ο χρήστης {{user}} δεν υπάρχει" body: "Συγγνώμη, δεν υπάρχει χρήστης με το όνομα {{user}}. Είναι πιθανό να υπάρχουν ορθογραφικά λάθη ή να είναι λάθος το link." diary_entry: - posted_by: "Γράφτηκε απο το χρήστη {{link_user}} στις {{created}} στα {{language}}" + posted_by: "Γράφτηκε απο το χρήστη {{link_user}} στις {{created}} στα {{language_link}}" comment_link: "Σχόλια για τη καταχώρηση" reply_link: "Απάντηση στη καταχώρηση" comment_count: diff --git a/config/locales/en.yml b/config/locales/en.yml index e41f5e68c..6d11de364 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -280,7 +280,7 @@ en: 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." 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 reply_link: Reply to this entry comment_count: diff --git a/config/locales/es.yml b/config/locales/es.yml index ca351797f..d0a1d28d1 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -271,7 +271,7 @@ es: 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." 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" reply_link: "Responder a la entrada" comment_count: diff --git a/config/locales/fr.yml b/config/locales/fr.yml index a1c3c63aa..4ad6cf3a5 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -100,7 +100,7 @@ fr: 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." 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" reply_link: "Répondre a cette entrée" comment_count: diff --git a/config/locales/he.yml b/config/locales/he.yml index e166d1b42..2b5fd6211 100644 --- a/config/locales/he.yml +++ b/config/locales/he.yml @@ -249,7 +249,7 @@ he: 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." 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 reply_link: Reply to this entry comment_count: diff --git a/config/locales/hi.yml b/config/locales/hi.yml index 0eeffce03..64b20ec2c 100644 --- a/config/locales/hi.yml +++ b/config/locales/hi.yml @@ -276,7 +276,7 @@ hi: 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." 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 reply_link: Reply to this entry comment_count: diff --git a/config/locales/is.yml b/config/locales/is.yml index 62f4ed8cd..167abc757 100644 --- a/config/locales/is.yml +++ b/config/locales/is.yml @@ -276,7 +276,7 @@ is: 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." 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" reply_link: "Senda höfund skilaboð" comment_count: diff --git a/config/locales/it.yml b/config/locales/it.yml index 39400ccbc..52ee2e8fc 100644 --- a/config/locales/it.yml +++ b/config/locales/it.yml @@ -249,7 +249,7 @@ it: 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." 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 reply_link: Rispondi a questa voce comment_count: diff --git a/config/locales/nl.yml b/config/locales/nl.yml index 9a2008b1c..90fdc0e09 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -249,7 +249,7 @@ nl: 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." 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 reply_link: Antwoorden op dit artikel comment_count: diff --git a/config/locales/pl.yml b/config/locales/pl.yml index 0766284a0..4add90a8b 100644 --- a/config/locales/pl.yml +++ b/config/locales/pl.yml @@ -249,7 +249,7 @@ pl: 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." 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 reply_link: Odpowiedz na ten wpis comment_count: diff --git a/config/locales/ru.yml b/config/locales/ru.yml index d9088ad18..544a1d187 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -249,7 +249,7 @@ ru: no_such_user: body: "К сожалению, пользователь с именем {{user}} не найден. Проверьте правильность ввода. Возможно ссылка, по которой вы перешли, неверна." diary_entry: - posted_by: "Опубликовано пользователем {{link_user}} в {{created}}, язык записи — {{language}}" + posted_by: "Опубликовано пользователем {{link_user}} в {{created}}, язык записи — {{language_link}}" comment_link: Комментировать reply_link: Ответить comment_count: diff --git a/config/locales/sl.yml b/config/locales/sl.yml index aeaf52122..9c09d0b0c 100644 --- a/config/locales/sl.yml +++ b/config/locales/sl.yml @@ -279,7 +279,7 @@ sl: heading: "Uporabnik {{user}} ne obstaja" body: "Oprostite, uporabnika z imenom {{user}} ni. Prosimo, preverite črkovanje in povezavo, ki ste jo kliknili." 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 reply_link: Odgovori na ta vnos comment_count: diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml index d9a32c642..023ab3051 100644 --- a/config/locales/zh-CN.yml +++ b/config/locales/zh-CN.yml @@ -247,7 +247,7 @@ zh-CN: no_such_user: body: "抱歉，没有名叫{{user}}的用户。请检查拼写，或者您点击的链接有误。" 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: 关于此篇评论 reply_link: 对此篇进行回复 comment_count: diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml index 412240c9e..c93f5e0eb 100644 --- a/config/locales/zh-TW.yml +++ b/config/locales/zh-TW.yml @@ -280,7 +280,7 @@ zh-TW: heading: "使用者 {{user}} 不存在" body: "抱歉，沒有名為 {{user}} 的使用者。請檢查您的拼字，或者可能是按到錯誤的連結。" diary_entry: - posted_by: "由 {{link_user}} 於 {{created}} 以 {{language}} 張貼" + posted_by: "由 {{link_user}} 於 {{created}} 以 {{language_link}} 張貼" comment_link: "對這個項目的評論" reply_link: "回覆這個項目" comment_count: