Daniel Erez has uploaded a new change for review.
Change subject: webadmin: disks main-tab - disable prefix localization
......................................................................
webadmin: disks main-tab - disable prefix localization
Extract disks search prefix strings to NON-NLS constants.
[disksSearchPrefix("Disks:"), diskTypeSearchPrefix("disk_type = "),
searchConjunctionAnd(" and" ), searchRegexAll("(.)*")]
Since these string are part of the search query,
they should be declared as NON-NLS (Non-National Language Support).
Change-Id: I47b6986b47f6ddca036580310a64716c4519675b
Signed-off-by: Daniel Erez <[email protected]>
---
M
frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabDiskView.java
2 files changed, 22 insertions(+), 27 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/96/9296/1
diff --git
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java
index a4b5127..7c8ec1f 100644
---
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java
+++
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java
@@ -1004,18 +1004,6 @@
@DefaultStringValue("* It is recommended to keep the default values in the
fields below unchanged.")
String advancedOptionsLabel();
- @DefaultStringValue("disk_type = ")
- String diskTypeSearchPrefix();
-
- @DefaultStringValue("Disks:")
- String disksSearchPrefix();
-
- @DefaultStringValue("(.)*")
- String searchRegexAll();
-
- @DefaultStringValue(" and ")
- String searchConjunctionAnd();
-
@DefaultStringValue("Bootable")
String bootableDisk();
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabDiskView.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabDiskView.java
index c9b960b..543b96d 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabDiskView.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabDiskView.java
@@ -196,39 +196,46 @@
}
void searchByDiskViewType(Object diskViewType) {
- String diskTypePostfix = diskViewType != null ?
- ((DiskStorageType) diskViewType).name().toLowerCase() +
constants.space() : null;
- String diskType = diskTypePostfix != null ?
- constants.diskTypeSearchPrefix() + diskTypePostfix :
constants.empty();
+ final String disksSearchPrefix = "Disks:"; //$NON-NLS-1$
+ final String diskTypeSearchPrefix = "disk_type = "; //$NON-NLS-1$
+ final String searchConjunctionAnd = " all "; //$NON-NLS-1$
+ final String searchRegexAll = "(.)*"; //$NON-NLS-1$
+ final String space = " "; //$NON-NLS-1$
+ final String empty = ""; //$NON-NLS-1$
- String searchConjunction = !diskType.equals(constants.empty()) ?
- constants.searchConjunctionAnd() : constants.empty();
+ String diskTypePostfix = diskViewType != null ?
+ ((DiskStorageType) diskViewType).name().toLowerCase() + space
: null;
+ String diskType = diskTypePostfix != null ?
+ diskTypeSearchPrefix + diskTypePostfix : empty;
+
+ String searchConjunction = !diskType.equals(empty) ?
+ searchConjunctionAnd : empty;
String searchStringPrefixRaw =
commonModel.getSearchStringPrefix().replaceAll(
- constants.diskTypeSearchPrefix() + constants.searchRegexAll(),
constants.empty()).replaceAll(
- constants.searchConjunctionAnd() + constants.searchRegexAll(),
constants.empty()).trim();
+ diskTypeSearchPrefix + searchRegexAll, empty).replaceAll(
+ searchConjunctionAnd + searchRegexAll, empty).trim();
String searchStringPrefix;
- if (diskType.equals(constants.empty())) {
+ if (diskType.equals(empty)) {
searchStringPrefix = searchStringPrefixRaw;
}
- else if (searchStringPrefixRaw.equals(constants.disksSearchPrefix())) {
- searchStringPrefix = constants.disksSearchPrefix() +
constants.space() + diskType;
+ else if (searchStringPrefixRaw.equals(disksSearchPrefix)) {
+ searchStringPrefix = disksSearchPrefix + space + diskType;
}
else {
searchStringPrefix = searchStringPrefixRaw.isEmpty() ?
- constants.disksSearchPrefix() + constants.space() +
diskType :
+ disksSearchPrefix + space + diskType :
searchStringPrefixRaw + searchConjunction + diskType;
}
String searchString;
if (!commonModel.getSearchString().contains(":")) { //$NON-NLS-1$
searchString = searchStringPrefix.isEmpty() ?
- constants.disksSearchPrefix() + constants.space() +
commonModel.getSearchString() :
-
commonModel.getSearchString().replace(constants.disksSearchPrefix(),
constants.empty());
+ disksSearchPrefix + space + commonModel.getSearchString() :
+ commonModel.getSearchString().replace(disksSearchPrefix,
empty);
}
else {
- searchString = searchStringPrefix.isEmpty() ?
constants.disksSearchPrefix() : constants.empty();
+ searchString = searchStringPrefix.isEmpty() ? disksSearchPrefix :
empty;
}
commonModel.setSearchStringPrefix(searchStringPrefix);
--
To view, visit http://gerrit.ovirt.org/9296
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I47b6986b47f6ddca036580310a64716c4519675b
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Daniel Erez <[email protected]>
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches
