Software
/
rosa-build
mirror of https://github.com/OpenMandrivaSoftware/rosa-build.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[refs #737] remove branch from commit message

This commit is contained in:
Alexander Machehin 2012-11-28 19:15:15 +06:00
parent c969d82c94
commit 76606036cb
8 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/presenters/git_presenters/commit_as_message_presenter.rb
View File

@ -7,15 +7,12 @@ class GitPresenters::CommitAsMessagePresenter < ApplicationPresenter
def initialize(commit, opts = {}) def initialize(commit, opts = {})
@commit = commit @commit = commit
@options = opts#[:branch] if opts[:branch] @options = opts
prepare_message prepare_message
end end
def header def header
@header ||= if options[:branch].present? @header ||= if options[:project].present?
I18n.t("layout.messages.commits.header_with_branch",
:committer => committer_link, :commit => commit_link, :branch => options[:branch].name)
elsif options[:project].present?
I18n.t("layout.messages.commits.header", I18n.t("layout.messages.commits.header",
:committer => committer_link, :commit => commit_link, :project => options[:project].name) :committer => committer_link, :commit => commit_link, :project => options[:project].name)
end.html_safe end.html_safe

2
app/views/projects/base/_layout.html.haml
View File

@ -3,7 +3,7 @@
= render 'about_block', :project => @project = render 'about_block', :project => @project
%h3= t("layout.projects.last_commit") %h3= t("layout.projects.last_commit")
- GitPresenters::CommitAsMessagePresenter.present(@commit, :branch => @branch, :project => @project) do |presenter| - GitPresenters::CommitAsMessagePresenter.present(@commit, :project => @project) do |presenter|
= render 'shared/feed_message', :presenter => presenter, :item_no => 1 = render 'shared/feed_message', :presenter => presenter, :item_no => 1
.both .both

2
app/views/projects/git/blobs/blame.html.haml
View File

@ -5,7 +5,7 @@
%h3= t("layout.projects.last_commit") %h3= t("layout.projects.last_commit")
- GitPresenters::CommitAsMessagePresenter.present(@commit, :branch => @branch, :project => @project) do |presenter| - GitPresenters::CommitAsMessagePresenter.present(@commit, :project => @project) do |presenter|
= render 'shared/feed_message', :presenter => presenter, :item_no => 1 = render 'shared/feed_message', :presenter => presenter, :item_no => 1
.both .both

2
app/views/projects/git/commits/_commits.html.haml
View File

@ -12,7 +12,7 @@
.date= raw l(commits.first.authored_date, :format => :date_block_format) .date= raw l(commits.first.authored_date, :format => :date_block_format)
.messages .messages
- commits.each_with_index do |commit| - commits.each_with_index do |commit|
- GitPresenters::CommitAsMessagePresenter.present(commit, :branch => @branch, :project => @project) do |presenter| - GitPresenters::CommitAsMessagePresenter.present(commit, :project => @project) do |presenter|
= render 'shared/feed_message', :presenter => presenter, :item_no => counter = render 'shared/feed_message', :presenter => presenter, :item_no => counter
- counter += 1 - counter += 1
.both .both

2
app/views/projects/git/commits/_commits_small.html.haml
View File

@ -3,7 +3,7 @@
%tbody %tbody
- commits.each do |commit| - commits.each do |commit|
- item_no = commit.id - item_no = commit.id
- GitPresenters::CommitAsMessagePresenter.present(commit, :branch => @branch, :project => @project) do |presenter| - GitPresenters::CommitAsMessagePresenter.present(commit, :project => @project) do |presenter|
%tr %tr
%td %td
%img{:height => 16, :alt => "avatar", :src => presenter.image} %img{:height => 16, :alt => "avatar", :src => presenter.image}

2
app/views/projects/git/commits/show.html.haml
View File

@ -3,7 +3,7 @@
= render 'about_block', :project => @project = render 'about_block', :project => @project
%h3= t("layout.projects.last_commit") %h3= t("layout.projects.last_commit")
- GitPresenters::CommitAsMessagePresenter.present(@commit, :branch => @branch, :project => @project) do |presenter| - GitPresenters::CommitAsMessagePresenter.present(@commit, :project => @project) do |presenter|
= render :partial => 'shared/feed_message', :locals => {:presenter => presenter, :item_no => 1} = render :partial => 'shared/feed_message', :locals => {:presenter => presenter, :item_no => 1}
.both .both

1
config/locales/layout/messages.en.yml
View File

@ -2,5 +2,4 @@ en:
layout: layout:
messages: messages:
commits: commits:
header_with_branch: "%{committer} has added %{commit} into %{branch} branch"
header: "%{committer} has added %{commit}" header: "%{committer} has added %{commit}"

1
config/locales/layout/messages.ru.yml
View File

@ -2,5 +2,4 @@ ru:
layout: layout:
messages: messages:
commits: commits:
header_with_branch: "%{committer} добавил коммит %{commit} в ветку %{branch}"
header: "%{committer} добавил коммит %{commit}" header: "%{committer} добавил коммит %{commit}"