Daniel Erez has uploaded a new change for review.
Change subject: core,ui: Unicode support for description fields in OVF
......................................................................
core,ui: Unicode support for description fields in OVF
Adjusted validations to accept Unicode characters in the
following fields: VM/Template description, Snapshot description
and Disk description/alias.
* VmBase/CreateAllSnapshotsFromVmParameters:
use ValidDescription annotation for description field.
* ValidDescription:
use ValidationUtils.ONLY_I18N_ASCII_OR_NONE as regexp.
* BaseDisk: use ValidI18NName annotation for alias field.
* correlated the UI models to use the same validations.
* modified AppErros accordingly.
Change-Id: Ia03cc8f1a938997fa6d38e90bf4ac4781307d8aa
Signed-off-by: Daniel Erez <de...@redhat.com>
---
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/CreateAllSnapshotsFromVmParameters.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/BaseDisk.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmBase.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/storage_pool.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/validation/annotation/ValidDescription.java
M backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties
M
frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/DiskModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/SnapshotModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/UnitVmModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/validation/AsciiOrNoneValidation.java
R
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/validation/SpecialAsciiI18NOrNoneValidation.java
M
frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Constants.java
M
frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
M
frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
15 files changed, 43 insertions(+), 35 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/74/10474/1
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/CreateAllSnapshotsFromVmParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/CreateAllSnapshotsFromVmParameters.java
index a09fb58..beb4971 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/CreateAllSnapshotsFromVmParameters.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/CreateAllSnapshotsFromVmParameters.java
@@ -14,7 +14,7 @@
@NotEmpty(groups = { CreateEntity.class },
message = "VALIDATION.DISK_IMAGE.DESCRIPTION.NOT_EMPTY")
- @ValidDescription(message = "VALIDATION.DISK_IMAGE.DESCRIPTION.NOT_ASCII",
groups = { CreateEntity.class})
+ @ValidDescription(message = "VALIDATION.DISK_IMAGE.DESCRIPTION.INVALID",
groups = { CreateEntity.class })
@Size(max = BusinessEntitiesDefinitions.GENERAL_MAX_SIZE, groups = {
CreateEntity.class},
message = "VALIDATION_DISK_IMAGE_DESCRIPTION_MAX")
private String _description;
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/BaseDisk.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/BaseDisk.java
index b2df31b..a22c4c4 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/BaseDisk.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/BaseDisk.java
@@ -3,11 +3,10 @@
import java.util.ArrayList;
import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Pattern;
import javax.validation.constraints.Size;
-import org.ovirt.engine.core.common.utils.ValidationUtils;
import org.ovirt.engine.core.common.validation.annotation.ValidDescription;
+import org.ovirt.engine.core.common.validation.annotation.ValidI18NName;
import org.ovirt.engine.core.common.validation.group.CreateEntity;
import org.ovirt.engine.core.common.validation.group.UpdateEntity;
import org.ovirt.engine.core.compat.Guid;
@@ -41,7 +40,7 @@
* The alias name of the disk.
*/
@Size(min = 0, max = BusinessEntitiesDefinitions.GENERAL_NAME_SIZE, groups
= { CreateEntity.class })
- @Pattern(regexp = ValidationUtils.NO_SPECIAL_CHARACTERS_WITH_DOT, message
= "VALIDATION.DISK.ALIAS.INVALID", groups = { CreateEntity.class,
UpdateEntity.class })
+ @ValidI18NName(message = "VALIDATION.DISK.ALIAS.INVALID", groups = {
CreateEntity.class, UpdateEntity.class })
private String diskAlias;
/**
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmBase.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmBase.java
index 371fe71..d3fd0d1 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmBase.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmBase.java
@@ -10,15 +10,14 @@
import javax.persistence.Enumerated;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
-import javax.validation.constraints.Pattern;
import javax.validation.constraints.Size;
import org.hibernate.annotations.GenericGenerator;
import org.hibernate.annotations.Type;
import
org.ovirt.engine.core.common.businessentities.OvfExportOnlyField.ExportOption;
import org.ovirt.engine.core.common.config.ConfigValues;
-import org.ovirt.engine.core.common.utils.ValidationUtils;
import
org.ovirt.engine.core.common.validation.annotation.IntegerContainedInConfigValueList;
+import org.ovirt.engine.core.common.validation.annotation.ValidDescription;
import org.ovirt.engine.core.common.validation.group.CreateEntity;
import org.ovirt.engine.core.common.validation.group.DesktopVM;
import org.ovirt.engine.core.common.validation.group.UpdateEntity;
@@ -52,9 +51,8 @@
@Size(max = BusinessEntitiesDefinitions.VM_DESCRIPTION_SIZE)
@Column(name = "description", length =
BusinessEntitiesDefinitions.GENERAL_MAX_SIZE)
- @Pattern(regexp = ValidationUtils.ONLY_ASCII_OR_NONE,
- message =
"ACTION_TYPE_FAILED_DESCRIPTION_MAY_NOT_CONTAIN_SPECIAL_CHARS", groups = {
CreateEntity.class,
- UpdateEntity.class })
+ @ValidDescription(message =
"ACTION_TYPE_FAILED_DESCRIPTION_MAY_NOT_CONTAIN_SPECIAL_CHARS",
+ groups = { CreateEntity.class, UpdateEntity.class })
private String description;
@Column(name = "mem_size_mb", nullable = false)
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/storage_pool.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/storage_pool.java
index c6c051c..7477930 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/storage_pool.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/storage_pool.java
@@ -16,13 +16,14 @@
import javax.persistence.OneToMany;
import javax.persistence.Table;
import javax.persistence.Transient;
+import javax.validation.constraints.Pattern;
import javax.validation.constraints.Size;
import org.hibernate.annotations.GenericGenerator;
import org.hibernate.annotations.Type;
import org.hibernate.annotations.TypeDef;
import org.ovirt.engine.core.common.businessentities.mapping.GuidType;
-import org.ovirt.engine.core.common.validation.annotation.ValidDescription;
+import org.ovirt.engine.core.common.utils.ValidationUtils;
import org.ovirt.engine.core.common.validation.annotation.ValidName;
import org.ovirt.engine.core.common.validation.group.CreateEntity;
import org.ovirt.engine.core.common.validation.group.UpdateEntity;
@@ -65,7 +66,9 @@
@Size(max = BusinessEntitiesDefinitions.GENERAL_MAX_SIZE)
@Column(name = "description")
- @ValidDescription(message = "VALIDATION.DATA_CENTER.DESCRIPTION.INVALID",
groups = { CreateEntity.class, UpdateEntity.class })
+ @Pattern(regexp = ValidationUtils.ONLY_ASCII_OR_NONE,
+ message = "VALIDATION.DATA_CENTER.DESCRIPTION.INVALID",
+ groups = { CreateEntity.class, UpdateEntity.class })
private String description;
@Column(name = "storage_pool_type")
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/validation/annotation/ValidDescription.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/validation/annotation/ValidDescription.java
index e08dc9b..7e36416 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/validation/annotation/ValidDescription.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/validation/annotation/ValidDescription.java
@@ -19,7 +19,7 @@
@Target({ ANNOTATION_TYPE, METHOD, FIELD, CONSTRUCTOR, PARAMETER })
@Retention(RetentionPolicy.RUNTIME)
-@Pattern(regexp = ValidationUtils.ONLY_ASCII_OR_NONE)
+@Pattern(regexp = ValidationUtils.ONLY_I18N_ASCII_OR_NONE)
@Constraint(validatedBy = {})
@ReportAsSingleViolation
public @interface ValidDescription {
diff --git
a/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties
b/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties
index a5510b2..a1bb178 100644
---
a/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties
+++
b/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties
@@ -580,10 +580,10 @@
VALIDATION.DISK_INTERFACE.NOT_NULL=Interface is required
VALIDATION.VOLUME_TYPE.NOT_NULL=Volume type is required
VALIDATION.DISK_TYPE.NOT_NULL=Disk type is required
-VALIDATION.DISK.DESCRIPTION.INVALID=Disk description must be formed only from
ASCII characters
-VALIDATION.DISK.ALIAS.INVALID=Disk alias name must be formed of "a-z0-9A-Z"
and "-_."
+VALIDATION.DISK.DESCRIPTION.INVALID=Disk description must be formed only from
alpha-numeric characters and special characters that conform to the standard
ASCII character set.
+VALIDATION.DISK.ALIAS.INVALID=Disk alias name must be formed of alpha-numeric
characters or "-_."
VALIDATION.VOLUME_FORMAT.NOT_NULL=Volume format is required
-VALIDATION.DISK_IMAGE.DESCRIPTION.NOT_ASCII=Snapshot description cannot
contain non-ASCII chars
+VALIDATION.DISK_IMAGE.DESCRIPTION.INVALID=Snapshot description must be formed
only from alpha-numeric characters and special characters that conform to the
standard ASCII character set.
VALIDATION.DISK_IMAGE.DESCRIPTION.NOT_EMPTY=Snapshot description cannot be
empty
VALIDATION_DISK_IMAGE_DESCRIPTION_MAX=Snapshot description must not exceed
4000 characters
VALIDATION.DATA_CENTER.DESCRIPTION.INVALID="Data Center description must be
formed of ASCII charis only"
diff --git
a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java
b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java
index 73bcdc2..876f390 100644
---
a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java
+++
b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java
@@ -1535,7 +1535,7 @@
@DefaultStringValue("Disk type is required")
String VALIDATION_DISK_TYPE_NOT_NULL();
- @DefaultStringValue("Disk alias name must be formed of \"a-z0-9A-Z\" and
\"-_.\"")
+ @DefaultStringValue("Disk alias name must be formed of alpha-numeric
characters or \"-_.\"")
String VALIDATION_DISK_ALIAS_INVALID();
@DefaultStringValue("Volume format is required")
@@ -2012,7 +2012,11 @@
@DefaultStringValue("Non-VM networks are not supported in this
Data-Center.")
String NON_VM_NETWORK_NOT_SUPPORTED_FOR_POOL_LEVEL();
- String VALIDATION_DISK_IMAGE_DESCRIPTION_NOT_ASCII();
+ @DefaultStringValue("Disk description must be formed only from
alpha-numeric characters and special characters that conform to the standard
ASCII character set.")
+ String VALIDATION_DISK_DESCRIPTION_INVALID();
+
+ @DefaultStringValue("Snapshot description must be formed only from
alpha-numeric characters and special characters that conform to the standard
ASCII character set.")
+ String VALIDATION_DISK_IMAGE_DESCRIPTION_INVALID();
String VALIDATION_STORAGE_CONNECTION_INVALID();
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/DiskModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/DiskModel.java
index 681d43d..fb340f7 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/DiskModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/DiskModel.java
@@ -39,11 +39,12 @@
import org.ovirt.engine.ui.uicommonweb.models.SystemTreeItemModel;
import org.ovirt.engine.ui.uicommonweb.models.SystemTreeItemType;
import org.ovirt.engine.ui.uicommonweb.models.storage.SanStorageModel;
-import org.ovirt.engine.ui.uicommonweb.validation.AsciiOrNoneValidation;
+import org.ovirt.engine.ui.uicommonweb.validation.I18NNameValidation;
import org.ovirt.engine.ui.uicommonweb.validation.IValidation;
import org.ovirt.engine.ui.uicommonweb.validation.IntegerValidation;
import org.ovirt.engine.ui.uicommonweb.validation.NotEmptyValidation;
import org.ovirt.engine.ui.uicommonweb.validation.NotEmptyQuotaValidation;
+import
org.ovirt.engine.ui.uicommonweb.validation.SpecialAsciiI18NOrNoneValidation;
import org.ovirt.engine.ui.uicompat.ConstantsManager;
public class DiskModel extends Model
@@ -982,7 +983,8 @@
getSize().ValidateEntity(new IValidation[] { new NotEmptyValidation(),
sizeValidation });
getStorageDomain().ValidateSelectedItem(new IValidation[] { new
NotEmptyValidation() });
- getAlias().ValidateEntity(new IValidation[] { new
AsciiOrNoneValidation() });
+ getDescription().ValidateEntity(new IValidation[] { new
SpecialAsciiI18NOrNoneValidation() });
+ getAlias().ValidateEntity(new IValidation[] { new I18NNameValidation()
});
if (!(Boolean) getIsInVm().getEntity()) {
getAlias().ValidateEntity(new IValidation[] { new
NotEmptyValidation() });
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/SnapshotModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/SnapshotModel.java
index 7b5ccb6..f0f5117 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/SnapshotModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/SnapshotModel.java
@@ -14,10 +14,10 @@
import org.ovirt.engine.ui.frontend.INewAsyncCallback;
import org.ovirt.engine.ui.uicommonweb.dataprovider.AsyncDataProvider;
import org.ovirt.engine.ui.uicommonweb.models.EntityModel;
-import org.ovirt.engine.ui.uicommonweb.validation.AsciiOrNoneValidation;
import org.ovirt.engine.ui.uicommonweb.validation.IValidation;
import org.ovirt.engine.ui.uicommonweb.validation.LengthValidation;
import org.ovirt.engine.ui.uicommonweb.validation.NotEmptyValidation;
+import
org.ovirt.engine.ui.uicommonweb.validation.SpecialAsciiI18NOrNoneValidation;
@SuppressWarnings("unused")
public class SnapshotModel extends EntityModel
@@ -147,7 +147,9 @@
public boolean Validate()
{
- getDescription().ValidateEntity(new IValidation[] { new
NotEmptyValidation(), new AsciiOrNoneValidation(), new
LengthValidation(BusinessEntitiesDefinitions.GENERAL_MAX_SIZE)});
+ getDescription().ValidateEntity(new IValidation[] { new
NotEmptyValidation(),
+ new SpecialAsciiI18NOrNoneValidation(),
+ new
LengthValidation(BusinessEntitiesDefinitions.GENERAL_MAX_SIZE) });
return getDescription().getIsValid();
}
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/UnitVmModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/UnitVmModel.java
index 31a6a8f..c4244ee 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/UnitVmModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/UnitVmModel.java
@@ -40,7 +40,6 @@
import org.ovirt.engine.ui.uicommonweb.models.SystemTreeItemType;
import org.ovirt.engine.ui.uicommonweb.models.storage.DisksAllocationModel;
import org.ovirt.engine.ui.uicommonweb.models.vms.key_value.KeyValueModel;
-import org.ovirt.engine.ui.uicommonweb.validation.AsciiOrNoneValidation;
import org.ovirt.engine.ui.uicommonweb.validation.ByteSizeValidation;
import org.ovirt.engine.ui.uicommonweb.validation.I18NNameValidation;
import org.ovirt.engine.ui.uicommonweb.validation.IValidation;
@@ -48,6 +47,7 @@
import org.ovirt.engine.ui.uicommonweb.validation.LengthValidation;
import org.ovirt.engine.ui.uicommonweb.validation.NotEmptyValidation;
import org.ovirt.engine.ui.uicommonweb.validation.NotEmptyQuotaValidation;
+import
org.ovirt.engine.ui.uicommonweb.validation.SpecialAsciiI18NOrNoneValidation;
import org.ovirt.engine.ui.uicommonweb.validation.ValidationResult;
import org.ovirt.engine.ui.uicompat.ConstantsManager;
@@ -1955,7 +1955,6 @@
new IntegerValidation(1, behavior.maxCpus),
new TotalCpuCoresComposableValidation() });
- getDescription().ValidateEntity(new IValidation[] { new
AsciiOrNoneValidation() });
if (getOSType().getIsValid())
{
VmOsType osType = (VmOsType) getOSType().getSelectedItem();
@@ -1969,7 +1968,8 @@
getDescription().ValidateEntity(
new IValidation[] {
- new LengthValidation(255)
+ new LengthValidation(255),
+ new SpecialAsciiI18NOrNoneValidation()
});
boolean is64OsType =
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/validation/AsciiOrNoneValidation.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/validation/AsciiOrNoneValidation.java
index a4d03b0..ba098b1 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/validation/AsciiOrNoneValidation.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/validation/AsciiOrNoneValidation.java
@@ -2,7 +2,7 @@
import org.ovirt.engine.ui.uicompat.ConstantsManager;
-public class AsciiOrNoneValidation extends SpecialAsciiOrNoneValidation {
+public class AsciiOrNoneValidation extends SpecialAsciiI18NOrNoneValidation {
@Override
protected String allUtfLetters() {
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/validation/SpecialAsciiOrNoneValidation.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/validation/SpecialAsciiI18NOrNoneValidation.java
similarity index 77%
rename from
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/validation/SpecialAsciiOrNoneValidation.java
rename to
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/validation/SpecialAsciiI18NOrNoneValidation.java
index d2bd88b..5577de8 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/validation/SpecialAsciiOrNoneValidation.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/validation/SpecialAsciiI18NOrNoneValidation.java
@@ -2,7 +2,7 @@
import org.ovirt.engine.ui.uicompat.ConstantsManager;
-public class SpecialAsciiOrNoneValidation extends BaseI18NValidation {
+public class SpecialAsciiI18NOrNoneValidation extends BaseI18NValidation {
@Override
protected String composeRegex() {
@@ -11,7 +11,7 @@
@Override
protected String composeMessage() {
- return
ConstantsManager.getInstance().getConstants().specialAsciiOrNoneValidationMsg();
+ return
ConstantsManager.getInstance().getConstants().specialAsciiI18NOrNoneValidationMsg();
}
}
diff --git
a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Constants.java
b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Constants.java
index 4a16f5b8..5ad1c35 100644
---
a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Constants.java
+++
b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Constants.java
@@ -591,9 +591,9 @@
String asciiOrNoneValidationMsg();
@DefaultStringValue("Only alphanumeric and some special characters that
conform to the standard ASCII character set and UTF letters are allowed.")
- String specialAsciiOrNoneValidationMsg();
+ String specialAsciiI18NOrNoneValidationMsg();
- @DefaultStringValue("Name can contain only alphanumeric characters, '0-9',
'_' or '-' characters.")
+ @DefaultStringValue("Name can contain only alphanumeric, '.', '_' or '-'
characters.")
String i18NNameValidationMsg();
@DefaultStringValue("UTF characters are not allowed.")
diff --git
a/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
b/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
index bbcfc32..69fcb09 100644
---
a/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
+++
b/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
@@ -577,10 +577,10 @@
VALIDATION_DISK_INTERFACE_NOT_NULL=Interface is required
VALIDATION_VOLUME_TYPE_NOT_NULL=Volume type is required
VALIDATION_DISK_TYPE_NOT_NULL=Disk type is required
-VALIDATION_DISK_DESCRIPTION_INVALID=Disk description must be formed only from
ASCII characters
-VALIDATION_DISK_ALIAS_INVALID=Disk alias name must be formed of "a-z0-9A-Z"
and "-_."
+VALIDATION_DISK_DESCRIPTION_INVALID=Disk description must be formed only from
alpha-numeric characters and special characters that conform to the standard
ASCII character set.
+VALIDATION_DISK_ALIAS_INVALID=Disk alias name must be formed of alpha-numeric
characters or "-_."
VALIDATION_VOLUME_FORMAT_NOT_NULL=Volume format is required
-VALIDATION_DISK_IMAGE_DESCRIPTION_NOT_ASCII=Snapshot description cannot
contain non-ASCII chars
+VALIDATION_DISK_IMAGE_DESCRIPTION_NOT_INVALID=Snapshot description must be
formed only from alpha-numeric characters and special characters that conform
to the standard ASCII character set.
VALIDATION_DISK_IMAGE_DESCRIPTION_NOT_EMPTY=Snapshot description cannot be
empty
VALIDATION_DISK_IMAGE_DESCRIPTION_MAX=Snapshot description must not exceed
4000 characters
VALIDATION_DATA_CENTER_DESCRIPTION_INVALID="Data Center description must be
formed of ASCII charis only"
diff --git
a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
index 8c572b8..a750b26 100644
---
a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
+++
b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
@@ -570,10 +570,10 @@
VALIDATION_DISK_INTERFACE_NOT_NULL=Interface is required
VALIDATION_VOLUME_TYPE_NOT_NULL=Volume type is required
VALIDATION_DISK_TYPE_NOT_NULL=Disk type is required
-VALIDATION_DISK_DESCRIPTION_INVALID=Disk description must be formed only from
ASCII characters
-VALIDATION_DISK_ALIAS_INVALID=Disk alias name must be formed of "a-z0-9A-Z"
and "-_."
+VALIDATION_DISK_DESCRIPTION_INVALID=Disk description must be formed only from
alpha-numeric characters and special characters that conform to the standard
ASCII character set.
+VALIDATION_DISK_ALIAS_INVALID=Disk alias name must be formed of alpha-numeric
characters or "-_."
VALIDATION_VOLUME_FORMAT_NOT_NULL=Volume format is required
-VALIDATION_DISK_IMAGE_DESCRIPTION_NOT_ASCII=Snapshot description cannot
contain non-ASCII chars
+VALIDATION_DISK_IMAGE_DESCRIPTION_NOT_INVALID=Snapshot description must be
formed only from alpha-numeric characters and special characters that conform
to the standard ASCII character set.
VALIDATION_DISK_IMAGE_DESCRIPTION_NOT_EMPTY=Snapshot description cannot be
empty
VALIDATION_DISK_IMAGE_DESCRIPTION_MAX=Snapshot description must not exceed
4000 characters
VALIDATION_VMINTERFACE_MACADDRESS=MAC Address must be in the following format:
XX:XX:XX:XX:XX:XX, (XX=0-9 or A-F)
--
To view, visit http://gerrit.ovirt.org/10474
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia03cc8f1a938997fa6d38e90bf4ac4781307d8aa
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Daniel Erez <de...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
