Alexander Wels has uploaded a new change for review. Change subject: userportal, webadmin: English locale to en_US ......................................................................
userportal, webadmin: English locale to en_US - Changed the English locale to be en_US to match the location pointed to by the documentation. Change-Id: I8fb5ac34f0e587b533c09bf26c24dcba81e9b41f Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=947176 Signed-off-by: Alexander Wels <[email protected]> --- M frontend/webadmin/modules/pom.xml M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Configurator.java M frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/userportal/UserPortal.gwt.xml M frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/webadmin/WebAdmin.gwt.xml 4 files changed, 7 insertions(+), 7 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/03/13703/1 diff --git a/frontend/webadmin/modules/pom.xml b/frontend/webadmin/modules/pom.xml index 598c239..020a5ed 100644 --- a/frontend/webadmin/modules/pom.xml +++ b/frontend/webadmin/modules/pom.xml @@ -48,7 +48,7 @@ <gwt.userAgent>ie8,ie9,gecko1_8,safari,opera</gwt.userAgent> <!-- Control target locales for GWT compilation, maps to 'locale' deferred binding property in *.gwt.xml --> <!-- By default, only English locale is supported, see 'all-langs' profile for a complete list --> - <gwt.locale>en</gwt.locale> + <gwt.locale>en_US</gwt.locale> </properties> <dependencyManagement> <dependencies> @@ -179,7 +179,7 @@ <profile> <id>all-langs</id> <properties> - <gwt.locale>en,es,fr,ja,pt_BR,zh_CN,de</gwt.locale> + <gwt.locale>en_US,es,fr,ja,pt_BR,zh_CN,de</gwt.locale> </properties> </profile> </profiles> diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Configurator.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Configurator.java index d3f7ca6..b80e5c3 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Configurator.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Configurator.java @@ -38,7 +38,7 @@ setSpiceFullScreen(false); String currentLocale = LocaleInfo.getCurrentLocale().getLocaleName(); - documentationLangPath = (currentLocale.equals("default") ? "en-US" : currentLocale) + "/"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + documentationLangPath = currentLocale.replaceAll("_", "-") + "/"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ setSpiceVersion(new Version(4, 4)); setSpiceDefaultUsbPort(32023); diff --git a/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/userportal/UserPortal.gwt.xml b/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/userportal/UserPortal.gwt.xml index 03a2b35..1975db1 100644 --- a/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/userportal/UserPortal.gwt.xml +++ b/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/userportal/UserPortal.gwt.xml @@ -38,8 +38,8 @@ <set-configuration-property name="locale.useragent" value="Y" /> <!-- Supported locales (defined via maven property) --> - <extend-property name="locale" values="en,es,fr,ja,pt_BR,zh_CN,de" /> + <extend-property name="locale" values="en_US,es,fr,ja,pt_BR,zh_CN,de" /> <set-property name="locale" value="${gwt.locale}" /> - <set-property-fallback name="locale" value="en" /> + <set-property-fallback name="locale" value="en_US" /> </module> diff --git a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/webadmin/WebAdmin.gwt.xml b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/webadmin/WebAdmin.gwt.xml index 456a809..ea0c16c 100644 --- a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/webadmin/WebAdmin.gwt.xml +++ b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/webadmin/WebAdmin.gwt.xml @@ -38,8 +38,8 @@ <set-configuration-property name="locale.useragent" value="Y" /> <!-- Supported locales (defined via maven property) --> - <extend-property name="locale" values="en,es,fr,ja,pt_BR,zh_CN,de" /> + <extend-property name="locale" values="en_US,es,fr,ja,pt_BR,zh_CN,de" /> <set-property name="locale" value="${gwt.locale}" /> - <set-property-fallback name="locale" value="en" /> + <set-property-fallback name="locale" value="en_US" /> </module> -- To view, visit http://gerrit.ovirt.org/13703 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8fb5ac34f0e587b533c09bf26c24dcba81e9b41f Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alexander Wels <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
