Alexander Wels has uploaded a new change for review. Change subject: webadmin, userportal: revert 'fix' to locale variable. ......................................................................
webadmin, userportal: revert 'fix' to locale variable. Revert "userportal,webadmin: fix available locale variable" This reverts commit 3ebe99735f1e747162df2e9f80d99f79da61d9f7. Change-Id: Ib253536acb24d587f3677fd4f9700e55bc8d953d Signed-off-by: Alexander Wels <[email protected]> --- M frontend/webadmin/modules/pom.xml M frontend/webadmin/modules/userportal-gwtp/pom.xml M frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/userportal/UserPortal.gwt.xml M frontend/webadmin/modules/webadmin/pom.xml M frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/webadmin/WebAdmin.gwt.xml 5 files changed, 17 insertions(+), 39 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/29/30529/1 diff --git a/frontend/webadmin/modules/pom.xml b/frontend/webadmin/modules/pom.xml index 6d7dfcf..efee98f 100644 --- a/frontend/webadmin/modules/pom.xml +++ b/frontend/webadmin/modules/pom.xml @@ -65,9 +65,7 @@ <engine.port.http>8080</engine.port.http> <!-- GWT CSS obfuscation style. production should be 'obf', use 'pretty' in development for easier css debugging --> <gwt.cssResourceStyle>obf</gwt.cssResourceStyle> - <!-- I need relative paths here, due to unknown file system, so I need to construct the path from the base dir + this path. - the base dir is too far into the tree, so I need to back out a bit --> - <allLocaleFile>../../../../backend/manager/modules/utils/src/main/resources/languages.properties</allLocaleFile> + <allLocaleFile>backend/manager/modules/utils/src/main/resources/languages.properties</allLocaleFile> </properties> <dependencyManagement> <dependencies> diff --git a/frontend/webadmin/modules/userportal-gwtp/pom.xml b/frontend/webadmin/modules/userportal-gwtp/pom.xml index a4a9754..eac49bf 100644 --- a/frontend/webadmin/modules/userportal-gwtp/pom.xml +++ b/frontend/webadmin/modules/userportal-gwtp/pom.xml @@ -208,23 +208,13 @@ <!-- Have to have this here as this dynamic property doesn't persist between poms so can't move it to parent --> <groupId>com.github.goldin</groupId> <artifactId>properties-maven-plugin</artifactId> - <executions> - <execution> - <id>set-properties</id> - <phase>validate</phase> - <goals> - <goal>set-properties</goal> - </goals> - <configuration> - <properties> - <property> - <name>gwt.availableLocales</name> - <value>{{ new File("${project.basedir}" + "/" + "${allLocaleFile}").withInputStream { def prop = new Properties();prop.load(it);prop.keySet().sort().join(',')} }}</value> - </property> - </properties> - </configuration> - </execution> - </executions> + <version>0.2.5</version> + <configuration> + <property> + <name>gwt.availableLocales</name> + <value>{{ def bd=project.basedir; new File(bd + allLocaleFile).withInputStream { def prop = new Properties();prop.load(it);prop.keySet().sort().join(',')} }}</value> + </property> + </configuration> </plugin> </plugins> </build> 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 aeb945e..6710e1d 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,7 +38,7 @@ <set-configuration-property name="locale.useragent" value="Y" /> <!-- Supported locales (defined via maven property) --> - <extend-property name="locale" values="${gwt.availableLocales}" /> + <extend-property name="locale" values="en_US,es_ES,fr_FR,ja_JP,pt_BR,zh_CN,de_DE,ko_KR" /> <set-property name="locale" value="${gwt.locale}" /> <set-property-fallback name="locale" value="en_US" /> diff --git a/frontend/webadmin/modules/webadmin/pom.xml b/frontend/webadmin/modules/webadmin/pom.xml index 810b65c..dc22ed6 100644 --- a/frontend/webadmin/modules/webadmin/pom.xml +++ b/frontend/webadmin/modules/webadmin/pom.xml @@ -158,23 +158,13 @@ <!-- Have to have this here as this dynamic property doesn't persist between poms so can't move it to parent --> <groupId>com.github.goldin</groupId> <artifactId>properties-maven-plugin</artifactId> - <executions> - <execution> - <id>set-properties</id> - <phase>validate</phase> - <goals> - <goal>set-properties</goal> - </goals> - <configuration> - <properties> - <property> - <name>gwt.availableLocales</name> - <value>{{ new File("${project.basedir}" + "/" + "${allLocaleFile}").withInputStream { def prop = new Properties();prop.load(it);prop.keySet().sort().join(',')} }}</value> - </property> - </properties> - </configuration> - </execution> - </executions> + <version>0.2.5</version> + <configuration> + <property> + <name>gwt.availableLocales</name> + <value>{{ def bd=project.basedir; new File(bd + allLocaleFile).withInputStream { def prop = new Properties();prop.load(it);prop.keySet().sort().join(',')} }}</value> + </property> + </configuration> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> 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 2027693..2c0e65c 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,7 +38,7 @@ <set-configuration-property name="locale.useragent" value="Y" /> <!-- Supported locales (defined via maven property) --> - <extend-property name="locale" values="${gwt.availableLocales}" /> + <extend-property name="locale" values="en_US,es_ES,fr_FR,ja_JP,pt_BR,zh_CN,de_DE,ko_KR" /> <set-property name="locale" value="${gwt.locale}" /> <set-property-fallback name="locale" value="en_US" /> -- To view, visit http://gerrit.ovirt.org/30529 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib253536acb24d587f3677fd4f9700e55bc8d953d 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
