Martin Mucha has posted comments on this change. Change subject: core,userportal,webadmin: added singular variant for messages. ......................................................................
Patch Set 5: (7 comments) http://gerrit.ovirt.org/#/c/25736/5/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/provider/RemoveProviderCommand.java File backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/provider/RemoveProviderCommand.java: Line 113: } Line 114: Line 115: protected VdcBllMessages providerNetworkUsedValidationMessage(int numberOfNetworks) { Line 116: boolean singular = numberOfNetworks == 1; Line 117: if (singular) { > you could inline the condition sure, but I think this variable makes code more readable. Done. Line 118: return VdcBllMessages.ACTION_TYPE_FAILED_PROVIDER_NETWORKS_USED_ONCE; Line 119: } else { Line 120: return VdcBllMessages.ACTION_TYPE_FAILED_PROVIDER_NETWORKS_USED_MULTIPLE_TIMES; Line 121: } http://gerrit.ovirt.org/#/c/25736/5/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/NetworkValidator.java File backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/NetworkValidator.java: Line 161: singular > you could inline the condition sure, but this variable helps to understand the code.Done. http://gerrit.ovirt.org/#/c/25736/5/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/VnicProfileValidator.java File backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/VnicProfileValidator.java: Line 103: ) > you could inline the condition sure, but this variable helps to understand the code.Done. http://gerrit.ovirt.org/#/c/25736/5/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties File backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties: Line 428: NETWORK_NAME_ALREADY_EXISTS=Cannot ${action} ${type}. Network name already exists. Line 429: ACTION_TYPE_FAILED_VNIC_PROFILE_NOT_EXISTS=Cannot ${action} ${type}. The specified VM network interface profile doesn't exist. Line 430: ACTION_TYPE_FAILED_VNIC_PROFILE_NAME_IN_USE=Cannot ${action} ${type}. The VM network interface profile's name is already used by an existing profile for the same network.\n-Please choose a different name. Line 431: ACTION_TYPE_FAILED_VNIC_PROFILE_IN_ONE_USE=Cannot ${action} ${type}. Several ${entities} (${ENTITIES_USING_VNIC_PROFILE_COUNTER}) are using this VM network interface profile:\n${ENTITIES_USING_VNIC_PROFILE}\n - Please remove it from all ${entities} that are using it and try again. Line 432: ACTION_TYPE_FAILED_VNIC_PROFILE_IN_MANY_USES=Cannot ${action} ${type}. Several ${entities} (${ENTITIES_USING_VNIC_PROFILE_COUNTER}) are using this VM network interface profile:\n${ENTITIES_USING_VNIC_PROFILE}\n - Please remove it from all ${entities} that are using it and try again. > The plural and the singular messages contain the same text. Shouldn't the s Done Line 433: ACTION_TYPE_FAILED_CANNOT_CHANGE_VNIC_PROFILE_NETWORK=Cannot ${action} ${type}. VM network interface profile's network cannot be changed. Line 434: ACTION_TYPE_FAILED_CANNOT_ADD_VNIC_PROFILE_TO_NON_VM_NETWORK=Cannot ${action} ${type}. VM network interface profiles cannot be added to a non-VM network. Please make sure the network is a VM network. Line 435: ACTION_TYPE_FAILED_CANNOT_FIND_VNIC_PROFILE_FOR_NETWORK=Cannot ${action} ${type}. There is no VM network interface profile for the network the user can use.\n- Please use a VM network interface profile instead of a network name. Line 436: ACTION_TYPE_FAILED_NAME_ALREADY_USED=Cannot ${action} ${type}. The ${type} name is already in use, please choose a unique name and try again. http://gerrit.ovirt.org/#/c/25736/5/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties File frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties: Line 465 Line 466 Line 467 Line 468 Line 469 > Since this resource file (and it derivative) are relevant to UserPortal whi Done Line 493 Line 494 Line 495 Line 496 Line 497 > same Done Line 552 Line 553 Line 554 Line 555 Line 556 > same Done -- To view, visit http://gerrit.ovirt.org/25736 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I2410b2c75380a78ffc24d142987e684182bf5dc9 Gerrit-PatchSet: 5 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Martin Mucha <[email protected]> Gerrit-Reviewer: Lior Vernia <[email protected]> Gerrit-Reviewer: Martin Mucha <[email protected]> Gerrit-Reviewer: Mike Kolesnik <[email protected]> Gerrit-Reviewer: Moti Asayag <[email protected]> Gerrit-Reviewer: Yevgeny Zaspitsky <[email protected]> Gerrit-Reviewer: [email protected] Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: Yes _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
