Author: solomax
Date: Thu Nov 24 03:44:23 2016
New Revision: 1771072
URL: http://svn.apache.org/viewvc?rev=1771072&view=rev
Log:
[OPENMEETINGS-1512] additional fix
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/CountryDropDown.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/CountryDropDown.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/CountryDropDown.java
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java?rev=1771072&r1=1771071&r2=1771072&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java
Thu Nov 24 03:44:23 2016
@@ -18,6 +18,7 @@
*/
package org.apache.openmeetings.web.user.profile;
+import static org.apache.openmeetings.util.LocaleHelper.getCountryName;
import static org.apache.openmeetings.web.app.Application.getBean;
import static org.apache.openmeetings.web.app.WebSession.getUserId;
@@ -27,7 +28,6 @@ import org.apache.openmeetings.db.entity
import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.common.ProfileImagePanel;
import org.apache.openmeetings.web.common.UserPanel;
-import org.apache.openmeetings.web.util.CountryDropDown;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.TextArea;
@@ -61,7 +61,7 @@ public class UserProfilePanel extends Us
address.add(new Label("address.additionalname"));
address.add(new Label("address.zip"));
address.add(new Label("address.town"));
- address.add(new Label("country",
CountryDropDown.getCountryName(model.getObject().getAddress().getCountry())));
+ address.add(new Label("country",
getCountryName(model.getObject().getAddress().getCountry(), getLocale())));
address.add(new Label("address.comment"));
} else {
address.setVisible(false);
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/CountryDropDown.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/CountryDropDown.java?rev=1771072&r1=1771071&r2=1771072&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/CountryDropDown.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/CountryDropDown.java
Thu Nov 24 03:44:23 2016
@@ -23,7 +23,6 @@ import static org.apache.openmeetings.ut
import java.util.List;
-import org.apache.openmeetings.web.app.WebSession;
import org.apache.wicket.markup.html.form.DropDownChoice;
import org.apache.wicket.markup.html.form.IChoiceRenderer;
import org.apache.wicket.model.IModel;
@@ -47,7 +46,7 @@ public class CountryDropDown extends Dro
@Override
public Object getDisplayValue(String code) {
- return getCountryName(code,
WebSession.get().getLocale());
+ return getCountryName(code, getLocale());
}
@Override
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java?rev=1771072&r1=1771071&r2=1771072&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java
Thu Nov 24 03:44:23 2016
@@ -18,6 +18,7 @@
*/
package org.apache.openmeetings.web.user.profile;
+import static org.apache.openmeetings.util.LocaleHelper.getCountryName;
import static org.apache.openmeetings.web.app.Application.getBean;
import static org.apache.openmeetings.web.app.WebSession.getUserId;
@@ -27,7 +28,6 @@ import org.apache.openmeetings.db.entity
import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.common.ProfileImagePanel;
import org.apache.openmeetings.web.common.UserPanel;
-import org.apache.openmeetings.web.util.CountryDropDown;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.TextArea;
@@ -61,7 +61,7 @@ public class UserProfilePanel extends Us
address.add(new Label("address.additionalname"));
address.add(new Label("address.zip"));
address.add(new Label("address.town"));
- address.add(new Label("country",
CountryDropDown.getCountryName(model.getObject().getAddress().getCountry())));
+ address.add(new Label("country",
getCountryName(model.getObject().getAddress().getCountry(), getLocale())));
address.add(new Label("address.comment"));
} else {
address.setVisible(false);
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/CountryDropDown.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/CountryDropDown.java?rev=1771072&r1=1771071&r2=1771072&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/CountryDropDown.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/CountryDropDown.java
Thu Nov 24 03:44:23 2016
@@ -23,7 +23,6 @@ import static org.apache.openmeetings.ut
import java.util.List;
-import org.apache.openmeetings.web.app.WebSession;
import org.apache.wicket.markup.html.form.DropDownChoice;
import org.apache.wicket.markup.html.form.IChoiceRenderer;
import org.apache.wicket.model.IModel;
@@ -47,7 +46,7 @@ public class CountryDropDown extends Dro
@Override
public Object getDisplayValue(String code) {
- return getCountryName(code,
WebSession.get().getLocale());
+ return getCountryName(code, getLocale());
}
@Override
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java?rev=1771072&r1=1771071&r2=1771072&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java
Thu Nov 24 03:44:23 2016
@@ -18,6 +18,7 @@
*/
package org.apache.openmeetings.web.user.profile;
+import static org.apache.openmeetings.util.LocaleHelper.getCountryName;
import static org.apache.openmeetings.web.app.Application.getBean;
import static org.apache.openmeetings.web.app.WebSession.getUserId;
@@ -27,7 +28,6 @@ import org.apache.openmeetings.db.entity
import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.common.ProfileImagePanel;
import org.apache.openmeetings.web.common.UserPanel;
-import org.apache.openmeetings.web.util.CountryDropDown;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.TextArea;
@@ -61,7 +61,7 @@ public class UserProfilePanel extends Us
address.add(new Label("address.additionalname"));
address.add(new Label("address.zip"));
address.add(new Label("address.town"));
- address.add(new Label("country",
CountryDropDown.getCountryName(model.getObject().getAddress().getCountry())));
+ address.add(new Label("country",
getCountryName(model.getObject().getAddress().getCountry(), getLocale())));
address.add(new Label("address.comment"));
} else {
address.setVisible(false);
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/CountryDropDown.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/CountryDropDown.java?rev=1771072&r1=1771071&r2=1771072&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/CountryDropDown.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/CountryDropDown.java
Thu Nov 24 03:44:23 2016
@@ -23,7 +23,6 @@ import static org.apache.openmeetings.ut
import java.util.List;
-import org.apache.openmeetings.web.app.WebSession;
import org.apache.wicket.markup.html.form.DropDownChoice;
import org.apache.wicket.markup.html.form.IChoiceRenderer;
import org.apache.wicket.model.IModel;
@@ -47,7 +46,7 @@ public class CountryDropDown extends Dro
@Override
public Object getDisplayValue(String code) {
- return getCountryName(code,
WebSession.get().getLocale());
+ return getCountryName(code, getLocale());
}
@Override
