diff --git a/app/views/mailer/_issue.rhtml b/app/views/mailer/_issue.rhtml index 7caf855fe..bd438f289 100644 --- a/app/views/mailer/_issue.rhtml +++ b/app/views/mailer/_issue.rhtml @@ -5,4 +5,4 @@ <%= issue.description %> -http://<%= Setting.host_name %>/issues/show/<%= issue.id %> \ No newline at end of file +<%= url_for :only_path => false, :host => Setting.host_name, :controller => 'issues', :action => 'show', :id => issue %> diff --git a/app/views/mailer/attachments_add_es.rhtml b/app/views/mailer/attachments_add_es.rhtml deleted file mode 100644 index 81e2974c1..000000000 --- a/app/views/mailer/attachments_add_es.rhtml +++ /dev/null @@ -1,6 +0,0 @@ -<%= @added_to %> -<%= @attachments.size %> files(s) added. -<% @attachments.each do |attachment | %> -- <%= attachment.filename %><% end %> - -<%= @url %> \ No newline at end of file diff --git a/app/views/mailer/document_add.rhtml b/app/views/mailer/document_add.rhtml index 67648de15..dfd51d359 100644 --- a/app/views/mailer/document_add.rhtml +++ b/app/views/mailer/document_add.rhtml @@ -1,4 +1,4 @@ A document has been added to <%= @document.project.name %> (<%= @document.category.name %>): <%= l(:field_title) %>: <%= @document.title %> -http://<%= Setting.host_name %>/documents/show/<%= @document.id %> \ No newline at end of file +<%= url_for :only_path => false, :host => Setting.host_name, :controller => 'documents', :action => 'show', :id => @document %> diff --git a/app/views/mailer/document_add_bg.rhtml b/app/views/mailer/document_add_bg.rhtml index aef4f1ffb..fbd65267c 100644 --- a/app/views/mailer/document_add_bg.rhtml +++ b/app/views/mailer/document_add_bg.rhtml @@ -1,4 +1,4 @@ Добавен е документ в <%= @document.project.name %> (<%= @document.category.name %>): <%= l(:field_title) %>: <%= @document.title %> -http://<%= Setting.host_name %>/documents/show/<%= @document.id %> \ No newline at end of file +<%= url_for :only_path => false, :host => Setting.host_name, :controller => 'documents', :action => 'show', :id => @document %> diff --git a/app/views/mailer/document_add_de.rhtml b/app/views/mailer/document_add_de.rhtml index fab485cd1..4ee5a35a9 100644 --- a/app/views/mailer/document_add_de.rhtml +++ b/app/views/mailer/document_add_de.rhtml @@ -1,4 +1,4 @@ Ein Dokument wurde hinzugefügt: <%= @document.project.name %> (<%= @document.category.name %>): <%= l(:field_title) %>: <%= @document.title %> -http://<%= Setting.host_name %>/documents/show/<%= @document.id %> \ No newline at end of file +<%= url_for :only_path => false, :host => Setting.host_name, :controller => 'documents', :action => 'show', :id => @document %> diff --git a/app/views/mailer/document_add_es.rhtml b/app/views/mailer/document_add_es.rhtml deleted file mode 100644 index 67648de15..000000000 --- a/app/views/mailer/document_add_es.rhtml +++ /dev/null @@ -1,4 +0,0 @@ -A document has been added to <%= @document.project.name %> (<%= @document.category.name %>): -<%= l(:field_title) %>: <%= @document.title %> - -http://<%= Setting.host_name %>/documents/show/<%= @document.id %> \ No newline at end of file diff --git a/app/views/mailer/document_add_fr.rhtml b/app/views/mailer/document_add_fr.rhtml index b6f877579..333ae5c92 100644 --- a/app/views/mailer/document_add_fr.rhtml +++ b/app/views/mailer/document_add_fr.rhtml @@ -1,4 +1,4 @@ Un document a été ajouté à <%= @document.project.name %> (<%= @document.category.name %>): <%= l(:field_title) %>: <%= @document.title %> -http://<%= Setting.host_name %>/documents/show/<%= @document.id %> \ No newline at end of file +<%= url_for :only_path => false, :host => Setting.host_name, :controller => 'documents', :action => 'show', :id => @document %> diff --git a/app/views/mailer/document_add_it.rhtml b/app/views/mailer/document_add_it.rhtml index 1d41a5f2e..73b7632fb 100644 --- a/app/views/mailer/document_add_it.rhtml +++ b/app/views/mailer/document_add_it.rhtml @@ -1,4 +1,4 @@ Un documento e' stato aggiunto a <%= @document.project.name %> (<%= @document.category.name %>): <%= l(:field_title) %>: <%= @document.title %> -http://<%= Setting.host_name %>/documents/show/<%= @document.id %> \ No newline at end of file +<%= url_for :only_path => false, :host => Setting.host_name, :controller => 'documents', :action => 'show', :id => @document %> diff --git a/app/views/mailer/document_add_ja.rhtml b/app/views/mailer/document_add_ja.rhtml index 3834947b8..3a883c655 100644 --- a/app/views/mailer/document_add_ja.rhtml +++ b/app/views/mailer/document_add_ja.rhtml @@ -1,4 +1,4 @@ 文書が <%= @document.project.name %> (<%= @document.category.name %>) に追加されました: <%= l(:field_title) %>: <%= @document.title %> -http://<%= Setting.host_name %>/documents/show/<%= @document.id %> \ No newline at end of file +<%= url_for :only_path => false, :host => Setting.host_name, :controller => 'documents', :action => 'show', :id => @document %> diff --git a/app/views/mailer/document_add_nl.rhtml b/app/views/mailer/document_add_nl.rhtml index 91215e926..ff7091584 100644 --- a/app/views/mailer/document_add_nl.rhtml +++ b/app/views/mailer/document_add_nl.rhtml @@ -1,4 +1,4 @@ Een document is toegevoegd aan <%= @document.project.name %> (<%= @document.category.name %>): <%= l(:field_title) %>: <%= @document.title %> -http://<%= Setting.host_name %>/documents/show/<%= @document.id %> \ No newline at end of file +<%= url_for :only_path => false, :host => Setting.host_name, :controller => 'documents', :action => 'show', :id => @document %> diff --git a/app/views/mailer/document_add_pt-br.rhtml b/app/views/mailer/document_add_pt-br.rhtml index 3ea2f97be..00ee0bb96 100644 --- a/app/views/mailer/document_add_pt-br.rhtml +++ b/app/views/mailer/document_add_pt-br.rhtml @@ -1,4 +1,4 @@ Um documento foi adicionado no projeto <%= @document.project.name %> (<%= @document.category.name %>): <%= l(:field_title) %>: <%= @document.title %> -http://<%= Setting.host_name %>/documents/show/<%= @document.id %> \ No newline at end of file +<%= url_for :only_path => false, :host => Setting.host_name, :controller => 'documents', :action => 'show', :id => @document %> diff --git a/app/views/mailer/document_add_pt.rhtml b/app/views/mailer/document_add_pt.rhtml index 3ea2f97be..00ee0bb96 100644 --- a/app/views/mailer/document_add_pt.rhtml +++ b/app/views/mailer/document_add_pt.rhtml @@ -1,4 +1,4 @@ Um documento foi adicionado no projeto <%= @document.project.name %> (<%= @document.category.name %>): <%= l(:field_title) %>: <%= @document.title %> -http://<%= Setting.host_name %>/documents/show/<%= @document.id %> \ No newline at end of file +<%= url_for :only_path => false, :host => Setting.host_name, :controller => 'documents', :action => 'show', :id => @document %> diff --git a/app/views/mailer/document_add_sv.rhtml b/app/views/mailer/document_add_sv.rhtml index 367b8d048..2ca0c1eaa 100644 --- a/app/views/mailer/document_add_sv.rhtml +++ b/app/views/mailer/document_add_sv.rhtml @@ -1,4 +1,4 @@ Ett dokument har lagts till i <%= @document.project.name %> (<%= @document.category.name %>): <%= l(:field_title) %>: <%= @document.title %> -http://<%= Setting.host_name %>/documents/show/<%= @document.id %> \ No newline at end of file +<%= url_for :only_path => false, :host => Setting.host_name, :controller => 'documents', :action => 'show', :id => @document %> diff --git a/app/views/mailer/document_add_zh.rhtml b/app/views/mailer/document_add_zh.rhtml index d4fe9d10f..f416892d0 100644 --- a/app/views/mailer/document_add_zh.rhtml +++ b/app/views/mailer/document_add_zh.rhtml @@ -1,4 +1,4 @@ -һĵѱ뵽Ŀ <%= @document.project.name %> (<%= @document.category.name %>): +��һ���ĵ��ѱ����뵽��Ŀ�� <%= @document.project.name %> (<%= @document.category.name %>): <%= l(:field_title) %>: <%= @document.title %> -http://<%= Setting.host_name %>/documents/show/<%= @document.id %> \ No newline at end of file +<%= url_for :only_path => false, :host => Setting.host_name, :controller => 'documents', :action => 'show', :id => @document %> diff --git a/app/views/mailer/issue_add_es.rhtml b/app/views/mailer/issue_add_es.rhtml deleted file mode 100644 index 823de2cef..000000000 --- a/app/views/mailer/issue_add_es.rhtml +++ /dev/null @@ -1,3 +0,0 @@ -Issue #<%= @issue.id %> has been reported. ----------------------------------------- -<%= render :file => "_issue", :use_full_path => true, :locals => { :issue => @issue } %> \ No newline at end of file diff --git a/app/views/mailer/issue_edit_es.rhtml b/app/views/mailer/issue_edit_es.rhtml deleted file mode 100644 index 7a9ca1634..000000000 --- a/app/views/mailer/issue_edit_es.rhtml +++ /dev/null @@ -1,8 +0,0 @@ -Issue #<%= @issue.id %> has been updated. -<%= @journal.user.name %> -<% for detail in @journal.details %> -<%= show_detail(detail, true) %> -<% end %> -<%= @journal.notes if @journal.notes? %> ----------------------------------------- -<%= render :file => "_issue", :use_full_path => true, :locals => { :issue => @issue } %> \ No newline at end of file diff --git a/app/views/mailer/lost_password.rhtml b/app/views/mailer/lost_password.rhtml index 332ddeb0b..430e14bec 100644 --- a/app/views/mailer/lost_password.rhtml +++ b/app/views/mailer/lost_password.rhtml @@ -1,3 +1,3 @@ To change your password, use the following link: -http://<%= Setting.host_name %>/account/lost_password?token=<%= @token.value %> \ No newline at end of file +<%= url_for :only_path => false, :host => Setting.host_name, :controller => 'account', :action => 'lost_password', :token => @token.value %> diff --git a/app/views/mailer/lost_password_bg.rhtml b/app/views/mailer/lost_password_bg.rhtml index f415769fc..b981f27e5 100644 --- a/app/views/mailer/lost_password_bg.rhtml +++ b/app/views/mailer/lost_password_bg.rhtml @@ -1,3 +1,3 @@ За да смените паролата си, използвайте следния линк: -http://<%= Setting.host_name %>/account/lost_password?token=<%= @token.value %> \ No newline at end of file +<%= url_for :only_path => false, :host => Setting.host_name, :controller => 'account', :action => 'lost_password', :token => @token.value %> diff --git a/app/views/mailer/lost_password_de.rhtml b/app/views/mailer/lost_password_de.rhtml index 4e2517ab8..1607e29a6 100644 --- a/app/views/mailer/lost_password_de.rhtml +++ b/app/views/mailer/lost_password_de.rhtml @@ -1,3 +1,3 @@ Benutzen Sie folgenden Link, um das Password zu ändern: -http://<%= Setting.host_name %>/account/lost_password?token=<%= @token.value %> \ No newline at end of file +<%= url_for :only_path => false, :host => Setting.host_name, :controller => 'account', :action => 'lost_password', :token => @token.value %> diff --git a/app/views/mailer/lost_password_es.rhtml b/app/views/mailer/lost_password_es.rhtml deleted file mode 100644 index 332ddeb0b..000000000 --- a/app/views/mailer/lost_password_es.rhtml +++ /dev/null @@ -1,3 +0,0 @@ -To change your password, use the following link: - -http://<%= Setting.host_name %>/account/lost_password?token=<%= @token.value %> \ No newline at end of file diff --git a/app/views/mailer/lost_password_fr.rhtml b/app/views/mailer/lost_password_fr.rhtml index 8282611e8..944852b5c 100644 --- a/app/views/mailer/lost_password_fr.rhtml +++ b/app/views/mailer/lost_password_fr.rhtml @@ -1,3 +1,3 @@ Pour changer votre mot de passe, utilisez le lien suivant: -http://<%= Setting.host_name %>/account/lost_password?token=<%= @token.value %> \ No newline at end of file +<%= url_for :only_path => false, :host => Setting.host_name, :controller => 'account', :action => 'lost_password', :token => @token.value %> diff --git a/app/views/mailer/lost_password_it.rhtml b/app/views/mailer/lost_password_it.rhtml index fc42e369c..69814b01a 100644 --- a/app/views/mailer/lost_password_it.rhtml +++ b/app/views/mailer/lost_password_it.rhtml @@ -1,3 +1,3 @@ Per cambiare la password, usate il seguente collegamento: -http://<%= Setting.host_name %>/account/lost_password?token=<%= @token.value %> \ No newline at end of file +<%= url_for :only_path => false, :host => Setting.host_name, :controller => 'account', :action => 'lost_password', :token => @token.value %> diff --git a/app/views/mailer/lost_password_ja.rhtml b/app/views/mailer/lost_password_ja.rhtml index 1f203e8d9..3c7ddd1dd 100644 --- a/app/views/mailer/lost_password_ja.rhtml +++ b/app/views/mailer/lost_password_ja.rhtml @@ -1,3 +1,3 @@ パスワードを変更するには、以下のリンクをたどってください: -http://<%= Setting.host_name %>/account/lost_password?token=<%= @token.value %> \ No newline at end of file +<%= url_for :only_path => false, :host => Setting.host_name, :controller => 'account', :action => 'lost_password', :token => @token.value %> diff --git a/app/views/mailer/lost_password_nl.rhtml b/app/views/mailer/lost_password_nl.rhtml index 758f540d2..22b067c29 100644 --- a/app/views/mailer/lost_password_nl.rhtml +++ b/app/views/mailer/lost_password_nl.rhtml @@ -1,3 +1,3 @@ Gebruik de volgende link om Uw wachtwoord te wijzigen: -http://<%= Setting.host_name %>/account/lost_password?token=<%= @token.value %> \ No newline at end of file +<%= url_for :only_path => false, :host => Setting.host_name, :controller => 'account', :action => 'lost_password', :token => @token.value %> diff --git a/app/views/mailer/lost_password_pt-br.rhtml b/app/views/mailer/lost_password_pt-br.rhtml index 1c71d908f..0cb1f7ff0 100644 --- a/app/views/mailer/lost_password_pt-br.rhtml +++ b/app/views/mailer/lost_password_pt-br.rhtml @@ -1,3 +1,3 @@ Para mudar sua senha, clique no link abaixo: -http://<%= Setting.host_name %>/account/lost_password?token=<%= @token.value %> \ No newline at end of file +<%= url_for :only_path => false, :host => Setting.host_name, :controller => 'account', :action => 'lost_password', :token => @token.value %> diff --git a/app/views/mailer/lost_password_pt.rhtml b/app/views/mailer/lost_password_pt.rhtml index 1c71d908f..0cb1f7ff0 100644 --- a/app/views/mailer/lost_password_pt.rhtml +++ b/app/views/mailer/lost_password_pt.rhtml @@ -1,3 +1,3 @@ Para mudar sua senha, clique no link abaixo: -http://<%= Setting.host_name %>/account/lost_password?token=<%= @token.value %> \ No newline at end of file +<%= url_for :only_path => false, :host => Setting.host_name, :controller => 'account', :action => 'lost_password', :token => @token.value %> diff --git a/app/views/mailer/lost_password_sv.rhtml b/app/views/mailer/lost_password_sv.rhtml index ca7b21b77..1394e7321 100644 --- a/app/views/mailer/lost_password_sv.rhtml +++ b/app/views/mailer/lost_password_sv.rhtml @@ -1,3 +1,3 @@ För att ändra lösenord, följ denna länk: -http://<%= Setting.host_name %>/account/lost_password?token=<%= @token.value %> \ No newline at end of file +<%= url_for :only_path => false, :host => Setting.host_name, :controller => 'account', :action => 'lost_password', :token => @token.value %> diff --git a/app/views/mailer/lost_password_zh.rhtml b/app/views/mailer/lost_password_zh.rhtml deleted file mode 100644 index c630f1ba6..000000000 --- a/app/views/mailer/lost_password_zh.rhtml +++ /dev/null @@ -1,3 +0,0 @@ -ӸĿ - -http://<%= Setting.host_name %>/account/lost_password?token=<%= @token.value %> \ No newline at end of file diff --git a/app/views/mailer/register.rhtml b/app/views/mailer/register.rhtml index 64477febc..1c93098dc 100644 --- a/app/views/mailer/register.rhtml +++ b/app/views/mailer/register.rhtml @@ -1,3 +1,3 @@ To activate your redMine account, use the following link: -http://<%= Setting.host_name %>/account/register?token=<%= @token.value %> \ No newline at end of file +<%= url_for :only_path => false, :host => Setting.host_name, :controller => 'account', :action => 'register', :token => @token.value %> diff --git a/app/views/mailer/register_bg.rhtml b/app/views/mailer/register_bg.rhtml index 79e7ed90b..adf4f5aaf 100644 --- a/app/views/mailer/register_bg.rhtml +++ b/app/views/mailer/register_bg.rhtml @@ -1,3 +1,3 @@ За да активирате акаунта си използвайте следния линк: -http://<%= Setting.host_name %>/account/register?token=<%= @token.value %> \ No newline at end of file +<%= url_for :only_path => false, :host => Setting.host_name, :controller => 'account', :action => 'register', :token => @token.value %> diff --git a/app/views/mailer/register_de.rhtml b/app/views/mailer/register_de.rhtml index a0c506ce7..1d0452bb2 100644 --- a/app/views/mailer/register_de.rhtml +++ b/app/views/mailer/register_de.rhtml @@ -1,3 +1,3 @@ Um Ihren Account zu aktivieren, benutzen Sie folgenden Link: -http://<%= Setting.host_name %>/account/register?token=<%= @token.value %> \ No newline at end of file +<%= url_for :only_path => false, :host => Setting.host_name, :controller => 'account', :action => 'register', :token => @token.value %> diff --git a/app/views/mailer/register_es.rhtml b/app/views/mailer/register_es.rhtml deleted file mode 100644 index 64477febc..000000000 --- a/app/views/mailer/register_es.rhtml +++ /dev/null @@ -1,3 +0,0 @@ -To activate your redMine account, use the following link: - -http://<%= Setting.host_name %>/account/register?token=<%= @token.value %> \ No newline at end of file diff --git a/app/views/mailer/register_fr.rhtml b/app/views/mailer/register_fr.rhtml index 2258480c0..054df5d37 100644 --- a/app/views/mailer/register_fr.rhtml +++ b/app/views/mailer/register_fr.rhtml @@ -1,3 +1,3 @@ Pour activer votre compte sur redMine, utilisez le lien suivant: -http://<%= Setting.host_name %>/account/register?token=<%= @token.value %> \ No newline at end of file +<%= url_for :only_path => false, :host => Setting.host_name, :controller => 'account', :action => 'register', :token => @token.value %> diff --git a/app/views/mailer/register_it.rhtml b/app/views/mailer/register_it.rhtml index a1e035ac8..d117a96ed 100644 --- a/app/views/mailer/register_it.rhtml +++ b/app/views/mailer/register_it.rhtml @@ -1,3 +1,3 @@ Per attivare la vostra utenza redMine, usate il seguente collegamento: -http://<%= Setting.host_name %>/account/register?token=<%= @token.value %> \ No newline at end of file +<%= url_for :only_path => false, :host => Setting.host_name, :controller => 'account', :action => 'register', :token => @token.value %> diff --git a/app/views/mailer/register_ja.rhtml b/app/views/mailer/register_ja.rhtml index 2f5846fba..520d52fd2 100644 --- a/app/views/mailer/register_ja.rhtml +++ b/app/views/mailer/register_ja.rhtml @@ -1,3 +1,3 @@ redMine アカウントをアクティブにするには、以下のリンクをたどってください: -http://<%= Setting.host_name %>/account/register?token=<%= @token.value %> \ No newline at end of file +<%= url_for :only_path => false, :host => Setting.host_name, :controller => 'account', :action => 'register', :token => @token.value %> diff --git a/app/views/mailer/register_nl.rhtml b/app/views/mailer/register_nl.rhtml index a8da4e7bf..966ef6010 100644 --- a/app/views/mailer/register_nl.rhtml +++ b/app/views/mailer/register_nl.rhtml @@ -1,3 +1,3 @@ Gebruik de volgende link om Uw redMine account te activeren: -http://<%= Setting.host_name %>/account/register?token=<%= @token.value %> \ No newline at end of file +<%= url_for :only_path => false, :host => Setting.host_name, :controller => 'account', :action => 'register', :token => @token.value %> diff --git a/app/views/mailer/register_pt-br.rhtml b/app/views/mailer/register_pt-br.rhtml index 6b7d4b1d4..fcf3f02ed 100644 --- a/app/views/mailer/register_pt-br.rhtml +++ b/app/views/mailer/register_pt-br.rhtml @@ -1,3 +1,3 @@ Para ativar sua conta do redMine, clique no link abaixo: -http://<%= Setting.host_name %>/account/register?token=<%= @token.value %> \ No newline at end of file +<%= url_for :only_path => false, :host => Setting.host_name, :controller => 'account', :action => 'register', :token => @token.value %> diff --git a/app/views/mailer/register_pt.rhtml b/app/views/mailer/register_pt.rhtml index 6b7d4b1d4..fcf3f02ed 100644 --- a/app/views/mailer/register_pt.rhtml +++ b/app/views/mailer/register_pt.rhtml @@ -1,3 +1,3 @@ Para ativar sua conta do redMine, clique no link abaixo: -http://<%= Setting.host_name %>/account/register?token=<%= @token.value %> \ No newline at end of file +<%= url_for :only_path => false, :host => Setting.host_name, :controller => 'account', :action => 'register', :token => @token.value %> diff --git a/app/views/mailer/register_sv.rhtml b/app/views/mailer/register_sv.rhtml index c7e6d46fe..e7bdd227f 100644 --- a/app/views/mailer/register_sv.rhtml +++ b/app/views/mailer/register_sv.rhtml @@ -1,3 +1,3 @@ -Fr att aktivera ditt redMine-konto, använd följande länk. +För att aktivera ditt redMine-konto, använd följande länk. -http://<%= Setting.host_name %>/account/register?token=<%= @token.value %> \ No newline at end of file +<%= url_for :only_path => false, :host => Setting.host_name, :controller => 'account', :action => 'register', :token => @token.value %> diff --git a/app/views/mailer/register_zh.rhtml b/app/views/mailer/register_zh.rhtml deleted file mode 100644 index 0e6dd7f53..000000000 --- a/app/views/mailer/register_zh.rhtml +++ /dev/null @@ -1,3 +0,0 @@ -ӼredMine˺ - -http://<%= Setting.host_name %>/account/register?token=<%= @token.value %> \ No newline at end of file diff --git a/app/views/mailer/test.rhtml b/app/views/mailer/test.rhtml index 0e1629ba4..deffa53e2 100644 --- a/app/views/mailer/test.rhtml +++ b/app/views/mailer/test.rhtml @@ -1 +1,3 @@ This is a test email sent by Redmine. + +Redmine URL: <%= url_for :only_path => false, :host => Setting.host_name, :controller => 'welcome' %>