Index: /trunk/grails-app/controllers/AddressDetailedController.groovy =================================================================== --- /trunk/grails-app/controllers/AddressDetailedController.groovy (revision 402) +++ /trunk/grails-app/controllers/AddressDetailedController.groovy (revision 403) @@ -66,6 +66,6 @@ def version = params.version.toLong() if(addressInstance.version > version) { - - addressInstance.errors.rejectValue("version", "address.optimistic.locking.failure", "Another user has updated this Address while you were editing.") + + addressInstance.errors.rejectValue("version", "default.optimistic.locking.failure") render(view:'edit',model:[addressInstance:addressInstance]) return Index: /trunk/grails-app/controllers/AppConfigController.groovy =================================================================== --- /trunk/grails-app/controllers/AppConfigController.groovy (revision 402) +++ /trunk/grails-app/controllers/AppConfigController.groovy (revision 403) @@ -61,5 +61,5 @@ if(appConfigInstance.version > version) { - appConfigInstance.errors.rejectValue("version", "appConfig.optimistic.locking.failure", "Another user has updated this AppConfig while you were editing.") + appConfigInstance.errors.rejectValue("version", "default.optimistic.locking.failure") render(view:'edit',model:[appConfigInstance:appConfigInstance]) return Index: /trunk/grails-app/controllers/AssetDetailedController.groovy =================================================================== --- /trunk/grails-app/controllers/AssetDetailedController.groovy (revision 402) +++ /trunk/grails-app/controllers/AssetDetailedController.groovy (revision 403) @@ -281,5 +281,5 @@ if(assetInstance.version > version) { - assetInstance.errors.rejectValue("version", "asset.optimistic.locking.failure", "Another user has updated this Asset while you were editing.") + assetInstance.errors.rejectValue("version", "default.optimistic.locking.failure") render(view:'edit',model:[assetInstance:assetInstance, possibleAssetSubItems: assetService.possibleAssetSubItems()]) return Index: /trunk/grails-app/controllers/AssetExtendedAttributeDetailedController.groovy =================================================================== --- /trunk/grails-app/controllers/AssetExtendedAttributeDetailedController.groovy (revision 402) +++ /trunk/grails-app/controllers/AssetExtendedAttributeDetailedController.groovy (revision 403) @@ -57,5 +57,5 @@ if(assetExtendedAttributeInstance.version > version) { - assetExtendedAttributeInstance.errors.rejectValue("version", "assetExtendedAttribute.optimistic.locking.failure", "Another user has updated this AssetExtendedAttribute while you were editing.") + assetExtendedAttributeInstance.errors.rejectValue("version", "default.optimistic.locking.failure") render(view:'edit',model:[assetExtendedAttributeInstance:assetExtendedAttributeInstance]) return Index: /trunk/grails-app/controllers/AssetSubItemDetailedController.groovy =================================================================== --- /trunk/grails-app/controllers/AssetSubItemDetailedController.groovy (revision 402) +++ /trunk/grails-app/controllers/AssetSubItemDetailedController.groovy (revision 403) @@ -158,5 +158,5 @@ if(assetSubItemInstance.version > version) { - assetSubItemInstance.errors.rejectValue("version", "assetSubItem.optimistic.locking.failure", "Another user has updated this AssetSubItem while you were editing.") + assetSubItemInstance.errors.rejectValue("version", "default.optimistic.locking.failure") render(view:'edit',model:[assetSubItemInstance:assetSubItemInstance]) return Index: /trunk/grails-app/controllers/AssetSubItemExtendedAttributeDetailedController.groovy =================================================================== --- /trunk/grails-app/controllers/AssetSubItemExtendedAttributeDetailedController.groovy (revision 402) +++ /trunk/grails-app/controllers/AssetSubItemExtendedAttributeDetailedController.groovy (revision 403) @@ -57,5 +57,5 @@ if(assetSubItemExtendedAttributeInstance.version > version) { - assetSubItemExtendedAttributeInstance.errors.rejectValue("version", "assetSubItemExtendedAttribute.optimistic.locking.failure", "Another user has updated this AssetSubItemExtendedAttribute while you were editing.") + assetSubItemExtendedAttributeInstance.errors.rejectValue("version", "default.optimistic.locking.failure") render(view:'edit',model:[assetSubItemExtendedAttributeInstance:assetSubItemExtendedAttributeInstance]) return Index: /trunk/grails-app/controllers/AssignedGroupController.groovy =================================================================== --- /trunk/grails-app/controllers/AssignedGroupController.groovy (revision 402) +++ /trunk/grails-app/controllers/AssignedGroupController.groovy (revision 403) @@ -61,5 +61,5 @@ if(assignedGroupInstance.version > version) { - assignedGroupInstance.errors.rejectValue("version", "assignedGroup.optimistic.locking.failure", "Another user has updated this AssignedGroup while you were editing.") + assignedGroupInstance.errors.rejectValue("version", "default.optimistic.locking.failure") render(view:'edit',model:[assignedGroupInstance:assignedGroupInstance]) return Index: /trunk/grails-app/controllers/AssignedPersonController.groovy =================================================================== --- /trunk/grails-app/controllers/AssignedPersonController.groovy (revision 402) +++ /trunk/grails-app/controllers/AssignedPersonController.groovy (revision 403) @@ -61,5 +61,5 @@ if(assignedPersonInstance.version > version) { - assignedPersonInstance.errors.rejectValue("version", "assignedPerson.optimistic.locking.failure", "Another user has updated this AssignedPerson while you were editing.") + assignedPersonInstance.errors.rejectValue("version", "default.optimistic.locking.failure") render(view:'edit',model:[assignedPersonInstance:assignedPersonInstance]) return Index: /trunk/grails-app/controllers/AuthorityController.groovy =================================================================== --- /trunk/grails-app/controllers/AuthorityController.groovy (revision 402) +++ /trunk/grails-app/controllers/AuthorityController.groovy (revision 403) @@ -81,6 +81,5 @@ long version = params.version.toLong() if (authority.version > version) { - authority.errors.rejectValue 'version', 'authority.optimistic.locking.failure', - 'Another user has updated this Authority while you were editing.' + authority.errors.rejectValue 'version', "default.optimistic.locking.failure" render view: 'edit', model: [authority: authority] return Index: /trunk/grails-app/controllers/DepartmentDetailedController.groovy =================================================================== --- /trunk/grails-app/controllers/DepartmentDetailedController.groovy (revision 402) +++ /trunk/grails-app/controllers/DepartmentDetailedController.groovy (revision 403) @@ -62,5 +62,5 @@ if(departmentInstance.version > version) { - departmentInstance.errors.rejectValue("version", "department.optimistic.locking.failure", "Another user has updated this Department while you were editing.") + departmentInstance.errors.rejectValue("version", "default.optimistic.locking.failure") render(view:'edit',model:[departmentInstance:departmentInstance]) return Index: /trunk/grails-app/controllers/DepartmentExtendedAttributeDetailedController.groovy =================================================================== --- /trunk/grails-app/controllers/DepartmentExtendedAttributeDetailedController.groovy (revision 402) +++ /trunk/grails-app/controllers/DepartmentExtendedAttributeDetailedController.groovy (revision 403) @@ -62,5 +62,5 @@ if(departmentExtendedAttributeInstance.version > version) { - departmentExtendedAttributeInstance.errors.rejectValue("version", "departmentExtendedAttribute.optimistic.locking.failure", "Another user has updated this DepartmentExtendedAttribute while you were editing.") + departmentExtendedAttributeInstance.errors.rejectValue("version", "default.optimistic.locking.failure") render(view:'edit',model:[departmentExtendedAttributeInstance:departmentExtendedAttributeInstance]) return Index: /trunk/grails-app/controllers/EntryController.groovy =================================================================== --- /trunk/grails-app/controllers/EntryController.groovy (revision 402) +++ /trunk/grails-app/controllers/EntryController.groovy (revision 403) @@ -61,5 +61,5 @@ if(entryInstance.version > version) { - entryInstance.errors.rejectValue("version", "entry.optimistic.locking.failure", "Another user has updated this Entry while you were editing.") + entryInstance.errors.rejectValue("version", "default.optimistic.locking.failure") render(view:'edit',model:[entryInstance:entryInstance]) return Index: /trunk/grails-app/controllers/EntryTypeController.groovy =================================================================== --- /trunk/grails-app/controllers/EntryTypeController.groovy (revision 402) +++ /trunk/grails-app/controllers/EntryTypeController.groovy (revision 403) @@ -61,5 +61,5 @@ if(entryTypeInstance.version > version) { - entryTypeInstance.errors.rejectValue("version", "entryType.optimistic.locking.failure", "Another user has updated this EntryType while you were editing.") + entryTypeInstance.errors.rejectValue("version", "default.optimistic.locking.failure") render(view:'edit',model:[entryTypeInstance:entryTypeInstance]) return Index: /trunk/grails-app/controllers/ExtendedAttributeTypeDetailedController.groovy =================================================================== --- /trunk/grails-app/controllers/ExtendedAttributeTypeDetailedController.groovy (revision 402) +++ /trunk/grails-app/controllers/ExtendedAttributeTypeDetailedController.groovy (revision 403) @@ -72,5 +72,5 @@ if(extendedAttributeTypeInstance.version > version) { - extendedAttributeTypeInstance.errors.rejectValue("version", "extendedAttributeType.optimistic.locking.failure", "Another user has updated this ExtendedAttributeType while you were editing.") + extendedAttributeTypeInstance.errors.rejectValue("version", "default.optimistic.locking.failure") render(view:'edit',model:[extendedAttributeTypeInstance:extendedAttributeTypeInstance]) return Index: /trunk/grails-app/controllers/InventoryGroupDetailedController.groovy =================================================================== --- /trunk/grails-app/controllers/InventoryGroupDetailedController.groovy (revision 402) +++ /trunk/grails-app/controllers/InventoryGroupDetailedController.groovy (revision 403) @@ -75,5 +75,5 @@ if(inventoryGroupInstance.version > version) { - inventoryGroupInstance.errors.rejectValue("version", "inventoryGroup.optimistic.locking.failure", "Another user has updated this InventoryGroup while you were editing.") + inventoryGroupInstance.errors.rejectValue("version", "default.optimistic.locking.failure") render(view:'edit',model:[inventoryGroupInstance:inventoryGroupInstance]) return Index: /trunk/grails-app/controllers/InventoryItemDetailedController.groovy =================================================================== --- /trunk/grails-app/controllers/InventoryItemDetailedController.groovy (revision 402) +++ /trunk/grails-app/controllers/InventoryItemDetailedController.groovy (revision 403) @@ -198,5 +198,5 @@ if(inventoryItemInstance.version > version) { - inventoryItemInstance.errors.rejectValue("version", "inventoryItem.optimistic.locking.failure", "Another user has updated this InventoryItem while you were editing.") + inventoryItemInstance.errors.rejectValue("version", "default.optimistic.locking.failure") render(view:'edit',model:[inventoryItemInstance:inventoryItemInstance]) return Index: /trunk/grails-app/controllers/InventoryLocationDetailedController.groovy =================================================================== --- /trunk/grails-app/controllers/InventoryLocationDetailedController.groovy (revision 402) +++ /trunk/grails-app/controllers/InventoryLocationDetailedController.groovy (revision 403) @@ -75,5 +75,5 @@ if(inventoryLocationInstance.version > version) { - inventoryLocationInstance.errors.rejectValue("version", "inventoryLocation.optimistic.locking.failure", "Another user has updated this InventoryLocation while you were editing.") + inventoryLocationInstance.errors.rejectValue("version", "default.optimistic.locking.failure") render(view:'edit',model:[inventoryLocationInstance:inventoryLocationInstance]) return Index: /trunk/grails-app/controllers/InventoryMovementController.groovy =================================================================== --- /trunk/grails-app/controllers/InventoryMovementController.groovy (revision 402) +++ /trunk/grails-app/controllers/InventoryMovementController.groovy (revision 403) @@ -61,5 +61,5 @@ if(inventoryMovementInstance.version > version) { - inventoryMovementInstance.errors.rejectValue("version", "inventoryMovement.optimistic.locking.failure", "Another user has updated this InventoryMovement while you were editing.") + inventoryMovementInstance.errors.rejectValue("version", "default.optimistic.locking.failure") render(view:'edit',model:[inventoryMovementInstance:inventoryMovementInstance]) return Index: /trunk/grails-app/controllers/InventoryMovementTypeController.groovy =================================================================== --- /trunk/grails-app/controllers/InventoryMovementTypeController.groovy (revision 402) +++ /trunk/grails-app/controllers/InventoryMovementTypeController.groovy (revision 403) @@ -61,5 +61,5 @@ if(inventoryMovementTypeInstance.version > version) { - inventoryMovementTypeInstance.errors.rejectValue("version", "inventoryMovementType.optimistic.locking.failure", "Another user has updated this InventoryMovementType while you were editing.") + inventoryMovementTypeInstance.errors.rejectValue("version", "default.optimistic.locking.failure") render(view:'edit',model:[inventoryMovementTypeInstance:inventoryMovementTypeInstance]) return Index: /trunk/grails-app/controllers/InventoryStoreDetailedController.groovy =================================================================== --- /trunk/grails-app/controllers/InventoryStoreDetailedController.groovy (revision 402) +++ /trunk/grails-app/controllers/InventoryStoreDetailedController.groovy (revision 403) @@ -74,5 +74,5 @@ if(inventoryStoreInstance.version > version) { - inventoryStoreInstance.errors.rejectValue("version", "inventoryStore.optimistic.locking.failure", "Another user has updated this InventoryStore while you were editing.") + inventoryStoreInstance.errors.rejectValue("version", "default.optimistic.locking.failure") render(view:'edit',model:[inventoryStoreInstance:inventoryStoreInstance]) return Index: /trunk/grails-app/controllers/InventoryTypeController.groovy =================================================================== --- /trunk/grails-app/controllers/InventoryTypeController.groovy (revision 402) +++ /trunk/grails-app/controllers/InventoryTypeController.groovy (revision 403) @@ -61,5 +61,5 @@ if(inventoryTypeInstance.version > version) { - inventoryTypeInstance.errors.rejectValue("version", "inventoryType.optimistic.locking.failure", "Another user has updated this InventoryType while you were editing.") + inventoryTypeInstance.errors.rejectValue("version", "default.optimistic.locking.failure") render(view:'edit',model:[inventoryTypeInstance:inventoryTypeInstance]) return Index: /trunk/grails-app/controllers/LifePlanController.groovy =================================================================== --- /trunk/grails-app/controllers/LifePlanController.groovy (revision 402) +++ /trunk/grails-app/controllers/LifePlanController.groovy (revision 403) @@ -61,5 +61,5 @@ if(lifePlanInstance.version > version) { - lifePlanInstance.errors.rejectValue("version", "lifePlan.optimistic.locking.failure", "Another user has updated this LifePlan while you were editing.") + lifePlanInstance.errors.rejectValue("version", "default.optimistic.locking.failure") render(view:'edit',model:[lifePlanInstance:lifePlanInstance]) return Index: /trunk/grails-app/controllers/MaintenanceActionDetailedController.groovy =================================================================== --- /trunk/grails-app/controllers/MaintenanceActionDetailedController.groovy (revision 402) +++ /trunk/grails-app/controllers/MaintenanceActionDetailedController.groovy (revision 403) @@ -65,5 +65,5 @@ if(maintenanceActionInstance.version > version) { - maintenanceActionInstance.errors.rejectValue("version", "maintenanceAction.optimistic.locking.failure", "Another user has updated this MaintenanceAction while you were editing.") + maintenanceActionInstance.errors.rejectValue("version", "default.optimistic.locking.failure") render(view:'edit',model:[maintenanceActionInstance:maintenanceActionInstance]) return Index: /trunk/grails-app/controllers/MaintenancePolicyDetailedController.groovy =================================================================== --- /trunk/grails-app/controllers/MaintenancePolicyDetailedController.groovy (revision 402) +++ /trunk/grails-app/controllers/MaintenancePolicyDetailedController.groovy (revision 403) @@ -75,5 +75,5 @@ if(maintenancePolicyInstance.version > version) { - maintenancePolicyInstance.errors.rejectValue("version", "maintenancePolicy.optimistic.locking.failure", "Another user has updated this MaintenancePolicy while you were editing.") + maintenancePolicyInstance.errors.rejectValue("version", "default.optimistic.locking.failure") render(view:'edit',model:[maintenancePolicyInstance:maintenancePolicyInstance]) return Index: /trunk/grails-app/controllers/ManufacturerDetailedController.groovy =================================================================== --- /trunk/grails-app/controllers/ManufacturerDetailedController.groovy (revision 402) +++ /trunk/grails-app/controllers/ManufacturerDetailedController.groovy (revision 403) @@ -72,5 +72,5 @@ if(manufacturerInstance.version > version) { - manufacturerInstance.errors.rejectValue("version", "manufacturer.optimistic.locking.failure", "Another user has updated this Manufacturer while you were editing.") + manufacturerInstance.errors.rejectValue("version", "default.optimistic.locking.failure") render(view:'edit',model:[manufacturerInstance:manufacturerInstance]) return Index: /trunk/grails-app/controllers/ManufacturerTypeDetailedController.groovy =================================================================== --- /trunk/grails-app/controllers/ManufacturerTypeDetailedController.groovy (revision 402) +++ /trunk/grails-app/controllers/ManufacturerTypeDetailedController.groovy (revision 403) @@ -75,5 +75,5 @@ if(manufacturerTypeInstance.version > version) { - manufacturerTypeInstance.errors.rejectValue("version", "manufacturerType.optimistic.locking.failure", "Another user has updated this ManufacturerType while you were editing.") + manufacturerTypeInstance.errors.rejectValue("version", "default.optimistic.locking.failure") render(view:'edit',model:[manufacturerTypeInstance:manufacturerTypeInstance]) return Index: /trunk/grails-app/controllers/PeriodController.groovy =================================================================== --- /trunk/grails-app/controllers/PeriodController.groovy (revision 402) +++ /trunk/grails-app/controllers/PeriodController.groovy (revision 403) @@ -61,5 +61,5 @@ if(periodInstance.version > version) { - periodInstance.errors.rejectValue("version", "period.optimistic.locking.failure", "Another user has updated this Period while you were editing.") + periodInstance.errors.rejectValue("version", "default.optimistic.locking.failure") render(view:'edit',model:[periodInstance:periodInstance]) return Index: /trunk/grails-app/controllers/PersonController.groovy =================================================================== --- /trunk/grails-app/controllers/PersonController.groovy (revision 402) +++ /trunk/grails-app/controllers/PersonController.groovy (revision 403) @@ -113,6 +113,5 @@ long version = params.version.toLong() if (person.version > version) { - person.errors.rejectValue 'version', "person.optimistic.locking.failure", - "Another user has updated this Person while you were editing." + person.errors.rejectValue 'version', "default.optimistic.locking.failure" render view: 'edit', model: buildPersonModel(person) return Index: /trunk/grails-app/controllers/PersonGroupController.groovy =================================================================== --- /trunk/grails-app/controllers/PersonGroupController.groovy (revision 402) +++ /trunk/grails-app/controllers/PersonGroupController.groovy (revision 403) @@ -61,5 +61,5 @@ if(personGroupInstance.version > version) { - personGroupInstance.errors.rejectValue("version", "personGroup.optimistic.locking.failure", "Another user has updated this PersonGroup while you were editing.") + personGroupInstance.errors.rejectValue("version", "default.optimistic.locking.failure") render(view:'edit',model:[personGroupInstance:personGroupInstance]) return Index: /trunk/grails-app/controllers/PersonGroupTypeController.groovy =================================================================== --- /trunk/grails-app/controllers/PersonGroupTypeController.groovy (revision 402) +++ /trunk/grails-app/controllers/PersonGroupTypeController.groovy (revision 403) @@ -61,5 +61,5 @@ if(personGroupTypeInstance.version > version) { - personGroupTypeInstance.errors.rejectValue("version", "personGroupType.optimistic.locking.failure", "Another user has updated this PersonGroupType while you were editing.") + personGroupTypeInstance.errors.rejectValue("version", "default.optimistic.locking.failure") render(view:'edit',model:[personGroupTypeInstance:personGroupTypeInstance]) return Index: /trunk/grails-app/controllers/PictureDetailedController.groovy =================================================================== --- /trunk/grails-app/controllers/PictureDetailedController.groovy (revision 402) +++ /trunk/grails-app/controllers/PictureDetailedController.groovy (revision 403) @@ -90,5 +90,5 @@ def version = params.version.toLong() if(picture.version > version) { - picture.errors.rejectValue("version", "picture.optimistic.locking.failure", "Another user has updated this Picture while you were editing.") + picture.errors.rejectValue("version", "default.optimistic.locking.failure") render(view:'edit',model:[picture:picture]) return Index: /trunk/grails-app/controllers/SectionDetailedController.groovy =================================================================== --- /trunk/grails-app/controllers/SectionDetailedController.groovy (revision 402) +++ /trunk/grails-app/controllers/SectionDetailedController.groovy (revision 403) @@ -78,5 +78,5 @@ if(sectionInstance.version > version) { - sectionInstance.errors.rejectValue("version", "section.optimistic.locking.failure", "Another user has updated this Section while you were editing.") + sectionInstance.errors.rejectValue("version", "default.optimistic.locking.failure") render(view:'edit',model:[sectionInstance:sectionInstance]) return Index: /trunk/grails-app/controllers/SectionExtendedAttributeDetailedController.groovy =================================================================== --- /trunk/grails-app/controllers/SectionExtendedAttributeDetailedController.groovy (revision 402) +++ /trunk/grails-app/controllers/SectionExtendedAttributeDetailedController.groovy (revision 403) @@ -62,5 +62,5 @@ if(sectionExtendedAttributeInstance.version > version) { - sectionExtendedAttributeInstance.errors.rejectValue("version", "sectionExtendedAttribute.optimistic.locking.failure", "Another user has updated this SectionExtendedAttribute while you were editing.") + sectionExtendedAttributeInstance.errors.rejectValue("version", "default.optimistic.locking.failure") render(view:'edit',model:[sectionExtendedAttributeInstance:sectionExtendedAttributeInstance]) return Index: /trunk/grails-app/controllers/SiteDetailedController.groovy =================================================================== --- /trunk/grails-app/controllers/SiteDetailedController.groovy (revision 402) +++ /trunk/grails-app/controllers/SiteDetailedController.groovy (revision 403) @@ -78,5 +78,5 @@ if(siteInstance.version > version) { - siteInstance.errors.rejectValue("version", "site.optimistic.locking.failure", "Another user has updated this Site while you were editing.") + siteInstance.errors.rejectValue("version", "default.optimistic.locking.failure") render(view:'edit',model:[siteInstance:siteInstance]) return Index: /trunk/grails-app/controllers/SiteExtendedAttributeDetailedController.groovy =================================================================== --- /trunk/grails-app/controllers/SiteExtendedAttributeDetailedController.groovy (revision 402) +++ /trunk/grails-app/controllers/SiteExtendedAttributeDetailedController.groovy (revision 403) @@ -62,5 +62,5 @@ if(siteExtendedAttributeInstance.version > version) { - siteExtendedAttributeInstance.errors.rejectValue("version", "siteExtendedAttribute.optimistic.locking.failure", "Another user has updated this SiteExtendedAttribute while you were editing.") + siteExtendedAttributeInstance.errors.rejectValue("version", "default.optimistic.locking.failure") render(view:'edit',model:[siteExtendedAttributeInstance:siteExtendedAttributeInstance]) return Index: /trunk/grails-app/controllers/SupplierDetailedController.groovy =================================================================== --- /trunk/grails-app/controllers/SupplierDetailedController.groovy (revision 402) +++ /trunk/grails-app/controllers/SupplierDetailedController.groovy (revision 403) @@ -72,5 +72,5 @@ if(supplierInstance.version > version) { - supplierInstance.errors.rejectValue("version", "supplier.optimistic.locking.failure", "Another user has updated this Supplier while you were editing.") + supplierInstance.errors.rejectValue("version", "default.optimistic.locking.failure") render(view:'edit',model:[supplierInstance:supplierInstance]) return Index: /trunk/grails-app/controllers/SupplierTypeDetailedController.groovy =================================================================== --- /trunk/grails-app/controllers/SupplierTypeDetailedController.groovy (revision 402) +++ /trunk/grails-app/controllers/SupplierTypeDetailedController.groovy (revision 403) @@ -75,5 +75,5 @@ if(supplierTypeInstance.version > version) { - supplierTypeInstance.errors.rejectValue("version", "supplierType.optimistic.locking.failure", "Another user has updated this SupplierType while you were editing.") + supplierTypeInstance.errors.rejectValue("version", "default.optimistic.locking.failure") render(view:'edit',model:[supplierTypeInstance:supplierTypeInstance]) return Index: /trunk/grails-app/controllers/TaskBudgetStatusController.groovy =================================================================== --- /trunk/grails-app/controllers/TaskBudgetStatusController.groovy (revision 402) +++ /trunk/grails-app/controllers/TaskBudgetStatusController.groovy (revision 403) @@ -61,5 +61,5 @@ if(taskBudgetStatusInstance.version > version) { - taskBudgetStatusInstance.errors.rejectValue("version", "taskBudgetStatus.optimistic.locking.failure", "Another user has updated this TaskBudgetStatus while you were editing.") + taskBudgetStatusInstance.errors.rejectValue("version", "default.optimistic.locking.failure") render(view:'edit',model:[taskBudgetStatusInstance:taskBudgetStatusInstance]) return Index: /trunk/grails-app/controllers/TaskController.groovy =================================================================== --- /trunk/grails-app/controllers/TaskController.groovy (revision 402) +++ /trunk/grails-app/controllers/TaskController.groovy (revision 403) @@ -61,5 +61,5 @@ if(taskInstance.version > version) { - taskInstance.errors.rejectValue("version", "task.optimistic.locking.failure", "Another user has updated this Task while you were editing.") + taskInstance.errors.rejectValue("version", "default.optimistic.locking.failure") render(view:'edit',model:[taskInstance:taskInstance]) return Index: /trunk/grails-app/controllers/TaskGroupController.groovy =================================================================== --- /trunk/grails-app/controllers/TaskGroupController.groovy (revision 402) +++ /trunk/grails-app/controllers/TaskGroupController.groovy (revision 403) @@ -61,5 +61,5 @@ if(taskGroupInstance.version > version) { - taskGroupInstance.errors.rejectValue("version", "taskGroup.optimistic.locking.failure", "Another user has updated this TaskGroup while you were editing.") + taskGroupInstance.errors.rejectValue("version", "default.optimistic.locking.failure") render(view:'edit',model:[taskGroupInstance:taskGroupInstance]) return Index: /trunk/grails-app/controllers/TaskModificationController.groovy =================================================================== --- /trunk/grails-app/controllers/TaskModificationController.groovy (revision 402) +++ /trunk/grails-app/controllers/TaskModificationController.groovy (revision 403) @@ -61,5 +61,5 @@ if(taskModificationInstance.version > version) { - taskModificationInstance.errors.rejectValue("version", "taskModification.optimistic.locking.failure", "Another user has updated this TaskModification while you were editing.") + taskModificationInstance.errors.rejectValue("version", "default.optimistic.locking.failure") render(view:'edit',model:[taskModificationInstance:taskModificationInstance]) return Index: /trunk/grails-app/controllers/TaskModificationTypeController.groovy =================================================================== --- /trunk/grails-app/controllers/TaskModificationTypeController.groovy (revision 402) +++ /trunk/grails-app/controllers/TaskModificationTypeController.groovy (revision 403) @@ -61,5 +61,5 @@ if(taskModificationTypeInstance.version > version) { - taskModificationTypeInstance.errors.rejectValue("version", "taskModificationType.optimistic.locking.failure", "Another user has updated this TaskModificationType while you were editing.") + taskModificationTypeInstance.errors.rejectValue("version", "default.optimistic.locking.failure") render(view:'edit',model:[taskModificationTypeInstance:taskModificationTypeInstance]) return Index: /trunk/grails-app/controllers/TaskPriorityController.groovy =================================================================== --- /trunk/grails-app/controllers/TaskPriorityController.groovy (revision 402) +++ /trunk/grails-app/controllers/TaskPriorityController.groovy (revision 403) @@ -61,5 +61,5 @@ if(taskPriorityInstance.version > version) { - taskPriorityInstance.errors.rejectValue("version", "taskPriority.optimistic.locking.failure", "Another user has updated this TaskPriority while you were editing.") + taskPriorityInstance.errors.rejectValue("version", "default.optimistic.locking.failure") render(view:'edit',model:[taskPriorityInstance:taskPriorityInstance]) return Index: /trunk/grails-app/controllers/TaskProcedureController.groovy =================================================================== --- /trunk/grails-app/controllers/TaskProcedureController.groovy (revision 402) +++ /trunk/grails-app/controllers/TaskProcedureController.groovy (revision 403) @@ -61,5 +61,5 @@ if(taskProcedureInstance.version > version) { - taskProcedureInstance.errors.rejectValue("version", "taskProcedure.optimistic.locking.failure", "Another user has updated this TaskProcedure while you were editing.") + taskProcedureInstance.errors.rejectValue("version", "default.optimistic.locking.failure") render(view:'edit',model:[taskProcedureInstance:taskProcedureInstance]) return Index: /trunk/grails-app/controllers/TaskProcedureDetailedController.groovy =================================================================== --- /trunk/grails-app/controllers/TaskProcedureDetailedController.groovy (revision 402) +++ /trunk/grails-app/controllers/TaskProcedureDetailedController.groovy (revision 403) @@ -89,5 +89,5 @@ if(taskProcedureInstance.version > version) { - taskProcedureInstance.errors.rejectValue("version", "taskProcedure.optimistic.locking.failure", "Another user has updated this TaskProcedure while you were editing.") + taskProcedureInstance.errors.rejectValue("version", "default.optimistic.locking.failure") render(view:'edit',model:[taskProcedureInstance:taskProcedureInstance]) return Index: /trunk/grails-app/controllers/TaskRecurringScheduleController.groovy =================================================================== --- /trunk/grails-app/controllers/TaskRecurringScheduleController.groovy (revision 402) +++ /trunk/grails-app/controllers/TaskRecurringScheduleController.groovy (revision 403) @@ -61,5 +61,5 @@ if(taskRecurringScheduleInstance.version > version) { - taskRecurringScheduleInstance.errors.rejectValue("version", "taskRecurringSchedule.optimistic.locking.failure", "Another user has updated this TaskRecurringSchedule while you were editing.") + taskRecurringScheduleInstance.errors.rejectValue("version", "default.optimistic.locking.failure") render(view:'edit',model:[taskRecurringScheduleInstance:taskRecurringScheduleInstance]) return Index: /trunk/grails-app/controllers/TaskStatusController.groovy =================================================================== --- /trunk/grails-app/controllers/TaskStatusController.groovy (revision 402) +++ /trunk/grails-app/controllers/TaskStatusController.groovy (revision 403) @@ -61,5 +61,5 @@ if(taskStatusInstance.version > version) { - taskStatusInstance.errors.rejectValue("version", "taskStatus.optimistic.locking.failure", "Another user has updated this TaskStatus while you were editing.") + taskStatusInstance.errors.rejectValue("version", "default.optimistic.locking.failure") render(view:'edit',model:[taskStatusInstance:taskStatusInstance]) return Index: /trunk/grails-app/controllers/TaskTypeController.groovy =================================================================== --- /trunk/grails-app/controllers/TaskTypeController.groovy (revision 402) +++ /trunk/grails-app/controllers/TaskTypeController.groovy (revision 403) @@ -61,5 +61,5 @@ if(taskTypeInstance.version > version) { - taskTypeInstance.errors.rejectValue("version", "taskType.optimistic.locking.failure", "Another user has updated this TaskType while you were editing.") + taskTypeInstance.errors.rejectValue("version", "default.optimistic.locking.failure") render(view:'edit',model:[taskTypeInstance:taskTypeInstance]) return Index: /trunk/grails-app/controllers/UnitOfMeasureController.groovy =================================================================== --- /trunk/grails-app/controllers/UnitOfMeasureController.groovy (revision 402) +++ /trunk/grails-app/controllers/UnitOfMeasureController.groovy (revision 403) @@ -61,5 +61,5 @@ if(unitOfMeasureInstance.version > version) { - unitOfMeasureInstance.errors.rejectValue("version", "unitOfMeasure.optimistic.locking.failure", "Another user has updated this UnitOfMeasure while you were editing.") + unitOfMeasureInstance.errors.rejectValue("version", "default.optimistic.locking.failure") render(view:'edit',model:[unitOfMeasureInstance:unitOfMeasureInstance]) return