http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java index 98ed964..8ecac22 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java @@ -62,8 +62,8 @@ import com.googlecode.wicket.kendo.ui.panel.KendoFeedbackPanel; public class RegisterDialog extends NonClosableDialog<String> { private static final long serialVersionUID = 1L; private static final Logger log = Red5LoggerFactory.getLogger(RegisterDialog.class, webAppRootKey); - private DialogButton cancelBtn = new DialogButton("cancel", Application.getString(122)); - private DialogButton registerBtn = new DialogButton("register", Application.getString(121)) { + private DialogButton cancelBtn = new DialogButton("cancel", Application.getString("122")); + private DialogButton registerBtn = new DialogButton("register", Application.getString("121")) { private static final long serialVersionUID = 1L; @Override @@ -89,11 +89,11 @@ public class RegisterDialog extends NonClosableDialog<String> { private boolean sendEmailAtRegister = false; public RegisterDialog(String id) { - super(id, Application.getString(113)); + super(id, Application.getString("113")); add(form = new RegisterForm("form")); form.setOutputMarkupId(true); - confirmRegistration = new NonClosableMessageDialog("confirmRegistration", Application.getString(235), Application.getString(674)) { + confirmRegistration = new NonClosableMessageDialog("confirmRegistration", Application.getString("235"), Application.getString("warn.notverified")) { private static final long serialVersionUID = 1L; @Override @@ -142,13 +142,13 @@ public class RegisterDialog extends NonClosableDialog<String> { sendEmailAtRegister = 1 == cfgDao.getConfValue("sendEmailAtRegister", Integer.class, "0"); sendConfirmation = !Strings.isEmpty(baseURL) && 1 == cfgDao.getConfValue("sendEmailWithVerficationCode", Integer.class, "0"); - long messageCode = 236; + String messageCode = "account.created"; if (sendConfirmation && sendEmailAtRegister) { - messageCode = 674; + messageCode = "warn.notverified"; } else if (sendConfirmation) { - messageCode = 1591; + messageCode = "1591"; } - confirmRegistration.setModelObject(getString("" + messageCode)); + confirmRegistration.setModelObject(getString(messageCode)); reset(handler); handler.add(form); } @@ -255,10 +255,10 @@ public class RegisterDialog extends NonClosableDialog<String> { error(getString("232")); } if (!getBean(UserDao.class).checkEmail(emailField.getConvertedInput(), User.Type.user, null, null)) { - error(getString("1000")); + error(getString("error.email.inuse")); } if (!getBean(UserDao.class).checkLogin(loginField.getConvertedInput(), User.Type.user, null, null)) { - error(getString("105")); + error(getString("error.login.inuse")); } if (hasErrorMessage()) { // add random timeout
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.java index f5fcc28..9e8bcfe 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.java @@ -47,7 +47,7 @@ import com.googlecode.wicket.kendo.ui.panel.KendoFeedbackPanel; public class ResetPasswordDialog extends NonClosableDialog<String> { private static final long serialVersionUID = 1L; - private DialogButton resetBtn = new DialogButton("reset", Application.getString(327)); + private DialogButton resetBtn = new DialogButton("reset", Application.getString("327")); private Form<String> form = new ResetForm("form"); private final KendoFeedbackPanel feedback = new KendoFeedbackPanel("feedback", new Options("button", true)); private PasswordTextField password; @@ -55,7 +55,7 @@ public class ResetPasswordDialog extends NonClosableDialog<String> { MessageDialog confirmReset; public ResetPasswordDialog(String id, final User user) { - super(id, Application.getString(325)); + super(id, Application.getString("325")); this.user = user; } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java index 3ccc2f2..1142d4a 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java @@ -31,7 +31,6 @@ import java.util.ArrayList; import java.util.List; import org.apache.openmeetings.db.dao.basic.ConfigurationDao; -import org.apache.openmeetings.db.dao.basic.ErrorDao; import org.apache.openmeetings.db.dao.server.LdapConfigDao; import org.apache.openmeetings.db.dao.server.OAuth2Dao; import org.apache.openmeetings.db.entity.server.LdapConfig; @@ -83,7 +82,7 @@ public class SignInDialog extends NonClosableDialog<String> { private static final long serialVersionUID = 1L; private static final Logger log = Red5LoggerFactory.getLogger(SignInDialog.class, webAppRootKey); private Form<String> form; - private DialogButton loginBtn = new DialogButton("login", Application.getString(112)) { + private DialogButton loginBtn = new DialogButton("login", Application.getString("112")) { private static final long serialVersionUID = 1L; @Override @@ -91,7 +90,7 @@ public class SignInDialog extends NonClosableDialog<String> { return true; } }; - private DialogButton registerBtn = new DialogButton("register", Application.getString(123)); + private DialogButton registerBtn = new DialogButton("register", Application.getString("123")); private String password; private String login; private boolean rememberMe = false; @@ -101,7 +100,7 @@ public class SignInDialog extends NonClosableDialog<String> { private final KendoFeedbackPanel feedback = new KendoFeedbackPanel("feedback", new Options("button", true)); public SignInDialog(String id) { - super(id, Application.getString(108)); + super(id, Application.getString("108")); add(form = new SignInForm("signin")); add(new OmAjaxClientInfoBehavior()); } @@ -187,7 +186,7 @@ public class SignInDialog extends NonClosableDialog<String> { try { signIn = ws.signIn(login, password, type, domain.getId()); } catch (OmException e) { - error(e.getCode() == null ? e.getMessage() : getBean(ErrorDao.class).getMessage(e.getCode(), ws.getOmLanguage())); + error(getString(e.getKey())); target.add(feedback); } if (signIn) { @@ -199,7 +198,7 @@ public class SignInDialog extends NonClosableDialog<String> { } } else { if (!hasErrorMessage()) { - error(getString("335")); + error(getString("error.bad.credentials")); target.add(feedback); } // add random timeout @@ -226,9 +225,9 @@ public class SignInDialog extends NonClosableDialog<String> { } add(feedback.setOutputMarkupId(true)); add(loginField = new RequiredTextField<>("login", new PropertyModel<String>(SignInDialog.this, "login"))); - loginField.setLabel(Model.of(Application.getString(114))); + loginField.setLabel(Model.of(Application.getString("114"))); add(passField = new PasswordTextField("pass", new PropertyModel<String>(SignInDialog.this, "password")).setResetPassword(true)); - passField.setLabel(Model.of(Application.getString(115))); + passField.setLabel(Model.of(Application.getString("115"))); List<LdapConfig> ldaps = getBean(LdapConfigDao.class).get(); int selectedLdap = getBean(ConfigurationDao.class).getConfValue(CONFIG_DEFAULT_LDAP_ID, Integer.class, "0"); domain = ldaps.get(selectedLdap < ldaps.size() && selectedLdap > 0 ? selectedLdap : 0); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/ExpiredMessageDialog.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/ExpiredMessageDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/ExpiredMessageDialog.java index 6ffd628..2e51e1b 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/ExpiredMessageDialog.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/ExpiredMessageDialog.java @@ -33,7 +33,7 @@ public class ExpiredMessageDialog extends MessageDialog { private final RoomMenuPanel menu; public ExpiredMessageDialog(String id, String message, RoomMenuPanel menu) { - super(id, Application.getString(204), message, DialogButtons.OK, DialogIcon.ERROR); + super(id, Application.getString("204"), message, DialogButtons.OK, DialogIcon.ERROR); this.menu = menu; } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/NicknameDialog.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/NicknameDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/NicknameDialog.java index a894026..2f6ca31 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/NicknameDialog.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/NicknameDialog.java @@ -45,12 +45,12 @@ public class NicknameDialog extends NonClosableDialog<User> { private static final long serialVersionUID = 1L; private static final FastDateFormat TIME_DF = FastDateFormat.getInstance("HH:mm:ss"); private final KendoFeedbackPanel feedback = new KendoFeedbackPanel("feedback", new Options("button", true)); - private final DialogButton ok = new DialogButton("ok", Application.getString(54)); + private final DialogButton ok = new DialogButton("ok", Application.getString("54")); private final RoomPanel room; private final Form<User> form; public NicknameDialog(String id, final RoomPanel room) { - super(id, Application.getString(1287)); + super(id, Application.getString("1287")); this.room = room; User u = room.getClient().getUser(); add(form = new Form<>("form", new CompoundPropertyModel<>(u))); @@ -60,9 +60,9 @@ public class NicknameDialog extends NonClosableDialog<User> { protected void onInitialize() { super.onInitialize(); form.add(feedback); - form.add(new RequiredTextField<String>("firstname").setLabel(Model.of(Application.getString(135))).add(minimumLength(4))); - form.add(new RequiredTextField<String>("lastname").setLabel(Model.of(Application.getString(136))).add(minimumLength(4))); - form.add(new RequiredTextField<String>("address.email").setLabel(Model.of(Application.getString(137))).add(RfcCompliantEmailAddressValidator.getInstance())); + form.add(new RequiredTextField<String>("firstname").setLabel(Model.of(Application.getString("135"))).add(minimumLength(4))); + form.add(new RequiredTextField<String>("lastname").setLabel(Model.of(Application.getString("136"))).add(minimumLength(4))); + form.add(new RequiredTextField<String>("address.email").setLabel(Model.of(Application.getString("137"))).add(RfcCompliantEmailAddressValidator.getInstance())); } private static boolean isVisible(User u) { @@ -76,7 +76,7 @@ public class NicknameDialog extends NonClosableDialog<User> { User u = form.getModelObject(); boolean visible = isVisible(u); if (visible) { - u.setFirstname(Application.getString(433)); + u.setFirstname(Application.getString("433")); u.setLastname(String.format("%s %s", u.getFirstname(), TIME_DF.format(new Date()))); } behavior.setOption("autoOpen", visible); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RedirectMessageDialog.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RedirectMessageDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RedirectMessageDialog.java index 76bd5c5..c318609 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RedirectMessageDialog.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RedirectMessageDialog.java @@ -43,7 +43,7 @@ public class RedirectMessageDialog extends NonClosableMessageDialog { private Component label; public RedirectMessageDialog(String id, String labelId, boolean autoOpen, String url) { - super(id, Application.getString(204), "", new ArrayList<DialogButton>(), DialogIcon.ERROR); + super(id, Application.getString("204"), "", new ArrayList<DialogButton>(), DialogIcon.ERROR); this.labelId = labelId; this.url = url; this.autoOpen = autoOpen; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java index 50af2a2..9edcbff 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java @@ -140,7 +140,7 @@ public class RoomPanel extends BasePanel { if (r.isFilesOpened()) { sidebar.setFilesActive(target); } - if (Room.Type.restricted != r.getType()) { + if (Room.Type.presentation != r.getType()) { List<Client> mods = Application.getRoomClients(r.getId(), c -> c.hasRight(Room.Right.moderator)); if (mods.isEmpty()) { waitApplyModeration.open(target); @@ -286,7 +286,7 @@ public class RoomPanel extends BasePanel { eventDetail = new EventDetailDialog(EVENT_DETAILS_ID, a); } else { allowed = false; - deniedMessage = getString("1271") + String.format(" %s - %s", getDateFormat().format(a.getStart()), getDateFormat().format(a.getEnd())); + deniedMessage = getString("error.hash.period") + String.format(" %s - %s", getDateFormat().format(a.getStart()), getDateFormat().format(a.getEnd())); } } } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomInvitationForm.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomInvitationForm.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomInvitationForm.java index be57826..38c0ac5 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomInvitationForm.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomInvitationForm.java @@ -83,7 +83,7 @@ public class RoomInvitationForm extends InvitationForm { } })); groupContainer.add( - groups.setLabel(Model.of(Application.getString(126))).setRequired(true).add(new AjaxFormComponentUpdatingBehavior("change") { + groups.setLabel(Model.of(Application.getString("126"))).setRequired(true).add(new AjaxFormComponentUpdatingBehavior("change") { private static final long serialVersionUID = 1L; @Override http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java index 99927b7..222fade 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java @@ -93,7 +93,7 @@ public class RoomMenuPanel extends Panel { } }; private final RoomPanel room; - private final RoomMenuItem exitMenuItem = new RoomMenuItem(Application.getString(308), Application.getString(309), "room menu exit") { + private final RoomMenuItem exitMenuItem = new RoomMenuItem(Application.getString("308"), Application.getString("309"), "room menu exit") { private static final long serialVersionUID = 1L; @Override @@ -101,9 +101,9 @@ public class RoomMenuPanel extends Panel { exit(target); } }; - private final RoomMenuItem filesMenu = new RoomMenuItem(Application.getString(245), null, false); - private final RoomMenuItem actionsMenu = new RoomMenuItem(Application.getString(635), null, false); - private final RoomMenuItem inviteMenuItem = new RoomMenuItem(Application.getString(213), Application.getString(1489), false) { + private final RoomMenuItem filesMenu = new RoomMenuItem(Application.getString("245"), null, false); + private final RoomMenuItem actionsMenu = new RoomMenuItem(Application.getString("635"), null, false); + private final RoomMenuItem inviteMenuItem = new RoomMenuItem(Application.getString("213"), Application.getString("1489"), false) { private static final long serialVersionUID = 1L; @Override @@ -112,7 +112,7 @@ public class RoomMenuPanel extends Panel { invite.open(target); } }; - private final RoomMenuItem shareMenuItem = new RoomMenuItem(Application.getString(239), Application.getString(1480), false) { + private final RoomMenuItem shareMenuItem = new RoomMenuItem(Application.getString("239"), Application.getString("1480"), false) { private static final long serialVersionUID = 1L; @Override @@ -120,7 +120,7 @@ public class RoomMenuPanel extends Panel { shareBtn.onClick(target); } }; - private final RoomMenuItem applyModerMenuItem = new RoomMenuItem(Application.getString(784), Application.getString(1481), false) { + private final RoomMenuItem applyModerMenuItem = new RoomMenuItem(Application.getString("784"), Application.getString("1481"), false) { private static final long serialVersionUID = 1L; @Override @@ -128,7 +128,7 @@ public class RoomMenuPanel extends Panel { room.requestRight(Room.Right.moderator, target); } }; - private final RoomMenuItem applyWbMenuItem = new RoomMenuItem(Application.getString(785), Application.getString(1492), false) { + private final RoomMenuItem applyWbMenuItem = new RoomMenuItem(Application.getString("785"), Application.getString("1492"), false) { private static final long serialVersionUID = 1L; @Override @@ -136,7 +136,7 @@ public class RoomMenuPanel extends Panel { room.requestRight(Room.Right.whiteBoard, target); } }; - private final RoomMenuItem applyAvMenuItem = new RoomMenuItem(Application.getString(786), Application.getString(1482), false) { + private final RoomMenuItem applyAvMenuItem = new RoomMenuItem(Application.getString("786"), Application.getString("1482"), false) { private static final long serialVersionUID = 1L; @Override @@ -144,7 +144,7 @@ public class RoomMenuPanel extends Panel { room.requestRight(Room.Right.video, target); } }; - private final RoomMenuItem pollCreateMenuItem = new RoomMenuItem(Application.getString(24), Application.getString(1483), false) { + private final RoomMenuItem pollCreateMenuItem = new RoomMenuItem(Application.getString("24"), Application.getString("1483"), false) { private static final long serialVersionUID = 1L; @Override @@ -153,7 +153,7 @@ public class RoomMenuPanel extends Panel { createPoll.open(target); } }; - private final RoomMenuItem pollVoteMenuItem = new RoomMenuItem(Application.getString(42), Application.getString(1485), false) { + private final RoomMenuItem pollVoteMenuItem = new RoomMenuItem(Application.getString("42"), Application.getString("1485"), false) { private static final long serialVersionUID = 1L; @Override @@ -165,7 +165,7 @@ public class RoomMenuPanel extends Panel { } } }; - private final RoomMenuItem pollResultMenuItem = new RoomMenuItem(Application.getString(37), Application.getString(1484), false) { + private final RoomMenuItem pollResultMenuItem = new RoomMenuItem(Application.getString("37"), Application.getString("1484"), false) { private static final long serialVersionUID = 1L; @Override @@ -174,7 +174,7 @@ public class RoomMenuPanel extends Panel { pollResults.open(target); } }; - private final RoomMenuItem sipDialerMenuItem = new RoomMenuItem(Application.getString(1447), Application.getString(1488), false) { + private final RoomMenuItem sipDialerMenuItem = new RoomMenuItem(Application.getString("1447"), Application.getString("1488"), false) { private static final long serialVersionUID = 1L; @Override @@ -248,7 +248,7 @@ public class RoomMenuPanel extends Panel { exitMenuItem.setEnabled(false); menu.add(exitMenuItem.setTop(true)); - filesMenu.getItems().add(new RoomMenuItem(Application.getString(15), Application.getString(1479)) { + filesMenu.getItems().add(new RoomMenuItem(Application.getString("15"), Application.getString("1479")) { private static final long serialVersionUID = 1L; @Override http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/SipDialerDialog.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/SipDialerDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/SipDialerDialog.java index 2906900..d62da64 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/SipDialerDialog.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/SipDialerDialog.java @@ -40,8 +40,8 @@ import com.googlecode.wicket.kendo.ui.panel.KendoFeedbackPanel; public class SipDialerDialog extends AbstractFormDialog<String> { private static final long serialVersionUID = 1L; private final KendoFeedbackPanel feedback = new KendoFeedbackPanel("feedback", new Options("button", true)); - private final DialogButton call = new DialogButton("call", Application.getString(1448)); - private final DialogButton close = new DialogButton("close", Application.getString(85)); + private final DialogButton call = new DialogButton("call", Application.getString("1448")); + private final DialogButton close = new DialogButton("close", Application.getString("85")); private final Form<String> form = new Form<>("form", Model.of("")); private final TextField<String> number = new TextField<>("number", Model.of("")); private final RoomPanel room; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/StartSharingButton.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/StartSharingButton.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/StartSharingButton.java index d5fd371..2a2a15e 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/StartSharingButton.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/StartSharingButton.java @@ -68,7 +68,7 @@ public class StartSharingButton extends OmButton { this.uid = uid; setOutputMarkupPlaceholderTag(true); setVisible(false); - add(new AttributeAppender("title", Application.getString(1480))); + add(new AttributeAppender("title", Application.getString("1480"))); add(download = new AjaxDownload(new ResourceStreamResource() { private static final long serialVersionUID = 1L; @@ -105,14 +105,14 @@ public class StartSharingButton extends OmButton { .replace("$url", _url) .replace("$fallback", s.getString(VideoSettings.FALLBACK)) .replace("$sid", sid) - .replace("$labels", getLabels(730, 731, 732, 733, 734 - , 735, 737, 738, 739, 740 - , 741, 742, 844, 869, 870 - , 871, 872, 878, 1089, 1090 - , 1091, 1092, 1093, 1465, 1466 - , 1467, 1468, 1469, 1470, 1471 - , 1472, 1473, 1474, 1475, 1476 - , 1477, 1589, 1598, 1078)) + .replace("$labels", getLabels("730", "731", "732", "733", "734" + , "735", "737", "738", "739", "740" + , "741", "742", "844", "869", "870" + , "871", "872", "878", "1089", "1090" + , "1091", "1092", "1093", "1465", "1466" + , "1467", "1468", "1469", "1470", "1471" + , "1472", "1473", "1474", "1475", "1476" + , "1477", "1589", "1598", "1078")) .replace("$defaultQuality", cfgDao.getConfValue(CONFIG_SCREENSHARING_QUALITY, String.class, "")) .replace("$defaultFps", cfgDao.getConfValue(CONFIG_SCREENSHARING_FPS, String.class, "")) .replace("$showFps", cfgDao.getConfValue(CONFIG_SCREENSHARING_FPS_SHOW, String.class, "true")) @@ -126,10 +126,10 @@ public class StartSharingButton extends OmButton { } } - private static String getLabels(int ... ids) { + private static String getLabels(String ... ids) { StringBuilder result = new StringBuilder(CDATA_BEGIN); boolean delim = false; - for (int id : ids) { + for (String id : ids) { if (delim) { result.append(';'); } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/CreatePollDialog.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/CreatePollDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/CreatePollDialog.java index 3881564..badff92 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/CreatePollDialog.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/CreatePollDialog.java @@ -49,14 +49,14 @@ import com.googlecode.wicket.kendo.ui.panel.KendoFeedbackPanel; public class CreatePollDialog extends AbstractFormDialog<RoomPoll> { private static final long serialVersionUID = 1L; - private final DialogButton create = new DialogButton("create", Application.getString(22)); - private final DialogButton cancel = new DialogButton("cancel", Application.getString(25)); + private final DialogButton create = new DialogButton("create", Application.getString("22")); + private final DialogButton cancel = new DialogButton("cancel", Application.getString("25")); private final Long roomId; private final PollForm form; private final KendoFeedbackPanel feedback = new KendoFeedbackPanel("feedback", new Options("button", true)); public CreatePollDialog(String id, Long roomId) { - super(id, Application.getString(18), new CompoundPropertyModel<>(new RoomPoll())); + super(id, Application.getString("18"), new CompoundPropertyModel<>(new RoomPoll())); this.roomId = roomId; add(form = new PollForm("form", getModel())); } @@ -104,7 +104,7 @@ public class CreatePollDialog extends AbstractFormDialog<RoomPoll> { public PollForm(String id, IModel<RoomPoll> model) { super(id, model); - add(new RequiredTextField<String>("name").setLabel(Model.of(Application.getString(1410)))); + add(new RequiredTextField<String>("name").setLabel(Model.of(Application.getString("1410")))); add(new TextArea<String>("question")); add(new DropDownChoice<>("type", Arrays.asList(RoomPoll.Type.values()) , new ChoiceRenderer<RoomPoll.Type>() { @@ -120,7 +120,7 @@ public class CreatePollDialog extends AbstractFormDialog<RoomPoll> { return pt.name(); } }) - .setRequired(true).setLabel(Model.of(Application.getString(21)))); + .setRequired(true).setLabel(Model.of(Application.getString("21")))); add(feedback); } } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java index 3f3b210..c8e01ce 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java @@ -75,20 +75,20 @@ public class PollResultsDialog extends AbstractDialog<RoomPoll> { private final Long roomId; private final PollSelectForm selForm; private final PollResultsForm dispForm; - private final DialogButton cancel = new DialogButton("cancel", Application.getString(25)); - private final DialogButton close = new DialogButton("close", Application.getString(1418)); - private final DialogButton delete = new DialogButton("delete", Application.getString(1420)); + private final DialogButton cancel = new DialogButton("cancel", Application.getString("25")); + private final DialogButton close = new DialogButton("close", Application.getString("1418")); + private final DialogButton delete = new DialogButton("delete", Application.getString("1420")); private boolean moderator = false; private final MessageDialog closeConfirm; private final MessageDialog deleteConfirm; private boolean opened = false; public PollResultsDialog(String id, Long _roomId) { - super(id, Application.getString(37)); + super(id, Application.getString("37")); this.roomId = _roomId; add(selForm = new PollSelectForm("selForm")); add(dispForm = new PollResultsForm("dispForm")); - add(closeConfirm = new MessageDialog("closeConfirm", Application.getString(1418), Application.getString(1419), DialogButtons.YES_NO, DialogIcon.WARN) { + add(closeConfirm = new MessageDialog("closeConfirm", Application.getString("1418"), Application.getString("1419"), DialogButtons.YES_NO, DialogIcon.WARN) { private static final long serialVersionUID = 1L; @Override @@ -106,7 +106,7 @@ public class PollResultsDialog extends AbstractDialog<RoomPoll> { } } }); - add(deleteConfirm = new MessageDialog("deleteConfirm", Application.getString(1420), Application.getString(1421), DialogButtons.YES_NO, DialogIcon.WARN) { + add(deleteConfirm = new MessageDialog("deleteConfirm", Application.getString("1420"), Application.getString("1421"), DialogButtons.YES_NO, DialogIcon.WARN) { private static final long serialVersionUID = 1L; @Override @@ -212,7 +212,7 @@ public class PollResultsDialog extends AbstractDialog<RoomPoll> { private static String[] getTicks(RoomPoll p) { return p != null && RoomPoll.Type.numeric == p.getType() ? new String[] {"1", "2", "3", "4", "5", "6", "7", "8", "9", "10"} - : new String[] {Application.getString(34), Application.getString(35)}; + : new String[] {Application.getString("34"), Application.getString("35")}; } private static Integer[] initValues(int size) { @@ -293,7 +293,7 @@ public class PollResultsDialog extends AbstractDialog<RoomPoll> { @Override public Object getDisplayValue(RoomPoll object) { - return object == null ? "" : String.format("%s%s", object.getName(), object.isArchived() ? "" : String.format(" (%s)", Application.getString(1413))); + return object == null ? "" : String.format("%s%s", object.getName(), object.isArchived() ? "" : String.format(" (%s)", Application.getString("1413"))); } @Override @@ -328,8 +328,8 @@ public class PollResultsDialog extends AbstractDialog<RoomPoll> { private class PollResultsForm extends Form<RoomPoll> { private static final long serialVersionUID = 1L; - private final String SIMPLE_CHART = Application.getString(1414); - private final String PIE_CHART = Application.getString(1415); + private final String SIMPLE_CHART = Application.getString("1414"); + private final String PIE_CHART = Application.getString("1415"); private final IModel<String> name = Model.of((String)null); private final IModel<String> question = Model.of((String)null); private final IModel<Integer> count = Model.of(0); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/VoteDialog.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/VoteDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/VoteDialog.java index 2f94749..6b7d876 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/VoteDialog.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/VoteDialog.java @@ -58,18 +58,18 @@ public class VoteDialog extends AbstractFormDialog<RoomPollAnswer> { private static final long serialVersionUID = 1L; private final static List<Integer> answers = Arrays.asList(1, 2, 3, 4, 5, 6, 7, 8, 9, 10); //TODO max vote should be added private final PollAnswerForm form; - private final DialogButton vote = new DialogButton("vote", Application.getString(32)); - private final DialogButton cancel = new DialogButton("cancel", Application.getString(25)); + private final DialogButton vote = new DialogButton("vote", Application.getString("32")); + private final DialogButton cancel = new DialogButton("cancel", Application.getString("25")); private final KendoFeedbackPanel feedback = new KendoFeedbackPanel("feedback", new Options("button", true)); private final IModel<String> user = Model.of((String)null); public VoteDialog(String id) { - super(id, Application.getString(18)); + super(id, Application.getString("18")); add(form = new PollAnswerForm("form", new CompoundPropertyModel<>(new RoomPollAnswer()))); } static String getName(User u) { - return u == null ? "" : (getUserId().equals(u.getId()) ? Application.getString(1411) : u.getFirstname() + " " + u.getLastname()); + return u == null ? "" : (getUserId().equals(u.getId()) ? Application.getString("1411") : u.getFirstname() + " " + u.getLastname()); } public void updateModel(IPartialPageRequestHandler target, RoomPoll rp) { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java index a78a76e..75bd986 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java @@ -101,7 +101,7 @@ public class RoomSidebar extends Panel { item.add(new RoomClientPanel("user", item, room)); } }; - private final NameDialog addFolder = new NameDialog("addFolder", Application.getString(712)) { + private final NameDialog addFolder = new NameDialog("addFolder", Application.getString("712")) { private static final long serialVersionUID = 1L; @Override http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.java index 47974e9..259331d 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.java @@ -78,11 +78,11 @@ public class UploadDialog extends AbstractFormDialog<String> { private final RoomPanel room; public UploadDialog(String id, RoomPanel room, RoomFilePanel roomFiles) { - super(id, Application.getString(304)); + super(id, Application.getString("304")); this.roomFiles = roomFiles; this.room = room; add(form = new Form<>("form")); - upload = new DialogButton("upload", Application.getString(593), false) { + upload = new DialogButton("upload", Application.getString("593"), false) { private static final long serialVersionUID = 1L; @Override @@ -90,7 +90,7 @@ public class UploadDialog extends AbstractFormDialog<String> { return true; } }; - cancel = new DialogButton("close", Application.getString(85)); + cancel = new DialogButton("close", Application.getString("85")); toWb.add(new OnChangeAjaxBehavior() { private static final long serialVersionUID = 1L; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/AboutDialog.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/AboutDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/AboutDialog.java index ab92bbe..7613844 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/AboutDialog.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/AboutDialog.java @@ -38,7 +38,7 @@ public class AboutDialog extends AbstractDialog<String> { private static final long serialVersionUID = 1L; public AboutDialog(String id) { - super(id, Application.getString(1549)); + super(id, Application.getString("1549")); add(new Label("name", getBean(ConfigurationDao.class).getAppName())); add(new Label("version", getVersion())); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/InviteUserMessageDialog.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/InviteUserMessageDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/InviteUserMessageDialog.java index 293dd7e..b779eb4 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/InviteUserMessageDialog.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/InviteUserMessageDialog.java @@ -40,14 +40,14 @@ import com.googlecode.wicket.jquery.ui.widget.dialog.DialogButton; public class InviteUserMessageDialog extends AbstractFormDialog<String> { private static final long serialVersionUID = 1L; - private final DialogButton send = new DialogButton("send", Application.getString(1139)); - private final DialogButton cancel = new DialogButton("cancel", Application.getString(219)); + private final DialogButton send = new DialogButton("send", Application.getString("1139")); + private final DialogButton cancel = new DialogButton("cancel", Application.getString("219")); private final Form<Void> form = new Form<>("form"); private final TextArea<String> message = new TextArea<>("message", Model.of("")); private final CheckBox enterRoom = new CheckBox("enterRoom", Model.of(false)); public InviteUserMessageDialog(String id) { - super(id, Application.getString(1138)); + super(id, Application.getString("1138")); add(form.add(message.setRequired(true), enterRoom.setOutputMarkupId(true)).setOutputMarkupId(true)); } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/InviteUserToRoomDialog.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/InviteUserToRoomDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/InviteUserToRoomDialog.java index 20a88ee..fa49202 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/InviteUserToRoomDialog.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/InviteUserToRoomDialog.java @@ -39,10 +39,10 @@ import com.googlecode.wicket.jquery.ui.widget.dialog.DialogButton; public class InviteUserToRoomDialog extends AbstractDialog<String> { private static final long serialVersionUID = 1L; - private DialogButton cancel = new DialogButton("cancel", Application.getString(219)); + private DialogButton cancel = new DialogButton("cancel", Application.getString("219")); private final RoomListPanel publicRooms; private final RoomListPanel privateRooms; - private final InviteUserMessageDialog inviteMsg = new InviteUserMessageDialog("inviteMsg"); + private final InviteUserMessageDialog inviteMsg = new InviteUserMessageDialog("inviteMsg"); private Long userId; private class InviteRoomListPanel extends RoomListPanel { @@ -51,21 +51,21 @@ public class InviteUserToRoomDialog extends AbstractDialog<String> { public InviteRoomListPanel(String id, List<Room> rooms, final String label) { super(id, rooms, label); } - + @Override public void onRoomEnter(AjaxRequestTarget target, Long roomId) { //FIXME TODO only show message if other user is online inviteMsg.open(target, roomId, userId); } } - + public InviteUserToRoomDialog(String id) { - super(id, Application.getString(1131)); - add(publicRooms = new InviteRoomListPanel("publicRooms", new ArrayList<Room>(), Application.getString(1135))); - add(privateRooms = new InviteRoomListPanel("privateRooms", new ArrayList<Room>(), Application.getString(1135))); + super(id, Application.getString("1131")); + add(publicRooms = new InviteRoomListPanel("publicRooms", new ArrayList<Room>(), Application.getString("1135"))); + add(privateRooms = new InviteRoomListPanel("privateRooms", new ArrayList<Room>(), Application.getString("1135"))); add(inviteMsg); } - + private static List<Room> getPrivateRooms(Long userId1, Long userId2, RoomDao roomDao) { List<Long> orgIds = new ArrayList<>(); List<Long> orgIds2 = new ArrayList<>(); @@ -83,7 +83,7 @@ public class InviteUserToRoomDialog extends AbstractDialog<String> { } return result; } - + public void open(IPartialPageRequestHandler handler, Long userId) { this.userId = userId; RoomDao roomDao = getBean(RoomDao.class); @@ -91,12 +91,12 @@ public class InviteUserToRoomDialog extends AbstractDialog<String> { privateRooms.update(handler, getPrivateRooms(getUserId(), userId, roomDao)); open(handler); } - + @Override protected List<DialogButton> getButtons() { return Arrays.asList(cancel); } - + @Override public void onClose(IPartialPageRequestHandler handler, DialogButton button) { } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.java index 6f222bf..1af9b93 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.java @@ -80,8 +80,8 @@ public class MessageDialog extends AbstractFormDialog<PrivateMessage> { private static final long serialVersionUID = 1L; private final Form<PrivateMessage> form; private final KendoFeedbackPanel feedback = new KendoFeedbackPanel("feedback", new Options("button", true)); - protected DialogButton send = new DialogButton("send", Application.getString(218)); - private DialogButton cancel = new DialogButton("cancel", Application.getString(219)); + protected DialogButton send = new DialogButton("send", Application.getString("218")); + private DialogButton cancel = new DialogButton("cancel", Application.getString("219")); private final WebMarkupContainer roomParamsBlock = new WebMarkupContainer("roomParamsBlock"); private final WebMarkupContainer roomParams = new WebMarkupContainer("roomParams"); private final DateTimePicker start = new OmDateTimePicker("start", Model.of(LocalDateTime.now())); @@ -131,7 +131,7 @@ public class MessageDialog extends AbstractFormDialog<PrivateMessage> { } public MessageDialog(String id, CompoundPropertyModel<PrivateMessage> model) { - super(id, Application.getString(1209), model); + super(id, Application.getString("1209"), model); form = new Form<>("form", getModel()); form.add(feedback.setOutputMarkupId(true)); @@ -234,7 +234,7 @@ public class MessageDialog extends AbstractFormDialog<PrivateMessage> { msgDao.update(p, getUserId()); if (to.getAddress() != null) { String aLinkHTML = (isPrivate && to.getType() == Type.user) ? "<br/><br/>" + "<a href='" + getContactsLink() + "'>" - + Application.getString(1302, to.getLanguageId()) + "</a><br/>" : ""; + + Application.getString("1302", to.getLanguageId()) + "</a><br/>" : ""; String invitation_link = ""; if (p.isBookedRoom()) { Invitation i = getBean(IInvitationManager.class).getInvitation(to, p.getRoom(), @@ -248,16 +248,16 @@ public class MessageDialog extends AbstractFormDialog<PrivateMessage> { invitation_link = ""; } else { invitation_link = "<br/>" // - + Application.getString(503, to.getLanguageId()) + + Application.getString("503", to.getLanguageId()) + "<br/><a href='" + invitation_link + "'>" - + Application.getString(504, to.getLanguageId()) + "</a><br/>"; + + Application.getString("504", to.getLanguageId()) + "</a><br/>"; } } String subj = p.getSubject() == null ? "" : p.getSubject(); getBean(MailHandler.class).send(to.getAddress().getEmail(), - Application.getString(1301, to.getLanguageId()) + subj, + Application.getString("1301", to.getLanguageId()) + subj, (p.getMessage() == null ? "" : p.getMessage().replaceAll("\\<.*?>", "")) + aLinkHTML + invitation_link); } } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/UserInfoDialog.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/UserInfoDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/UserInfoDialog.java index 50f3472..4d63f11 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/UserInfoDialog.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/UserInfoDialog.java @@ -37,14 +37,14 @@ import com.googlecode.wicket.jquery.ui.widget.dialog.DialogButton; public class UserInfoDialog extends AbstractDialog<String> { private static final long serialVersionUID = 1L; private WebMarkupContainer container = new WebMarkupContainer("container"); - private DialogButton cancel = new DialogButton("cancel", Application.getString(61)); - private DialogButton message = new DialogButton("message", Application.getString(1253)); - private DialogButton contacts = new DialogButton("contacts", Application.getString(1186)); + private DialogButton cancel = new DialogButton("cancel", Application.getString("61")); + private DialogButton message = new DialogButton("message", Application.getString("1253")); + private DialogButton contacts = new DialogButton("contacts", Application.getString("1186")); private MessageDialog newMessage; private long userId; - + public UserInfoDialog(String id, MessageDialog newMessage) { - super(id, Application.getString(1235)); + super(id, Application.getString("1235")); add(container.add(new WebMarkupContainer("body")).setOutputMarkupId(true)); this.newMessage = newMessage; } @@ -57,21 +57,21 @@ public class UserInfoDialog extends AbstractDialog<String> { handler.add(container); open(handler); } - + public WebMarkupContainer getContainer() { return container; } - + @Override public int getWidth() { return 600; } - + @Override protected List<DialogButton> getButtons() { return Arrays.asList(contacts, message, cancel); } - + @Override public void onClose(IPartialPageRequestHandler handler, DialogButton button) { if (message.equals(button)) { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java index e721c0b..3811327 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java @@ -102,10 +102,10 @@ public class AppointmentDialog extends AbstractFormDialog<Appointment> { private static final Logger log = Red5LoggerFactory.getLogger(AppointmentDialog.class, webAppRootKey); private AppointmentForm form; - private DialogButton save = new DialogButton("save", Application.getString(813)); - private DialogButton cancel = new DialogButton("cancel", Application.getString(1130)); - private DialogButton delete = new DialogButton("delete", Application.getString(814)); - private DialogButton enterRoom = new DialogButton("enterRoom", Application.getString(1282)); + private DialogButton save = new DialogButton("save", Application.getString("813")); + private DialogButton cancel = new DialogButton("cancel", Application.getString("1130")); + private DialogButton delete = new DialogButton("delete", Application.getString("814")); + private DialogButton enterRoom = new DialogButton("enterRoom", Application.getString("1282")); private final CalendarPanel calendarPanel; private final KendoFeedbackPanel feedback = new KendoFeedbackPanel("feedback", new Options("button", true)); final MessageDialog confirmDelete; @@ -159,7 +159,7 @@ public class AppointmentDialog extends AbstractFormDialog<Appointment> { setOutputMarkupId(true); form = new AppointmentForm("appForm", model); add(form); - confirmDelete = new MessageDialog("confirmDelete", Application.getString(814), Application.getString(833), DialogButtons.OK_CANCEL, DialogIcon.WARN){ + confirmDelete = new MessageDialog("confirmDelete", Application.getString("814"), Application.getString("833"), DialogButtons.OK_CANCEL, DialogIcon.WARN){ private static final long serialVersionUID = 1L; @Override @@ -374,7 +374,7 @@ public class AppointmentDialog extends AbstractFormDialog<Appointment> { add(feedback.setOutputMarkupId(true)); //General - add(new RequiredTextField<String>("title").setLabel(Model.of(Application.getString(572)))); + add(new RequiredTextField<String>("title").setLabel(Model.of(Application.getString("572")))); add(ownerPanel.add(owner)); boolean showGroups = AuthLevelUtil.hasAdminLevel(getRights()); add(rdi.add(new AjaxFormChoiceComponentUpdatingBehavior() { @@ -387,7 +387,7 @@ public class AppointmentDialog extends AbstractFormDialog<Appointment> { } })); groupContainer.add( - groups.setLabel(Model.of(Application.getString(126))).setOutputMarkupId(true).setOutputMarkupPlaceholderTag(true) + groups.setLabel(Model.of(Application.getString("126"))).setOutputMarkupId(true).setOutputMarkupPlaceholderTag(true) , new Radio<>("group", Model.of(InviteeType.group)) ); if (showGroups) { @@ -428,7 +428,7 @@ public class AppointmentDialog extends AbstractFormDialog<Appointment> { } }); add(createRoomBlock.add(roomType, new CheckBox("moderated")).setEnabled(createRoom).setOutputMarkupId(true)); - add(groom.setRequired(true).setLabel(Model.of(Application.getString(406))).setEnabled(!createRoom).setOutputMarkupId(true)); + add(groom.setRequired(true).setLabel(Model.of(Application.getString("406"))).setEnabled(!createRoom).setOutputMarkupId(true)); add(sipContainer.setOutputMarkupPlaceholderTag(true).setOutputMarkupId(true)); sipContainer.add(new Label("room.confno", "")).setVisible(false); @@ -503,7 +503,7 @@ public class AppointmentDialog extends AbstractFormDialog<Appointment> { @Override protected void onValidate() { if (null != start.getConvertedInput() && null != end.getConvertedInput() && end.getConvertedInput().isBefore(start.getConvertedInput())) { - error(Application.getString(1592)); + error(Application.getString("1592")); } } } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarDialog.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarDialog.java index 75286b9..1473f61 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarDialog.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarDialog.java @@ -70,9 +70,9 @@ public class CalendarDialog extends AbstractFormDialog<OmCalendar> { private CalendarPanel calendarPanel; private final KendoFeedbackPanel feedback = new KendoFeedbackPanel("feedback", new Options("button", true)); - private DialogButton save = new DialogButton("save", Application.getString(813)); - private DialogButton cancel = new DialogButton("cancel", Application.getString(1130)); - private DialogButton delete = new DialogButton("delete", Application.getString(814)); + private DialogButton save = new DialogButton("save", Application.getString("813")); + private DialogButton cancel = new DialogButton("cancel", Application.getString("1130")); + private DialogButton delete = new DialogButton("delete", Application.getString("814")); private UserCalendarForm form; private MessageDialog confirmDelete; private List<OmCalendar> cals; //List of calendars for syncing @@ -94,7 +94,7 @@ public class CalendarDialog extends AbstractFormDialog<OmCalendar> { this.calendarPanel = calendarPanel; form = new UserCalendarForm("calform", model); add(form); - confirmDelete = new MessageDialog("confirmDelete", Application.getString(814), Application.getString(833), DialogButtons.OK_CANCEL, DialogIcon.WARN) { + confirmDelete = new MessageDialog("confirmDelete", Application.getString("814"), Application.getString("833"), DialogButtons.OK_CANCEL, DialogIcon.WARN) { private static final long serialVersionUID = 1L; @Override @@ -411,8 +411,8 @@ public class CalendarDialog extends AbstractFormDialog<OmCalendar> { // Fields required for adding Google Calendar Label urlLabel = new Label("urlLabel", Application.getString("calendar.url")), - userLabel = new Label("userLabel", Application.getString(114)), - passLabel = new Label("passLabel", Application.getString(115)); + userLabel = new Label("userLabel", Application.getString("114")), + passLabel = new Label("passLabel", Application.getString("115")); AjaxCheckBox gcal; // Checkbox for Google Calendar UrlTextField url = new UrlTextField("url", Model.of(""), new UrlValidator() { @@ -523,7 +523,7 @@ public class CalendarDialog extends AbstractFormDialog<OmCalendar> { pass.setVisible(true); passLabel.setVisible(true); - userLabel.setDefaultModelObject(Application.getString(114)); + userLabel.setDefaultModelObject(Application.getString("114")); username.setModelObject(null); urlLabel.setDefaultModelObject(Application.getString("calendar.url")); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java index 19a846b..bbe0651 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java @@ -144,7 +144,7 @@ public class CalendarPanel extends UserPanel { final Form<Date> form = new Form<>("form"); add(form); - dialog = new AppointmentDialog("appointment", Application.getString(815) + dialog = new AppointmentDialog("appointment", Application.getString("815") , this, new CompoundPropertyModel<>(getDefault())); add(dialog); @@ -160,24 +160,24 @@ public class CalendarPanel extends UserPanel { options.set("timeFormat", Options.asString("H(:mm)")); options.set("buttonText", new JSONObject() - .put("month", Application.getString(801)) - .put("week", Application.getString(800)) - .put("day", Application.getString(799)) - .put("today", Application.getString(1555)).toString()); + .put("month", Application.getString("801")) + .put("week", Application.getString("800")) + .put("day", Application.getString("799")) + .put("today", Application.getString("1555")).toString()); JSONArray monthes = new JSONArray(); JSONArray shortMonthes = new JSONArray(); JSONArray days = new JSONArray(); JSONArray shortDays = new JSONArray(); // first week day must be Sunday - days.put(0, Application.getString(466)); - shortDays.put(0, Application.getString(459)); + days.put(0, Application.getString("466")); + shortDays.put(0, Application.getString("459")); for (int i = 0; i < 12; i++) { - monthes.put(i, Application.getString(469 + i)); - shortMonthes.put(i, Application.getString(1556 + i)); + monthes.put(i, Application.getString("" + (469 + i))); + shortMonthes.put(i, Application.getString("" + (1556 + i))); if (i + 1 < 7) { - days.put(i + 1, Application.getString(460 + i)); - shortDays.put(i + 1, Application.getString(453 + i)); + days.put(i + 1, Application.getString("" + (460 + i))); + shortDays.put(i + 1, Application.getString("" + (453 + i))); } } options.set("monthNames", monthes.toString()); @@ -407,7 +407,7 @@ public class CalendarPanel extends UserPanel { Appointment a = new Appointment(); a.setReminder(Reminder.ical); //TODO: Make configurable a.setOwner(getBean(UserDao.class).get(getUserId())); - a.setTitle(Application.getString(1444)); + a.setTitle(Application.getString("1444")); log.debug(" -- getDefault -- Current model " + a); return a; } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java index 77ad001..a78075b 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java @@ -133,14 +133,14 @@ public class Chat extends Panel { public static CharSequence getReinit() { StringBuilder sb = new StringBuilder("Chat.reinit("); - sb.append('\'').append(Application.getString(1494)).append('\'') - .append(',').append('\'').append(Application.getString(406)).append('\''); + sb.append('\'').append(Application.getString("1494")).append('\'') + .append(',').append('\'').append(Application.getString("406")).append('\''); return sb.append("); "); } public CharSequence addRoom(Room r) { StringBuilder sb = new StringBuilder(); - sb.append(String.format("Chat.addTab('%1$s%2$d', '%3$s %2$d');", ID_ROOM_PREFIX, r.getId(), Application.getString(406))); + sb.append(String.format("Chat.addTab('%1$s%2$d', '%3$s %2$d');", ID_ROOM_PREFIX, r.getId(), Application.getString("406"))); List<ChatMessage> list = getBean(ChatDao.class).getRoom(r.getId(), 0, 30, !r.isChatModerated() || isModerator(getUserId(), r.getId())); if (list.size() > 0) { sb.append("Chat.addMessage(").append(getMessage(list).toString()).append(");"); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/MyRoomsWidget.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/MyRoomsWidget.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/MyRoomsWidget.java index 8f81e1a..06041ec 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/MyRoomsWidget.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/MyRoomsWidget.java @@ -34,14 +34,14 @@ public class MyRoomsWidget extends AbstractWidget { location = new WidgetLocation(0, 1); init(); } - + @Override public void init() { super.init(); - title = Application.getString(781L); + title = Application.getString("781"); id = WIDGET_ID_MY_ROOMS; } - + @Override public WidgetView createView(String viewId) { return new MyRoomsWidgetView(viewId, new Model<Widget>(this)); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/MyRoomsWidgetDescriptor.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/MyRoomsWidgetDescriptor.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/MyRoomsWidgetDescriptor.java index 64a1a84..cce537e 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/MyRoomsWidgetDescriptor.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/MyRoomsWidgetDescriptor.java @@ -26,7 +26,7 @@ public class MyRoomsWidgetDescriptor implements WidgetDescriptor { @Override public String getName() { - return Application.getString(781L); + return Application.getString("781"); } @Override @@ -36,7 +36,7 @@ public class MyRoomsWidgetDescriptor implements WidgetDescriptor { @Override public String getDescription() { - return Application.getString(782L); + return Application.getString("782"); } @Override http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidget.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidget.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidget.java index 674c350..052e90e 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidget.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidget.java @@ -34,14 +34,14 @@ public class RssWidget extends AbstractWidget { location = new WidgetLocation(1, 1); init(); } - + @Override public void init() { super.init(); - title = Application.getString(277L); + title = Application.getString("277"); id = WIDGET_ID_RSS; } - + @Override public WidgetView createView(String viewId) { return new RssWidgetView(viewId, new Model<Widget>(this)); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidgetDescriptor.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidgetDescriptor.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidgetDescriptor.java index ae33186..0cbc021 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidgetDescriptor.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidgetDescriptor.java @@ -26,7 +26,7 @@ public class RssWidgetDescriptor implements WidgetDescriptor { @Override public String getName() { - return Application.getString(277L); + return Application.getString("277"); } @Override @@ -36,7 +36,7 @@ public class RssWidgetDescriptor implements WidgetDescriptor { @Override public String getDescription() { - return Application.getString(277L); + return Application.getString("277"); } @Override http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidget.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidget.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidget.java index b0b56be..22dd4fb 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidget.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidget.java @@ -33,14 +33,14 @@ public class WelcomeWidget extends AbstractWidget { location = new WidgetLocation(0, 0); init(); } - + @Override public void init() { super.init(); - title = Application.getString(1546L); + title = Application.getString("1546"); id = "WelcomeWidget"; } - + @Override public WidgetView createView(String viewId) { return new WelcomeWidgetView(viewId, new Model<Widget>(this)); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetDescriptor.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetDescriptor.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetDescriptor.java index 241ba59..12aec81 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetDescriptor.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetDescriptor.java @@ -26,7 +26,7 @@ public class WelcomeWidgetDescriptor implements WidgetDescriptor { @Override public String getName() { - return Application.getString(1546L); + return Application.getString("1546"); } @Override @@ -36,7 +36,7 @@ public class WelcomeWidgetDescriptor implements WidgetDescriptor { @Override public String getDescription() { - return Application.getString(1547L); + return Application.getString("1547"); } @Override http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ChangePasswordDialog.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ChangePasswordDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ChangePasswordDialog.java index 538012e..f9a70a9 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ChangePasswordDialog.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ChangePasswordDialog.java @@ -76,7 +76,7 @@ public class ChangePasswordDialog extends AbstractFormDialog<String> { } String p1 = pass.getConvertedInput(); if (!Strings.isEmpty(p1) && !p1.equals(pass2.getConvertedInput())) { - error(Application.getString(232)); + error(Application.getString("232")); } super.onValidate(); } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java index 89a8a98..13ae48f 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java @@ -44,8 +44,8 @@ import org.apache.openmeetings.db.entity.user.User; import org.apache.openmeetings.db.entity.user.UserContact; import org.apache.openmeetings.web.admin.SearchableDataView; import org.apache.openmeetings.web.app.Application; -import org.apache.openmeetings.web.common.NameDialog; import org.apache.openmeetings.web.common.ConfirmableAjaxBorder; +import org.apache.openmeetings.web.common.NameDialog; import org.apache.openmeetings.web.common.PagedEntityListPanel; import org.apache.openmeetings.web.common.UserPanel; import org.apache.openmeetings.web.data.DataViewContainer; @@ -85,11 +85,11 @@ import com.googlecode.wicket.jquery.ui.plugins.fixedheadertable.FixedHeaderTable public class MessagesContactsPanel extends UserPanel { private static final long serialVersionUID = 1L; private final static Long MOVE_CHOOSE = Long.valueOf(-1); - private final static int SELECT_CHOOSE = 1252; - private final static int SELECT_ALL = 1239; - private final static int SELECT_NONE = 1240; - private final static int SELECT_UNREAD = 1241; - private final static int SELECT_READ = 1242; + private final static String SELECT_CHOOSE = "1252"; + private final static String SELECT_ALL = "1239"; + private final static String SELECT_NONE = "1240"; + private final static String SELECT_UNREAD = "1241"; + private final static String SELECT_READ = "1242"; private final WebMarkupContainer container = new WebMarkupContainer("container"); private final WebMarkupContainer folders = new WebMarkupContainer("folders"); private final Label unread = new Label("unread", Model.of(0L)); @@ -114,20 +114,20 @@ public class MessagesContactsPanel extends UserPanel { private final Button readBtn = new Button("readBtn"); private final Button unreadBtn = new Button("unreadBtn"); private final FixedHeaderTableBehavior fixedTable = new FixedHeaderTableBehavior("#messagesTable", new Options("height", 100)); - private final DropDownChoice<Integer> selectDropDown = new DropDownChoice<>( + private final DropDownChoice<String> selectDropDown = new DropDownChoice<>( "msgSelect", Model.of(SELECT_CHOOSE) , Arrays.asList(SELECT_CHOOSE, SELECT_ALL, SELECT_NONE, SELECT_UNREAD, SELECT_READ) - , new ChoiceRenderer<Integer>() { + , new ChoiceRenderer<String>() { private static final long serialVersionUID = 1L; @Override - public Object getDisplayValue(Integer object) { + public Object getDisplayValue(String object) { return Application.getString(object); } @Override - public String getIdValue(Integer object, int index) { - return "" + object; + public String getIdValue(String object, int index) { + return object; } }); private PrivateMessageFolder NOT_MOVE_FOLDER = new PrivateMessageFolder(); @@ -216,7 +216,7 @@ public class MessagesContactsPanel extends UserPanel { emptySelection(target); selectDropDown.setModelObject(SELECT_CHOOSE); moveDropDown.setModelObject(NOT_MOVE_FOLDER); - deleteBtn.add(AttributeModifier.replace("value", Application.getString(TRASH_FOLDER_ID.equals(id) ? 1256 : 1245))); + deleteBtn.add(AttributeModifier.replace("value", Application.getString(TRASH_FOLDER_ID.equals(id) ? "1256" : "1245"))); readBtn.setEnabled(false); unreadBtn.setEnabled(false); if (target != null) { @@ -261,7 +261,7 @@ public class MessagesContactsPanel extends UserPanel { public MessagesContactsPanel(String id) { super(id); NOT_MOVE_FOLDER.setId(MOVE_CHOOSE); - NOT_MOVE_FOLDER.setFolderName(Application.getString(1243)); + NOT_MOVE_FOLDER.setFolderName(Application.getString("1243")); foldersModel.setObject(getBean(PrivateMessageFolderDao.class).get(0, Integer.MAX_VALUE)); updateMoveModel(); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/SettingsPanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/SettingsPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/SettingsPanel.java index 68d0658..3f67c5a 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/SettingsPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/SettingsPanel.java @@ -49,7 +49,7 @@ public class SettingsPanel extends UserPanel { super(id); List<ITab> tabs = new ArrayList<>(); - tabs.add(new AjaxTab(Model.of(Application.getString(1170))) { + tabs.add(new AjaxTab(Model.of(Application.getString("1170"))) { private static final long serialVersionUID = 1L; UserProfilePanel profilePanel = null; @@ -71,7 +71,7 @@ public class SettingsPanel extends UserPanel { return super.load(target); } }); - tabs.add(new AjaxTab(Model.of(Application.getString(1188))) { + tabs.add(new AjaxTab(Model.of(Application.getString("1188"))) { private static final long serialVersionUID = 1L; @Override @@ -79,7 +79,7 @@ public class SettingsPanel extends UserPanel { return new MessagesContactsPanel(panelId); } }); - tabs.add(new AbstractTab(Model.of(Application.getString(1171))) { + tabs.add(new AbstractTab(Model.of(Application.getString("1171"))) { private static final long serialVersionUID = 1L; @Override @@ -87,7 +87,7 @@ public class SettingsPanel extends UserPanel { return new ProfilePanel(panelId); } }); - tabs.add(new AbstractTab(Model.of(Application.getString(1172))) { + tabs.add(new AbstractTab(Model.of(Application.getString("1172"))) { private static final long serialVersionUID = 1L; @Override @@ -95,7 +95,7 @@ public class SettingsPanel extends UserPanel { return new UserSearchPanel(panelId); } }); - tabs.add(new AbstractTab(Model.of(Application.getString(1548))) { + tabs.add(new AbstractTab(Model.of(Application.getString("1548"))) { private static final long serialVersionUID = 1L; @Override http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java index 56713fb..7a7725e 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java @@ -65,7 +65,7 @@ public class UserProfilePanel extends UserPanel { address.add(new Label("address.comment")); } else { address.setVisible(false); - addressDenied.setDefaultModelObject(Application.getString(model.getObject().isShowContactDataToContacts() ? 1269 : 1268)); + addressDenied.setDefaultModelObject(Application.getString(model.getObject().isShowContactDataToContacts() ? "1269" : "1268")); } add(address.setDefaultModel(model)); add(addressDenied); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingsPanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingsPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingsPanel.java index 4026398..de92449 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingsPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingsPanel.java @@ -35,7 +35,7 @@ public class RecordingsPanel extends UserPanel { private static final long serialVersionUID = 1L; private final VideoPlayer video = new VideoPlayer("video"); private final VideoInfo info = new VideoInfo("info"); - private final NameDialog addFolder = new NameDialog("addFolder", Application.getString(712)) { + private final NameDialog addFolder = new NameDialog("addFolder", Application.getString("712")) { private static final long serialVersionUID = 1L; @Override http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsPanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsPanel.java index 1bd414c..88393b5 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsPanel.java @@ -56,7 +56,7 @@ public class RoomsPanel extends UserPanel { public RoomsPanel(String id, List<Room> rooms) { super(id); - add(new RoomListPanel("list", rooms, Application.getString(131)) { + add(new RoomListPanel("list", rooms, Application.getString("131")) { private static final long serialVersionUID = 1L; @Override http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsSelectorPanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsSelectorPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsSelectorPanel.java index b931e24..9bf0116 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsSelectorPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsSelectorPanel.java @@ -30,23 +30,23 @@ public class RoomsSelectorPanel extends UserPanel { public RoomsSelectorPanel(String id, MenuParams param) { super(id); - long title, desc; + String title, desc; RoomDao roomDao = Application.getBean(RoomDao.class); switch (param) { case myTabButton: - title = 781L; - desc = 782L; + title = "781"; + desc = "782"; add(new RoomsPanel("rooms", getMyRooms())); break; case privateTabButton: - title = 779L; - desc = 780L; - add(new RoomsTabbedPanel("rooms")); + title = "779"; + desc = "780"; + add(new RoomsTabbedPanel("rooms")); break; case publicTabButton: default: - title = 777L; - desc = 778L; + title = "777"; + desc = "778"; add(new RoomsPanel("rooms", roomDao.getPublicRooms())); break; } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsTabbedPanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsTabbedPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsTabbedPanel.java index f73a2d9..abb807e 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsTabbedPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsTabbedPanel.java @@ -37,11 +37,11 @@ import org.apache.wicket.model.Model; import com.googlecode.wicket.jquery.core.JQueryBehavior; public class RoomsTabbedPanel extends UserPanel { - private static final long serialVersionUID = 3642004664480074881L; + private static final long serialVersionUID = 1L; public RoomsTabbedPanel(String id) { super(id); - + User u = getBean(UserDao.class).get(getUserId()); add(new ListView<GroupUser>("orgTabs", u.getGroupUsers()) { private static final long serialVersionUID = 1L; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ContactsHelper.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ContactsHelper.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ContactsHelper.java index cdb382c..2100a4d 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ContactsHelper.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ContactsHelper.java @@ -31,18 +31,18 @@ import org.apache.openmeetings.service.mail.template.RequestContactTemplate; import org.apache.openmeetings.web.app.Application; public class ContactsHelper { - public static Long addUserToContactList(long userIdToAdd) { + public static Object addUserToContactList(long userIdToAdd) { boolean isContact = getBean(UserContactDao.class).isContact(userIdToAdd, getUserId()); if (isContact) { - return -45L; + return "error.contact.added"; } UserContact contact = getBean(UserContactDao.class).add(userIdToAdd, getUserId(), true); User user = contact.getOwner(); User userToAdd = contact.getContact(); - String subj = user.getFirstname() + " " + user.getLastname() + " " + Application.getString(1193); + String subj = user.getFirstname() + " " + user.getLastname() + " " + Application.getString("1193"); String message = RequestContactTemplate.getEmail(userToAdd, user); getBean(PrivateMessageDao.class).addPrivateMessage( @@ -52,19 +52,19 @@ public class ContactsHelper { getBean(MailHandler.class).send(userToAdd.getAddress().getEmail(), subj, message); } - return contact.getId(); + return contact; } - public static Long acceptUserContact(long userContactId) { + public static Object acceptUserContact(long userContactId) { UserContactDao dao = getBean(UserContactDao.class); UserContact contact = dao.get(userContactId); if (contact == null) { - return -46L; + return "error.contact.denied"; } if (!contact.isPending()) { - return -47L; + return "error.contact.approved"; } dao.updateContactStatus(userContactId, false); @@ -77,7 +77,7 @@ public class ContactsHelper { if (user.getAddress() != null) { String message = RequestContactConfirmTemplate.getEmail(contact); - String subj = contact.getContact().getFirstname() + " " + contact.getContact().getLastname() + " " + Application.getString(1198); + String subj = contact.getContact().getFirstname() + " " + contact.getContact().getLastname() + " " + Application.getString("1198"); getBean(PrivateMessageDao.class).addPrivateMessage( subj, message, http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/db2_persistence.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/db2_persistence.xml b/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/db2_persistence.xml index 8134c66..6a637fa 100644 --- a/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/db2_persistence.xml +++ b/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/db2_persistence.xml @@ -25,7 +25,6 @@ <persistence-unit name="openmeetings" transaction-type="RESOURCE_LOCAL"> <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider> <class>org.apache.openmeetings.db.entity.basic.Configuration</class> - <class>org.apache.openmeetings.db.entity.basic.ErrorValue</class> <class>org.apache.openmeetings.db.entity.server.LdapConfig</class> <class>org.apache.openmeetings.db.entity.basic.MailMessage</class> <class>org.apache.openmeetings.db.entity.basic.Naviglobal</class> @@ -52,7 +51,6 @@ <class>org.apache.openmeetings.db.entity.user.PrivateMessage</class> <class>org.apache.openmeetings.db.entity.user.PrivateMessageFolder</class> <class>org.apache.openmeetings.db.entity.user.UserContact</class> - <class>org.apache.openmeetings.db.entity.user.Userdata</class> <class>org.apache.openmeetings.db.entity.user.User</class> <class>org.apache.openmeetings.db.entity.file.FileItem</class> <class>org.apache.openmeetings.db.entity.file.FileItemLog</class> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/derby_persistence.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/derby_persistence.xml b/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/derby_persistence.xml index d147355..94ca434 100644 --- a/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/derby_persistence.xml +++ b/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/derby_persistence.xml @@ -25,7 +25,6 @@ <persistence-unit name="openmeetings" transaction-type="RESOURCE_LOCAL"> <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider> <class>org.apache.openmeetings.db.entity.basic.Configuration</class> - <class>org.apache.openmeetings.db.entity.basic.ErrorValue</class> <class>org.apache.openmeetings.db.entity.server.LdapConfig</class> <class>org.apache.openmeetings.db.entity.basic.MailMessage</class> <class>org.apache.openmeetings.db.entity.basic.Naviglobal</class> @@ -52,7 +51,6 @@ <class>org.apache.openmeetings.db.entity.user.PrivateMessage</class> <class>org.apache.openmeetings.db.entity.user.PrivateMessageFolder</class> <class>org.apache.openmeetings.db.entity.user.UserContact</class> - <class>org.apache.openmeetings.db.entity.user.Userdata</class> <class>org.apache.openmeetings.db.entity.user.User</class> <class>org.apache.openmeetings.db.entity.file.FileItem</class> <class>org.apache.openmeetings.db.entity.file.FileItemLog</class> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mssql_persistence.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mssql_persistence.xml b/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mssql_persistence.xml index f97ac16..f6fde61 100644 --- a/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mssql_persistence.xml +++ b/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mssql_persistence.xml @@ -25,7 +25,6 @@ <persistence-unit name="openmeetings" transaction-type="RESOURCE_LOCAL"> <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider> <class>org.apache.openmeetings.db.entity.basic.Configuration</class> - <class>org.apache.openmeetings.db.entity.basic.ErrorValue</class> <class>org.apache.openmeetings.db.entity.server.LdapConfig</class> <class>org.apache.openmeetings.db.entity.basic.MailMessage</class> <class>org.apache.openmeetings.db.entity.basic.Naviglobal</class> @@ -52,7 +51,6 @@ <class>org.apache.openmeetings.db.entity.user.PrivateMessage</class> <class>org.apache.openmeetings.db.entity.user.PrivateMessageFolder</class> <class>org.apache.openmeetings.db.entity.user.UserContact</class> - <class>org.apache.openmeetings.db.entity.user.Userdata</class> <class>org.apache.openmeetings.db.entity.user.User</class> <class>org.apache.openmeetings.db.entity.file.FileItem</class> <class>org.apache.openmeetings.db.entity.file.FileItemLog</class>
