Author: vdegtyarev
Date: Thu May 30 09:28:14 2013
New Revision: 1487795
URL: http://svn.apache.org/r1487795
Log:
HTML: Feedback messages are localized.
Modified:
openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/configurations/ConfigForm.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/groups/GroupForm.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/ldaps/LdapForm.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/servers/ServerForm.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/users/UserForm.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/common/AddFolderDialog.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/common/GeneralUserForm.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/SignInDialog.java
Modified: openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml?rev=1487795&r1=1487794&r2=1487795&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml Thu May 30
09:28:14 2013
@@ -837,7 +837,7 @@ see http://openmeetings.apache.org/Langu
<value>ÐпиÑание:</value>
</string>
<string id="271" name="confadminform_labelkey">
- <value>ÐнаÑение</value>
+ <value>ÐнаÑение:</value>
</string>
<string id="272" name="turnoverlist_maxresults">
<value>из</value>
@@ -2523,7 +2523,7 @@ see http://openmeetings.apache.org/Langu
<value>ÐÑ ÑвеÑенÑ?</value>
</string>
<string id="833" name="confirm delete">
- <value>ÐÑ Ð´ÐµÐ¹ÑÑвиÑелÑно Ñ
оÑиÑе ÑдалиÑÑ
запиÑÑ? ЧÑÐ¾Ð±Ñ Ð·Ð°Ð¿Ð¾Ð¼Ð½Ð¸ÑÑ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ, нажмиÑе
ÐºÐ½Ð¾Ð¿ÐºÑ ÑоÑ
ÑанениÑ</value>
+ <value>ÐÑ Ð´ÐµÐ¹ÑÑвиÑелÑно Ñ
оÑиÑе ÑдалиÑÑ
запиÑÑ?</value>
</string>
<string id="834" name="user choose error">
<value>ÐолÑзоваÑÐµÐ»Ñ Ð½Ðµ вÑбÑан. ÐожалÑйÑÑа,
вÑбеÑиÑе полÑзоваÑелÑ</value>
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/configurations/ConfigForm.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/configurations/ConfigForm.java?rev=1487795&r1=1487794&r2=1487795&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/configurations/ConfigForm.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/configurations/ConfigForm.java
Thu May 30 09:28:14 2013
@@ -32,6 +32,7 @@ import org.apache.wicket.markup.html.for
import org.apache.wicket.markup.html.form.RequiredTextField;
import org.apache.wicket.markup.html.form.TextArea;
import org.apache.wicket.model.CompoundPropertyModel;
+import org.apache.wicket.model.Model;
import org.apache.wicket.util.time.Duration;
import org.apache.wicket.validation.IValidatable;
import org.apache.wicket.validation.IValidator;
@@ -60,7 +61,7 @@ public class ConfigForm extends AdminBas
super(id, new
CompoundPropertyModel<Configuration>(configuration));
setOutputMarkupId(true);
this.listContainer = listContainer;
- add(new RequiredTextField<String>("conf_key").add(new
IValidator<String>(){
+ add(new
RequiredTextField<String>("conf_key").setLabel(Model.of(WebSession.getString(267))).add(new
IValidator<String>(){
private static final long serialVersionUID =
-3371792361118941958L;
public void validate(IValidatable<String> validatable) {
@@ -70,7 +71,7 @@ public class ConfigForm extends AdminBas
}
}
}));
- add(new RequiredTextField<String>("conf_value"));
+ add(new
RequiredTextField<String>("conf_value").setLabel(Model.of(WebSession.getString(271))));
add(DateLabel.forDatePattern("updatetime", "dd.MM.yyyy
HH:mm:ss"));
add(new Label("user.login"));
add(new TextArea<String>("comment"));
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/groups/GroupForm.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/groups/GroupForm.java?rev=1487795&r1=1487794&r2=1487795&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/groups/GroupForm.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/groups/GroupForm.java
Thu May 30 09:28:14 2013
@@ -24,12 +24,14 @@ import static org.apache.openmeetings.we
import org.apache.openmeetings.data.user.dao.OrganisationDao;
import org.apache.openmeetings.persistence.beans.domain.Organisation;
import org.apache.openmeetings.web.admin.AdminBaseForm;
+import org.apache.openmeetings.web.app.WebSession;
import org.apache.openmeetings.web.common.OmAjaxFormValidatingBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.RequiredTextField;
import org.apache.wicket.model.CompoundPropertyModel;
+import org.apache.wicket.model.Model;
import org.apache.wicket.util.time.Duration;
public class GroupForm extends AdminBaseForm<Organisation> {
@@ -42,7 +44,7 @@ public class GroupForm extends AdminBase
this.groupList = groupList;
setOutputMarkupId(true);
- add(new RequiredTextField<String>("name"));
+ add(new
RequiredTextField<String>("name").setLabel(Model.of(WebSession.getString(165))));
usersPanel = new GroupUsersPanel("users", getOrgId());
add(usersPanel);
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/ldaps/LdapForm.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/ldaps/LdapForm.java?rev=1487795&r1=1487794&r2=1487795&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/ldaps/LdapForm.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/ldaps/LdapForm.java
Thu May 30 09:28:14 2013
@@ -34,6 +34,7 @@ import org.apache.wicket.markup.html.for
import org.apache.wicket.markup.html.form.TextArea;
import org.apache.wicket.markup.html.form.TextField;
import org.apache.wicket.model.CompoundPropertyModel;
+import org.apache.wicket.model.Model;
import org.apache.wicket.util.time.Duration;
/**
@@ -53,13 +54,13 @@ public class LdapForm extends AdminBaseF
setOutputMarkupId(true);
this.listContainer = listContainer;
- add(new RequiredTextField<String>("name"));
+ add(new
RequiredTextField<String>("name").setLabel(Model.of(WebSession.getString(1108))));
add(new CheckBox("isActive"));
add(DateLabel.forDatePattern("inserted", "dd.MM.yyyy
HH:mm:ss"));
add(new Label("insertedby.login"));
add(DateLabel.forDatePattern("updated", "dd.MM.yyyy HH:mm:ss"));
add(new Label("updatedby.login"));
- add(new RequiredTextField<String>("configFileName"));
+ add(new
RequiredTextField<String>("configFileName").setLabel(Model.of(WebSession.getString(1115))));
add(new CheckBox("addDomainToUserName"));
add(new TextField<String>("domain"));
add(new TextArea<String>("comment"));
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/servers/ServerForm.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/servers/ServerForm.java?rev=1487795&r1=1487794&r2=1487795&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/servers/ServerForm.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/servers/ServerForm.java
Thu May 30 09:28:14 2013
@@ -34,6 +34,7 @@ import org.apache.wicket.markup.html.for
import org.apache.wicket.markup.html.form.TextArea;
import org.apache.wicket.markup.html.form.TextField;
import org.apache.wicket.model.CompoundPropertyModel;
+import org.apache.wicket.model.Model;
import org.apache.wicket.util.time.Duration;
/**
@@ -53,9 +54,9 @@ public class ServerForm extends AdminBas
setOutputMarkupId(true);
this.listContainer = listContainer;
- add(new RequiredTextField<String>("name"));
+ add(new
RequiredTextField<String>("name").setLabel(Model.of(WebSession.getString(1500))));
add(new CheckBox("active"));
- add(new RequiredTextField<String>("address"));
+ add(new
RequiredTextField<String>("address").setLabel(Model.of(WebSession.getString(1501))));
add(new TextField<Integer>("port"));
add(new TextField<String>("user"));
add(new TextField<String>("pass"));
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/users/UserForm.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/users/UserForm.java?rev=1487795&r1=1487794&r2=1487795&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/users/UserForm.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/users/UserForm.java
Thu May 30 09:28:14 2013
@@ -43,6 +43,7 @@ import org.apache.wicket.markup.html.for
import org.apache.wicket.markup.html.form.IChoiceRenderer;
import org.apache.wicket.markup.html.form.RequiredTextField;
import org.apache.wicket.model.CompoundPropertyModel;
+import org.apache.wicket.model.Model;
import org.apache.wicket.util.time.Duration;
/**
@@ -131,7 +132,7 @@ public class UserForm extends AdminBaseF
private void addFormFields() {
ConfigurationDao cfgDao = getBean(ConfigurationDao.class);
login = new RequiredTextField<String>("login");
- // login.setLabel(new Model<String>("testname"));
+ login.setLabel(Model.of(WebSession.getString(132)));
add(login.add(minimumLength(getMinLoginLength(cfgDao))));
add(generalForm = new GeneralUserForm("general", getModel(),
true));
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/common/AddFolderDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/common/AddFolderDialog.java?rev=1487795&r1=1487794&r2=1487795&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/common/AddFolderDialog.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/common/AddFolderDialog.java
Thu May 30 09:28:14 2013
@@ -38,6 +38,7 @@ public abstract class AddFolderDialog ex
private final Form<String> form;
private final FeedbackPanel feedback = new FeedbackPanel("feedback");
private final String name;
+ private RequiredTextField<String> title;
public AddFolderDialog(String id) {
this(id, null);
@@ -49,7 +50,8 @@ public abstract class AddFolderDialog ex
form = new Form<String>("form", getModel()) {
private static final long serialVersionUID = 1L;
{
- add(new RequiredTextField<String>("title",
getModel()));
+ add(title = new
RequiredTextField<String>("title", getModel()));
+
title.setLabel(Model.of(WebSession.getString(572)));
add(feedback.setOutputMarkupId(true));
}
};
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/common/GeneralUserForm.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/common/GeneralUserForm.java?rev=1487795&r1=1487794&r2=1487795&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/common/GeneralUserForm.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/common/GeneralUserForm.java
Thu May 30 09:28:14 2013
@@ -112,6 +112,7 @@ public class GeneralUserForm extends For
}));
add(email = new RequiredTextField<String>("adresses.email"));
+ email.setLabel(Model.of(WebSession.getString(137)));
email.add(RfcCompliantEmailAddressValidator.getInstance());
add(new TextField<String>("adresses.phone"));
add(new CheckBox("sendSMS"));
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java?rev=1487795&r1=1487794&r2=1487795&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java
Thu May 30 09:28:14 2013
@@ -70,6 +70,8 @@ public class ForgetPasswordDialog extend
{
add(feedback.setOutputMarkupId(true));
add(label.setOutputMarkupId(true));
+ add(nameField = new
RequiredTextField<String>("name", new
PropertyModel<String>(ForgetPasswordDialog.this, "name")));
+
nameField.setLabel(Model.of(WebSession.getString(type == Type.email ? 315 :
316)));
RadioGroup<Type> rg = new
RadioGroup<Type>("type", new PropertyModel<Type>(ForgetPasswordDialog.this,
"type"));
add(rg.add(new Radio<Type>("email",
Model.of(Type.email)).setOutputMarkupId(true))
.add(new Radio<Type>("login",
Model.of(Type.login)).setOutputMarkupId(true))
@@ -80,10 +82,10 @@ public class ForgetPasswordDialog extend
@Override
protected void
onUpdate(AjaxRequestTarget target) {
lblModel.setObject(WebSession.getString(type == Type.email ? 315 : 316));
+
nameField.setLabel(Model.of(WebSession.getString(type == Type.email ? 315 :
316)));
target.add(label);
}
});
- add(nameField = new
RequiredTextField<String>("name", new
PropertyModel<String>(ForgetPasswordDialog.this, "name")));
add(new AjaxButton("submit") { //FAKE button so
"submit-on-enter" works as expected
private static final long
serialVersionUID = 5257502637636428620L;
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/RegisterDialog.java?rev=1487795&r1=1487794&r2=1487795&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
Thu May 30 09:28:14 2013
@@ -123,19 +123,27 @@ public class RegisterDialog extends Abst
private PasswordTextField passwordField;
private RequiredTextField<String> emailField;
private RequiredTextField<String> loginField;
+ private RequiredTextField<String> firstNameField;
+ private RequiredTextField<String> lastNameField;
public RegisterForm(String id) {
super(id);
add(feedback.setOutputMarkupId(true));
ConfigurationDao cfgDao =
getBean(ConfigurationDao.class);
- add(new RequiredTextField<String>("firstName", new
PropertyModel<String>(RegisterDialog.this, "firstName")));
- add(new RequiredTextField<String>("lastName", new
PropertyModel<String>(RegisterDialog.this, "lastName")));
+ add(firstNameField = new
RequiredTextField<String>("firstName", new
PropertyModel<String>(RegisterDialog.this, "firstName")));
+
firstNameField.setLabel(Model.of(WebSession.getString(117)));
+ add(lastNameField = new
RequiredTextField<String>("lastName", new
PropertyModel<String>(RegisterDialog.this, "lastName")));
+
lastNameField.setLabel(Model.of(WebSession.getString(118)));
add(loginField = new RequiredTextField<String>("login",
new PropertyModel<String>(RegisterDialog.this, "login")));
+
loginField.setLabel(Model.of(WebSession.getString(114)));
loginField.add(minimumLength(getMinLoginLength(cfgDao)));
add(passwordField = new PasswordTextField("password",
new PropertyModel<String>(RegisterDialog.this, "password")));
+
passwordField.setLabel(Model.of(WebSession.getString(115)));
passwordField.setResetPassword(true).add(minimumLength(getMinPasswdLength(cfgDao)));
add(confirmPassword = new
PasswordTextField("confirmPassword", new
Model<String>()).setResetPassword(true));
+
confirmPassword.setLabel(Model.of(WebSession.getString(116)));
add(emailField = new RequiredTextField<String>("email",
new PropertyModel<String>(RegisterDialog.this, "email")));
+
emailField.setLabel(Model.of(WebSession.getString(119)));
emailField.add(RfcCompliantEmailAddressValidator.getInstance());
add(new DropDownChoice<FieldLanguage>("lang"
, new
PropertyModel<FieldLanguage>(RegisterDialog.this, "lang")
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/SignInDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/SignInDialog.java?rev=1487795&r1=1487794&r2=1487795&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/SignInDialog.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/SignInDialog.java
Thu May 30 09:28:14 2013
@@ -48,6 +48,7 @@ import org.apache.wicket.markup.html.for
import org.apache.wicket.markup.html.form.StatelessForm;
import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.markup.html.panel.FeedbackPanel;
+import org.apache.wicket.model.Model;
import org.apache.wicket.model.PropertyModel;
import org.apache.wicket.request.mapper.parameter.PageParameters;
@@ -189,6 +190,8 @@ public class SignInDialog extends Abstra
class SignInForm extends StatelessForm<String> {
private static final long serialVersionUID =
4079939497154278822L;
+ private PasswordTextField passField;
+ private RequiredTextField<String> loginField;
public SignInForm(String id) {
super(id);
@@ -215,8 +218,10 @@ public class SignInDialog extends Abstra
}
}
add(new FeedbackPanel("feedback"));
- add(new RequiredTextField<String>("login", new
PropertyModel<String>(SignInDialog.this, "login")));
- add(new PasswordTextField("pass", new
PropertyModel<String>(SignInDialog.this, "password")).setResetPassword(true));
+ add(loginField = new RequiredTextField<String>("login",
new PropertyModel<String>(SignInDialog.this, "login")));
+
loginField.setLabel(Model.of(WebSession.getString(114)));
+ add(passField = new PasswordTextField("pass", new
PropertyModel<String>(SignInDialog.this, "password")).setResetPassword(true));
+ passField.setLabel(Model.of(WebSession.getString(115)));
List<LdapConfig> ldaps =
getBean(LdapConfigService.class).getActiveLdapConfigs();
domain = ldaps.get(0);
add(new WebMarkupContainer("ldap")
