dinislage/redmine_contracts
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[#6441] Refactor: merge i18n strings by passing in a reason and object

Browse Source
This commit is contained in:
Eric Davis committed 2011-08-09 15:59:24 -07:00
1 parent 2f79493cca
commit 7c23725bbd
2 files changed
+5 -8
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

config/locales/en.yml
+1 -4
View File
@@ -2,10 +2,7 @@ en:
activerecord: activerecord:
errors: errors:
messages: messages:
cant_create_time_on_closed_deliverable: "Can't create a time entry on a closed deliverable" cant_create_time_on_object: "Can't create a time entry on a %{reason} %{thing}"
cant_create_time_on_closed_contract: "Can't create a time entry on a closed contract"
cant_create_time_on_locked_deliverable: "Can't create a time entry on a locked deliverable"
cant_create_time_on_locked_contract: "Can't create a time entry on a locked contract"
cant_assign_to_closed_deliverable: "Can't assign issue to a closed deliverable" cant_assign_to_closed_deliverable: "Can't assign issue to a closed deliverable"
cant_assign_to_locked_deliverable: "Can't assign issue to a locked deliverable" cant_assign_to_locked_deliverable: "Can't assign issue to a locked deliverable"
cant_update_locked_deliverable: "Can't update a locked deliverable" cant_update_locked_deliverable: "Can't update a locked deliverable"
lib/redmine_contracts/patches/time_entry_patch.rb
+4 -4
View File
@@ -13,15 +13,15 @@ module RedmineContracts
def validate_deliverable_status def validate_deliverable_status
if issue.present? && issue.deliverable.present? if issue.present? && issue.deliverable.present?
errors.add_to_base(:cant_create_time_on_locked_deliverable) if issue.deliverable.locked? errors.add_to_base("#{l(:"activerecord.errors.messages.cant_create_time_on_object", :reason => 'locked', :thing => 'deliverable')}") if issue.deliverable.locked?
errors.add_to_base(:cant_create_time_on_closed_deliverable) if issue.deliverable.closed? errors.add_to_base("#{l(:"activerecord.errors.messages.cant_create_time_on_object", :reason => 'closed', :thing => 'deliverable')}") if issue.deliverable.closed?
end end
end end
def validate_contract_status def validate_contract_status
if issue.present? && issue.deliverable.present? && issue.deliverable.contract.present? if issue.present? && issue.deliverable.present? && issue.deliverable.contract.present?
errors.add_to_base(:cant_create_time_on_locked_contract) if issue.deliverable.contract.locked? errors.add_to_base("#{l(:"activerecord.errors.messages.cant_create_time_on_object", :reason => 'locked', :thing => 'contract')}") if issue.deliverable.contract.locked?
errors.add_to_base(:cant_create_time_on_closed_contract) if issue.deliverable.contract.closed? errors.add_to_base("#{l(:"activerecord.errors.messages.cant_create_time_on_object", :reason => 'closed', :thing => 'contract')}") if issue.deliverable.contract.closed?
end end
end end