Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Don't translate audit messages #4952

Merged
merged 2 commits into from
Nov 23, 2018
Merged

Don't translate audit messages #4952

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e2a64ab
EmsCommonHelper: don't translate audit messages
mzazrivec Nov 21, 2018
4090c74
OpsController: don't translate audit messages
mzazrivec Nov 21, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions app/controllers/ems_common_helper.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,11 @@ def add_success_audit(emss, task)
:model => _(table_name.humanize),
:models => _(table_name.humanize.pluralize),
}
msg = n_("'%{task}' successfully initiated for %{model}",
"'%{task}' successfully initiated for %{models}", emss.length) % msg_params
msg = if emss.length == 1
"'%{task}' successfully initiated for %{model}" % msg_params
else
"'%{task}' successfully initiated for %{models}" % msg_params
end
audit = {
:userid => session[:userid],
:event => "#{table_name}_#{task}",
Expand Down
16 changes: 8 additions & 8 deletions app/controllers/ops_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -784,31 +784,31 @@ def replace_explorer_trees(replace_trees, presenter)
def build_saved_audit(record, add = false)
name = record.respond_to?(:name) ? record.name : record.description
msg = if add
_("[%{name}] Record added (") % {:name => name}
"[%{name}] Record added (" % {:name => name}
else
_("[%{name}] Record updated (") % {:name => name}
"[%{name}] Record updated (" % {:name => name}
end
event = "#{record.class.to_s.downcase}_record_#{add ? "add" : "update"}"
i = 0
@edit[:new].each_key do |k|
if @edit[:new][k] != @edit[:current][k]
if k.to_s.ends_with?("password2", "verify") # do nothing
elsif k.to_s.ends_with?("password", "_pwd") # Asterisk out password fields
msg = _("%{message} %{key}:[*] to [*]") % {:message => msg, :key => k.to_s}
msg = "%{message} %{key}:[*] to [*]" % {:message => msg, :key => k.to_s}
else
msg += ", " if i > 0
i += 1
if k == :members
msg = _("%{message} %{key}:[%{old_value}] to [new_value]") %
msg = "%{message} %{key}:[%{old_value}] to [new_value]" %
{:message => msg,
:key => k.to_s,
:old_value => @edit[:current][k].keys.join(","),
:new_value => @edit[:new][k].keys.join(",")}
else
msg = _("%{message} %{key}:[%{old_value}] to [%{new_value}]") % {:message => msg,
:key => k.to_s,
:old_value => @edit[:current][k].to_s,
:new_value => @edit[:new][k].to_s}
msg = "%{message} %{key}:[%{old_value}] to [%{new_value}]" % {:message => msg,
:key => k.to_s,
:old_value => @edit[:current][k].to_s,
:new_value => @edit[:new][k].to_s}
end
end
end
Expand Down