[refs #265] fixed message format

app/views/activity_feeds/partials/_git_new_push_notification.haml

@@ -5,10 +5,11 @@
     .text
       %span.name
         = link_to user_name, user_path(user_id)
-      %br
+      .both
         %span.date= activity_feed.created_at
-        %br
+      .both
-          %span.subject Branch #{ branch_name } has been #{ change_type }d
+    .both
+    %span.subject Branch #{ branch_name } has been #{ change_type }d
     .both
 .fulltext
   - unless defined? user_email

app/views/activity_feeds/partials/_issue_assign_notification.haml

@@ -4,10 +4,11 @@
   .text
     %span.name
       = link_to activity_feed.user.uname, user_path(activity_feed.user.uname)
-    %br
+    .both
       %span.date= activity_feed.created_at
-      %br
+    .both
-        %span.subject= raw t("notifications.bodies.issue_assign_notification.title", :issue_link => link_to(issue_title, project_issue_path(project_id, issue_serial_id)))
+  .both
+  %span.subject= raw t("notifications.bodies.issue_assign_notification.title", :issue_link => link_to(issue_title, project_issue_path(project_id, issue_serial_id)))
   .both
 .fulltext
   =# raw t("notifications.bodies.issue_assign_notification.content", :issue_link => link_to(issue_title, project_issue_path(project_id, issue_serial_id)))

app/views/activity_feeds/partials/_new_comment_commit_notification.haml

@@ -4,10 +4,11 @@
   .text
     %span.name
       = link_to user_name, user_path(user_id)
-    %br
+    .both
       %span.date= activity_feed.created_at
-      %br
+    .both
-        %span.subject #{ t("notifications.bodies.new_commit_comment_notification.title", :user_name => user_name) }
+  .both
+    %span.subject #{ t("notifications.bodies.new_comment_notification.title", :user_name => user_name) }
   .both
 .fulltext
   = raw t("notifications.bodies.new_comment_notification.commit_content", {:commit_link => link_to(commit_message, commit_path(project_id, commit_id))})

app/views/activity_feeds/partials/_new_comment_notification.haml

@@ -4,10 +4,11 @@
   .text
     %span.name
       = link_to user_name, user_path(user_id)
-    %br
+    .both
       %span.date= activity_feed.created_at
-      %br
+    .both
-        %span.subject #{ t("notifications.bodies.new_comment_notification.title", :user_name => user_name) }
+  .both
+    %span.subject #{ t("notifications.bodies.new_comment_notification.title", :user_name => user_name) }
   .both
 .fulltext
   = raw t("notifications.bodies.new_comment_notification.content", {:issue_link => link_to(issue_title, project_issue_path(project_id, issue_serial_id))})

app/views/activity_feeds/partials/_new_issue_notification.haml

@@ -4,10 +4,11 @@
   .text
     %span.name
       = link_to user_name, user_path(user_id)
-    %br
+    .both
       %span.date= activity_feed.created_at
-      %br
+    .both
-        %span.subject #{ t("notifications.bodies.new_issue_notification.title", :user_name => user_name) }
+  .both
+    %span.subject #{ t("notifications.bodies.new_issue_notification.title", :user_name => user_name) }
   .both
 .fulltext
   = raw t("notifications.bodies.new_issue_notification.content", :issue_link => link_to(issue_title, project_issue_path(project_id, issue_serial_id)), :project_link => link_to(project_name, project_path(project_id)))

app/views/activity_feeds/partials/_new_user_notification.haml

@@ -4,10 +4,11 @@
   .text
     %span.name
       = link_to activity_feed.user.uname, user_path(activity_feed.user.uname)
-    %br
+    .both
       %span.date= activity_feed.created_at
-      %br
+    .both
-        %span.subject #{ t("notifications.bodies.new_user_notification.title", :user_name => user_name) }
+  .both
+    %span.subject #{ t("notifications.bodies.new_user_notification.title", :user_name => user_name) }
   .both
 .fulltext
   #{ t("notifications.bodies.new_user_notification.content") }

app/views/activity_feeds/partials/_wiki_new_commit_notification.haml

@@ -4,10 +4,11 @@
   .text
     %span.name
       = link_to user_name, user_path(user_id)
-    %br
+    .both
       %span.date= activity_feed.created_at
-      %br
+    .both
-        %span.subject #{ t("notifications.bodies.wiki_new_commit_notification.title", :user_name => user_name) }
+  .both
+    %span.subject #{ t("notifications.bodies.wiki_new_commit_notification.title", :user_name => user_name) }
   .both
 .fulltext
   = raw t("notifications.bodies.wiki_new_commit_notification.content", {:history_link => link_to("wiki", history_project_wiki_index_path(project_id)), :project_link => link_to(project_name, project_path(project_id)) })

config/locales/models/activity_feed.en.yml

@@ -21,7 +21,7 @@ en:
       new_comment_notification: 
         title: User %{user_name} has been added a new comment.
         content: Issue %{issue_link}
-        commit_content: To the commit %{commit_link} added a comment.
+        commit_content: Commit %{commit_link}
       new_issue_notification: 
         title: User %{user_name} has been added an issue.
         content: Project %{project_link}. Issue %{issue_link}

config/locales/models/activity_feed.ru.yml

@@ -21,7 +21,7 @@ ru:
       new_comment_notification:
         title: Пользователь %{user_name} добавил новый комментарий
         content: Задача %{issue_link}
-        commit_content: К коммиту %{commit_link} был добавлен новый комментарий.
+        commit_content: Коммит %{commit_link}
       new_issue_notification:
         title: Пользователь %{user_name} добавил новую задачу
         content: Проект %{project_link}. Задача %{issue_link}