summaryrefslogtreecommitdiffstats
path: root/app/views/mailer
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2007-03-12 17:59:02 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2007-03-12 17:59:02 +0000
commit027bf93849e82ef3c60e4a3024db49d65f0fb3c9 (patch)
treec6bc438fcd50370944b94f605b3f34fe54b73248 /app/views/mailer
parent071f8e18d02f789149071abb8e052bae7ad01003 (diff)
downloadredmine-027bf93849e82ef3c60e4a3024db49d65f0fb3c9.tar.gz
redmine-027bf93849e82ef3c60e4a3024db49d65f0fb3c9.zip
added svn:eol-style native property on /app files
git-svn-id: http://redmine.rubyforge.org/svn/trunk@333 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/views/mailer')
-rw-r--r--app/views/mailer/_issue.rhtml10
-rw-r--r--app/views/mailer/attachments_add_de.rhtml10
-rw-r--r--app/views/mailer/attachments_add_en.rhtml10
-rw-r--r--app/views/mailer/attachments_add_es.rhtml10
-rw-r--r--app/views/mailer/attachments_add_fr.rhtml10
-rw-r--r--app/views/mailer/attachments_add_ja.rhtml10
-rw-r--r--app/views/mailer/document_add_de.rhtml6
-rw-r--r--app/views/mailer/document_add_en.rhtml6
-rw-r--r--app/views/mailer/document_add_es.rhtml6
-rw-r--r--app/views/mailer/document_add_fr.rhtml6
-rw-r--r--app/views/mailer/document_add_ja.rhtml6
-rw-r--r--app/views/mailer/issue_add_de.rhtml4
-rw-r--r--app/views/mailer/issue_add_en.rhtml4
-rw-r--r--app/views/mailer/issue_add_es.rhtml4
-rw-r--r--app/views/mailer/issue_add_fr.rhtml4
-rw-r--r--app/views/mailer/issue_add_ja.rhtml4
-rw-r--r--app/views/mailer/issue_edit_de.rhtml14
-rw-r--r--app/views/mailer/issue_edit_en.rhtml14
-rw-r--r--app/views/mailer/issue_edit_es.rhtml14
-rw-r--r--app/views/mailer/issue_edit_fr.rhtml14
-rw-r--r--app/views/mailer/issue_edit_ja.rhtml14
-rw-r--r--app/views/mailer/lost_password_de.rhtml4
-rw-r--r--app/views/mailer/lost_password_en.rhtml4
-rw-r--r--app/views/mailer/lost_password_es.rhtml4
-rw-r--r--app/views/mailer/lost_password_fr.rhtml4
-rw-r--r--app/views/mailer/lost_password_ja.rhtml4
-rw-r--r--app/views/mailer/register_de.rhtml4
-rw-r--r--app/views/mailer/register_en.rhtml4
-rw-r--r--app/views/mailer/register_es.rhtml4
-rw-r--r--app/views/mailer/register_fr.rhtml4
-rw-r--r--app/views/mailer/register_ja.rhtml4
31 files changed, 110 insertions, 110 deletions
diff --git a/app/views/mailer/_issue.rhtml b/app/views/mailer/_issue.rhtml
index 4c5255d3e..877947d38 100644
--- a/app/views/mailer/_issue.rhtml
+++ b/app/views/mailer/_issue.rhtml
@@ -1,7 +1,7 @@
-<%=l(:label_issue)%> #<%= issue.id %> - <%= issue.subject %>
-<%=l(:field_author)%>: <%= issue.author.display_name %>
-<%=l(:field_status)%>: <%= issue.status.name %>
+<%=l(:label_issue)%> #<%= issue.id %> - <%= issue.subject %>
+<%=l(:field_author)%>: <%= issue.author.display_name %>
+<%=l(:field_status)%>: <%= issue.status.name %>
+
+<%= issue.description %>
-<%= issue.description %>
-
http://<%= Setting.host_name %>/issues/show/<%= issue.id %> \ No newline at end of file
diff --git a/app/views/mailer/attachments_add_de.rhtml b/app/views/mailer/attachments_add_de.rhtml
index f17af9d8e..81e2974c1 100644
--- a/app/views/mailer/attachments_add_de.rhtml
+++ b/app/views/mailer/attachments_add_de.rhtml
@@ -1,6 +1,6 @@
-<%= @added_to %>
-<%= @attachments.size %> files(s) added.
-<% @attachments.each do |attachment | %>
-- <%= attachment.filename %><% end %>
-
+<%= @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/attachments_add_en.rhtml b/app/views/mailer/attachments_add_en.rhtml
index f17af9d8e..81e2974c1 100644
--- a/app/views/mailer/attachments_add_en.rhtml
+++ b/app/views/mailer/attachments_add_en.rhtml
@@ -1,6 +1,6 @@
-<%= @added_to %>
-<%= @attachments.size %> files(s) added.
-<% @attachments.each do |attachment | %>
-- <%= attachment.filename %><% end %>
-
+<%= @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/attachments_add_es.rhtml b/app/views/mailer/attachments_add_es.rhtml
index f17af9d8e..81e2974c1 100644
--- a/app/views/mailer/attachments_add_es.rhtml
+++ b/app/views/mailer/attachments_add_es.rhtml
@@ -1,6 +1,6 @@
-<%= @added_to %>
-<%= @attachments.size %> files(s) added.
-<% @attachments.each do |attachment | %>
-- <%= attachment.filename %><% end %>
-
+<%= @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/attachments_add_fr.rhtml b/app/views/mailer/attachments_add_fr.rhtml
index 381b48961..8a0430d86 100644
--- a/app/views/mailer/attachments_add_fr.rhtml
+++ b/app/views/mailer/attachments_add_fr.rhtml
@@ -1,6 +1,6 @@
-<%= @added_to %>
-<%= @attachments.size %> fichier(s) ajouté(s).
-<% @attachments.each do |attachment | %>
-- <%= attachment.filename %><% end %>
-
+<%= @added_to %>
+<%= @attachments.size %> fichier(s) ajouté(s).
+<% @attachments.each do |attachment | %>
+- <%= attachment.filename %><% end %>
+
<%= @url %> \ No newline at end of file
diff --git a/app/views/mailer/attachments_add_ja.rhtml b/app/views/mailer/attachments_add_ja.rhtml
index e0e95bd0a..41131e573 100644
--- a/app/views/mailer/attachments_add_ja.rhtml
+++ b/app/views/mailer/attachments_add_ja.rhtml
@@ -1,6 +1,6 @@
-<%= @added_to %>
-<%= @attachments.size %> ファイルが追加されました。
-<% @attachments.each do |attachment | %>
-- <%= attachment.filename %><% end %>
-
+<%= @added_to %>
+<%= @attachments.size %> ファイルが追加されました。
+<% @attachments.each do |attachment | %>
+- <%= attachment.filename %><% end %>
+
<%= @url %> \ No newline at end of file
diff --git a/app/views/mailer/document_add_de.rhtml b/app/views/mailer/document_add_de.rhtml
index a022829a7..67648de15 100644
--- a/app/views/mailer/document_add_de.rhtml
+++ b/app/views/mailer/document_add_de.rhtml
@@ -1,4 +1,4 @@
-A document has been added to <%= @document.project.name %> (<%= @document.category.name %>):
-<%= l(:field_title) %>: <%= @document.title %>
-
+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_en.rhtml b/app/views/mailer/document_add_en.rhtml
index a022829a7..67648de15 100644
--- a/app/views/mailer/document_add_en.rhtml
+++ b/app/views/mailer/document_add_en.rhtml
@@ -1,4 +1,4 @@
-A document has been added to <%= @document.project.name %> (<%= @document.category.name %>):
-<%= l(:field_title) %>: <%= @document.title %>
-
+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_es.rhtml b/app/views/mailer/document_add_es.rhtml
index a022829a7..67648de15 100644
--- a/app/views/mailer/document_add_es.rhtml
+++ b/app/views/mailer/document_add_es.rhtml
@@ -1,4 +1,4 @@
-A document has been added to <%= @document.project.name %> (<%= @document.category.name %>):
-<%= l(:field_title) %>: <%= @document.title %>
-
+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 c116c84cb..b6f877579 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 %>
-
+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
diff --git a/app/views/mailer/document_add_ja.rhtml b/app/views/mailer/document_add_ja.rhtml
index c64740fb4..3834947b8 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 %>
-
+文書が <%= @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/issue_add_de.rhtml b/app/views/mailer/issue_add_de.rhtml
index 9efec9ad9..823de2cef 100644
--- a/app/views/mailer/issue_add_de.rhtml
+++ b/app/views/mailer/issue_add_de.rhtml
@@ -1,3 +1,3 @@
-Issue #<%= @issue.id %> has been reported.
-----------------------------------------
+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_add_en.rhtml b/app/views/mailer/issue_add_en.rhtml
index 9efec9ad9..823de2cef 100644
--- a/app/views/mailer/issue_add_en.rhtml
+++ b/app/views/mailer/issue_add_en.rhtml
@@ -1,3 +1,3 @@
-Issue #<%= @issue.id %> has been reported.
-----------------------------------------
+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_add_es.rhtml b/app/views/mailer/issue_add_es.rhtml
index 9efec9ad9..823de2cef 100644
--- a/app/views/mailer/issue_add_es.rhtml
+++ b/app/views/mailer/issue_add_es.rhtml
@@ -1,3 +1,3 @@
-Issue #<%= @issue.id %> has been reported.
-----------------------------------------
+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_add_fr.rhtml b/app/views/mailer/issue_add_fr.rhtml
index 628ecae12..458188782 100644
--- a/app/views/mailer/issue_add_fr.rhtml
+++ b/app/views/mailer/issue_add_fr.rhtml
@@ -1,3 +1,3 @@
-Une nouvelle demande (#<%= @issue.id %>) a été soumise.
-----------------------------------------
+Une nouvelle demande (#<%= @issue.id %>) a été soumise.
+----------------------------------------
<%= render :file => "_issue", :use_full_path => true, :locals => { :issue => @issue } %> \ No newline at end of file
diff --git a/app/views/mailer/issue_add_ja.rhtml b/app/views/mailer/issue_add_ja.rhtml
index 113546ae1..14d9258ab 100644
--- a/app/views/mailer/issue_add_ja.rhtml
+++ b/app/views/mailer/issue_add_ja.rhtml
@@ -1,3 +1,3 @@
-問題 #<%= @issue.id %> が報告されました。
-----------------------------------------
+問題 #<%= @issue.id %> が報告されました。
+----------------------------------------
<%= render :file => "_issue", :use_full_path => true, :locals => { :issue => @issue } %> \ No newline at end of file
diff --git a/app/views/mailer/issue_edit_de.rhtml b/app/views/mailer/issue_edit_de.rhtml
index d22d6c534..7a9ca1634 100644
--- a/app/views/mailer/issue_edit_de.rhtml
+++ b/app/views/mailer/issue_edit_de.rhtml
@@ -1,8 +1,8 @@
-Issue #<%= @issue.id %> has been updated.
-<%= @journal.user.name %>
-<% for detail in @journal.details %>
-<%= show_detail(detail, true) %>
-<% end %>
-<%= @journal.notes if @journal.notes? %>
-----------------------------------------
+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/issue_edit_en.rhtml b/app/views/mailer/issue_edit_en.rhtml
index d22d6c534..7a9ca1634 100644
--- a/app/views/mailer/issue_edit_en.rhtml
+++ b/app/views/mailer/issue_edit_en.rhtml
@@ -1,8 +1,8 @@
-Issue #<%= @issue.id %> has been updated.
-<%= @journal.user.name %>
-<% for detail in @journal.details %>
-<%= show_detail(detail, true) %>
-<% end %>
-<%= @journal.notes if @journal.notes? %>
-----------------------------------------
+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/issue_edit_es.rhtml b/app/views/mailer/issue_edit_es.rhtml
index d22d6c534..7a9ca1634 100644
--- a/app/views/mailer/issue_edit_es.rhtml
+++ b/app/views/mailer/issue_edit_es.rhtml
@@ -1,8 +1,8 @@
-Issue #<%= @issue.id %> has been updated.
-<%= @journal.user.name %>
-<% for detail in @journal.details %>
-<%= show_detail(detail, true) %>
-<% end %>
-<%= @journal.notes if @journal.notes? %>
-----------------------------------------
+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/issue_edit_fr.rhtml b/app/views/mailer/issue_edit_fr.rhtml
index d86f29c25..ecea9e274 100644
--- a/app/views/mailer/issue_edit_fr.rhtml
+++ b/app/views/mailer/issue_edit_fr.rhtml
@@ -1,8 +1,8 @@
-La demande #<%= @issue.id %> a été mise à jour.
-<%= @journal.user.name %>
-<% for detail in @journal.details %>
-<%= show_detail(detail, true) %>
-<% end %>
-<%= @journal.notes if @journal.notes? %>
-----------------------------------------
+La demande #<%= @issue.id %> a été mise à jour.
+<%= @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/issue_edit_ja.rhtml b/app/views/mailer/issue_edit_ja.rhtml
index b0a93db87..d3b1b520b 100644
--- a/app/views/mailer/issue_edit_ja.rhtml
+++ b/app/views/mailer/issue_edit_ja.rhtml
@@ -1,8 +1,8 @@
-問題 #<%= @issue.id %> が更新されました。
-<%= @journal.user.name %>
-<% for detail in @journal.details %>
-<%= show_detail(detail, true) %>
-<% end %>
-<%= @journal.notes if @journal.notes? %>
-----------------------------------------
+問題 #<%= @issue.id %> が更新されました。
+<%= @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_de.rhtml b/app/views/mailer/lost_password_de.rhtml
index 0b391498b..332ddeb0b 100644
--- a/app/views/mailer/lost_password_de.rhtml
+++ b/app/views/mailer/lost_password_de.rhtml
@@ -1,3 +1,3 @@
-To change your password, use the following link:
-
+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_en.rhtml b/app/views/mailer/lost_password_en.rhtml
index 0b391498b..332ddeb0b 100644
--- a/app/views/mailer/lost_password_en.rhtml
+++ b/app/views/mailer/lost_password_en.rhtml
@@ -1,3 +1,3 @@
-To change your password, use the following link:
-
+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_es.rhtml b/app/views/mailer/lost_password_es.rhtml
index 0b391498b..332ddeb0b 100644
--- a/app/views/mailer/lost_password_es.rhtml
+++ b/app/views/mailer/lost_password_es.rhtml
@@ -1,3 +1,3 @@
-To change your password, use the following link:
-
+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 18b6bf6ae..8282611e8 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:
-
+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
diff --git a/app/views/mailer/lost_password_ja.rhtml b/app/views/mailer/lost_password_ja.rhtml
index 99266be26..1f203e8d9 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
diff --git a/app/views/mailer/register_de.rhtml b/app/views/mailer/register_de.rhtml
index 95cc7c4a6..64477febc 100644
--- a/app/views/mailer/register_de.rhtml
+++ b/app/views/mailer/register_de.rhtml
@@ -1,3 +1,3 @@
-To activate your redMine account, use the following link:
-
+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_en.rhtml b/app/views/mailer/register_en.rhtml
index 95cc7c4a6..64477febc 100644
--- a/app/views/mailer/register_en.rhtml
+++ b/app/views/mailer/register_en.rhtml
@@ -1,3 +1,3 @@
-To activate your redMine account, use the following link:
-
+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_es.rhtml b/app/views/mailer/register_es.rhtml
index 95cc7c4a6..64477febc 100644
--- a/app/views/mailer/register_es.rhtml
+++ b/app/views/mailer/register_es.rhtml
@@ -1,3 +1,3 @@
-To activate your redMine account, use the following link:
-
+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 402b2a5d4..2258480c0 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:
-
+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
diff --git a/app/views/mailer/register_ja.rhtml b/app/views/mailer/register_ja.rhtml
index b990b934e..2f5846fba 100644
--- a/app/views/mailer/register_ja.rhtml
+++ b/app/views/mailer/register_ja.rhtml
@@ -1,3 +1,3 @@
-redMine アカウントをアクティブにするには、以下のリンクをたどってください:
-
+redMine アカウントをアクティブにするには、以下のリンクをたどってください:
+
http://<%= Setting.host_name %>/account/register?token=<%= @token.value %> \ No newline at end of file