http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthForm.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthForm.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthForm.java index a7b60a1..70447ec 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthForm.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthForm.java @@ -51,20 +51,20 @@ public class OAuthForm extends AdminBaseForm<OAuthServer> { setOutputMarkupId(true); add(new CheckBox("isEnabled")); - add(new RequiredTextField<String>("name").setLabel(Model.of(Application.getString(1573)))); - add(new TextField<String>("iconUrl").setLabel(Model.of(Application.getString(1575)))); - add(new RequiredTextField<String>("clientId").setLabel(Model.of(Application.getString(1576)))); - add(new RequiredTextField<String>("clientSecret").setLabel(Model.of(Application.getString(1577)))); - add(redirectUriText = (TextField<String>) new TextField<>("redirectUri", Model.of("")).setLabel(Model.of(Application.getString(1587)))); - add(new RequiredTextField<String>("requestKeyUrl").setLabel(Model.of(Application.getString(1578)))); - add(new RequiredTextField<String>("requestTokenUrl").setLabel(Model.of(Application.getString(1579)))); - add(new RequiredTextField<String>("requestTokenAttributes").setLabel(Model.of(Application.getString(1586)))); - add(new RequiredTextField<String>("requestInfoUrl").setLabel(Model.of(Application.getString(1580)))); + add(new RequiredTextField<String>("name").setLabel(Model.of(Application.getString("1573")))); + add(new TextField<String>("iconUrl").setLabel(Model.of(Application.getString("1575")))); + add(new RequiredTextField<String>("clientId").setLabel(Model.of(Application.getString("1576")))); + add(new RequiredTextField<String>("clientSecret").setLabel(Model.of(Application.getString("1577")))); + add(redirectUriText = (TextField<String>) new TextField<>("redirectUri", Model.of("")).setLabel(Model.of(Application.getString("1587")))); + add(new RequiredTextField<String>("requestKeyUrl").setLabel(Model.of(Application.getString("1578")))); + add(new RequiredTextField<String>("requestTokenUrl").setLabel(Model.of(Application.getString("1579")))); + add(new RequiredTextField<String>("requestTokenAttributes").setLabel(Model.of(Application.getString("1586")))); + add(new RequiredTextField<String>("requestInfoUrl").setLabel(Model.of(Application.getString("1580")))); add(new DropDownChoice<>("requestTokenMethod", Arrays.asList(RequestMethod.values()), new ChoiceRenderer<RequestMethod>("name", "name"))); - add(new RequiredTextField<String>("loginParamName").setLabel(Model.of(Application.getString(1582)))); - add(new RequiredTextField<String>("emailParamName").setLabel(Model.of(Application.getString(1583)))); - add(new TextField<String>("firstnameParamName").setLabel(Model.of(Application.getString(1584)))); - add(new TextField<String>("lastnameParamName").setLabel(Model.of(Application.getString(1585)))); + add(new RequiredTextField<String>("loginParamName").setLabel(Model.of(Application.getString("1582")))); + add(new RequiredTextField<String>("emailParamName").setLabel(Model.of(Application.getString("1583")))); + add(new TextField<String>("firstnameParamName").setLabel(Model.of(Application.getString("1584")))); + add(new TextField<String>("lastnameParamName").setLabel(Model.of(Application.getString("1585")))); // attach an ajax validation behavior to all form component's keydown // event and throttle it down to once per second
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java index 1afba1d..65f5f81 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java @@ -114,7 +114,7 @@ public class RoomForm extends AdminBaseForm<Room> { protected void onInitialize() { super.onInitialize(); RequiredTextField<String> name = new RequiredTextField<>("name"); - name.setLabel(new Model<>(Application.getString(193))); + name.setLabel(new Model<>(Application.getString("193"))); add(name); add(new DropDownChoice<>("numberOfPartizipants", // @@ -131,7 +131,7 @@ public class RoomForm extends AdminBaseForm<Room> { } })); - add(new RoomTypeDropDown("type").setRequired(true).setLabel(Model.of(Application.getString(194)))); + add(new RoomTypeDropDown("type").setRequired(true).setLabel(Model.of(Application.getString("194")))); add(new TextArea<String>("comment")); @@ -180,7 +180,7 @@ public class RoomForm extends AdminBaseForm<Room> { add(new CheckBox("isDemoRoom")); TextField<Integer> demoTime = new TextField<>("demoTime"); - demoTime.setLabel(new Model<>(Application.getString(637))); + demoTime.setLabel(new Model<>(Application.getString("637"))); add(demoTime); add(new CheckBox("allowUserQuestions")); add(new CheckBox("audioOnly")); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java index 9ac496f..d02c15d 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java @@ -108,7 +108,7 @@ public class UserForm extends AdminBaseForm<User> { ConfigurationDao cfgDao = getBean(ConfigurationDao.class); add(password.setResetPassword(false).setLabel(Model.of(getString("133"))) .add(passValidator = new StrongPasswordValidator(getMinPasswdLength(cfgDao), getModelObject()))); - login.setLabel(Model.of(Application.getString(132))); + login.setLabel(Model.of(Application.getString("132"))); add(login.add(minimumLength(getMinLoginLength(cfgDao)))); add(new DropDownChoice<>("type", Arrays.asList(Type.values())).add(new OnChangeAjaxBehavior() { @@ -188,10 +188,7 @@ public class UserForm extends AdminBaseForm<User> { u = getBean(UserDao.class).update(u, password.getConvertedInput(), getUserId()); if (isNew && sendEmailAtRegister) { String email = u.getAddress().getEmail(); - String sendMail = getBean(EmailManager.class).sendMail(login.getValue(), email, u.getActivatehash(), false, null); - if (!sendMail.equals("success")) { - throw new Exception("Mail for new user is not sent"); - } + getBean(EmailManager.class).sendMail(login.getValue(), email, u.getActivatehash(), false, null); } } catch (Exception e) { // FIXME update feedback with the error details @@ -282,7 +279,7 @@ public class UserForm extends AdminBaseForm<User> { protected void onValidate() { User u = getModelObject(); if(!getBean(UserDao.class).checkLogin(login.getConvertedInput(), u.getType(), u.getDomainId(), u.getId())) { - error(getString("105")); + error(getString("error.login.inuse")); } super.onValidate(); } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.java index ab8685d..df95464 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.java @@ -48,7 +48,7 @@ import com.googlecode.wicket.jquery.ui.widget.dialog.MessageDialog; public class UsersPanel extends AdminPanel { private static final long serialVersionUID = 1L; final WebMarkupContainer listContainer = new WebMarkupContainer("listContainer"); - private final MessageDialog warning = new MessageDialog("warning", Application.getString(797), Application.getString(343), DialogButtons.OK, DialogIcon.WARN) { + private final MessageDialog warning = new MessageDialog("warning", Application.getString("797"), Application.getString("warn.nogroup"), DialogButtons.OK, DialogIcon.WARN) { 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/app/Application.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java index 38d1189..9641bdc 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java @@ -679,10 +679,6 @@ public class Application extends AuthenticatedWebApplication implements IApplica return wac == null ? null : wac.getBean(clazz); } - public static String getString(long id) { - return getString(id, WebSession.getLanguage()); - } - public static String getString(String id) { return getString(id, WebSession.getLanguage()); } @@ -699,14 +695,6 @@ public class Application extends AuthenticatedWebApplication implements IApplica return getString(key, getLocale(languageId)); } - public static String getString(long id, final long languageId) { - return getString(id, getLocale(languageId)); - } - - public static String getString(long id, final Locale loc) { - return getString("" + id, loc); - } - public static String getString(String key, final Locale loc, String... params) { if (!exists()) { ThreadContext.setApplication(org.apache.wicket.Application.get(appName)); @@ -818,18 +806,13 @@ public class Application extends AuthenticatedWebApplication implements IApplica } @Override - public String getOmString(long id) { - return getString(id); - } - - @Override - public String getOmString(long id, long languageId) { - return getString(id, languageId); + public String getOmString(String key, long languageId) { + return getString(key, languageId); } @Override - public String getOmString(String key, long languageId) { - return getString(key, languageId); + public String getOmString(String key) { + return getString(key); } @Override http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml index e54780a..e63c6fe 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml @@ -120,11 +120,6 @@ <entry key="100">Ellipse</entry> <entry key="101">Close</entry> <entry key="102">input data error</entry> - <entry key="103">Password and/or login is too short</entry> - <entry key="104">Login is too short</entry> - <entry key="105">The username is already used</entry> - <entry key="106">The mail address is already registered</entry> - <entry key="107">System error please contact the administrator</entry> <entry key="108">Login</entry> <entry key="109">Username or mail address</entry> <entry key="110">Password</entry> @@ -253,7 +248,6 @@ <entry key="233">Wrong email</entry> <entry key="234">You have entered an invalid email address</entry> <entry key="235">Registration complete</entry> - <entry key="236">Your account has been created. You can now login.</entry> <entry key="237">Someone is already sharing their screen</entry> <entry key="238">Sharing forbidden</entry> <entry key="239">Share/record screen</entry> @@ -291,7 +285,6 @@ <entry key="273">Users</entry> <entry key="274">Delete user from usergroup</entry> <entry key="275">D</entry> - <entry key="276">This user is already a member of this usergroup</entry> <entry key="277">News</entry> <entry key="278">Quick links</entry> <entry key="279">Go to conference</entry> @@ -347,20 +340,9 @@ <entry key="331">Password and or username too short, required minimum length for user name / password are:</entry> <entry key="332">Password set. You can now login.</entry> <entry key="333">OK</entry> - <entry key="334">Unknown error. Please report this to the administrator.</entry> - <entry key="335">Username/email and/or password are incorrect.</entry> <entry key="336">Invalid password</entry> <entry key="337">Successfully logged out</entry> - <entry key="338">Registration disabled</entry> - <entry key="339">Invalid email address</entry> - <entry key="340">Duplicate file name, please enter another</entry> - <entry key="341">File name too short</entry> - <entry key="342">Could not save the address</entry> - <entry key="343">User added but you need to assign this user to an usergroup, otherwise they won't be able to log in</entry> <entry key="344">New record</entry> - <entry key="345">No field found for the ID</entry> - <entry key="346">No label found</entry> - <entry key="347">Admin authorization required</entry> <entry key="348">Language editor</entry> <entry key="349">Language</entry> <entry key="350">Label ID</entry> @@ -370,8 +352,6 @@ <entry key="354">Label name</entry> <entry key="355">Label value</entry> <entry key="356">Label ID</entry> - <entry key="357">You have deleted the label</entry> - <entry key="358">Invalid label ID</entry> <entry key="359">You cannot delete this field</entry> <entry key="360">Export</entry> <entry key="361">You need to logout for any changes to update</entry> @@ -381,10 +361,6 @@ <entry key="365">Name</entry> <entry key="366">Add language</entry> <entry key="367">Backup</entry> - <entry key="368">goto first</entry> - <entry key="369">goto previous</entry> - <entry key="370">goto next</entry> - <entry key="371">goto last</entry> <entry key="372">user speaks (By clicking here you can give exclusive audio / mute the microphone of others)</entry> <entry key="373">turn sound on/off</entry> <entry key="374">System</entry> @@ -416,7 +392,6 @@ <entry key="400"></entry> <entry key="401">Users in this room</entry> <entry key="402">Refresh</entry> - <entry key="403">This room is full</entry> <entry key="404">Click on a room to get the room details</entry> <entry key="405">Chat with the users in this room</entry> <entry key="406">Room</entry> @@ -546,12 +521,8 @@ <entry key="530">Valid from</entry> <entry key="531">Valid to</entry> <entry key="532">Invitation to {0}</entry> - <entry key="533">No invitation available for this invitation code</entry> - <entry key="534">This invitation was already used</entry> - <entry key="535">The invitation code is invalid</entry> <entry key="536">Password</entry> <entry key="537">Check password</entry> - <entry key="538">Invalid password</entry> <entry key="539">Audio/video</entry> <entry key="540">Synchronize audio/video</entry> <entry key="541">Login was correct, but the session is not active or stored on the server</entry> @@ -671,18 +642,12 @@ <entry key="660">Add or delete users or rooms within your organisation</entry> <entry key="661">Do you really want to delete this record?</entry> <entry key="662">Do you really want to delete this user from your organisation?</entry> - <entry key="663">You cannot delete your own user</entry> - <entry key="664">This method needs an adminstration account to be invoked</entry> - <entry key="665">There was no session associated with this ID</entry> - <entry key="666">This is an administrator or moderator account. You can only edit this account through the administration panel.</entry> <entry key="667">To complete your registration please click on the following link</entry> <entry key="668">Click to verify your email</entry> <entry key="669">No user was found for this hash</entry> <entry key="670">This user is already activated</entry> <entry key="671">You successfully activated your account</entry> <entry key="672">Login now</entry> - <entry key="673">Your account is not activated. Please use the link in the email you received during registration.</entry> - <entry key="674">You have successfully signed up. An email with a verification code will be sent to your mailbox.</entry> <entry key="675">Remove moderator role from this user</entry> <entry key="676">Grant moderator rights to this user</entry> <entry key="677">User</entry> @@ -794,7 +759,6 @@ <entry key="784">Apply to be moderator</entry> <entry key="785">Apply for whiteboard access</entry> <entry key="786">Apply for audio/video access</entry> - <entry key="787">This session hash has already been used</entry> <entry key="788">START</entry> <entry key="789">EXIT</entry> <entry key="790">Do you really want to exit?</entry> @@ -814,7 +778,6 @@ <entry key="805">Plan a meeting</entry> <entry key="806">To setup a conference you can add a new event in the calendar</entry> <entry key="807">Need help?</entry> - <entry key="808">Restricted</entry> <entry key="809">Search</entry> <entry key="810">Add</entry> <entry key="811">There is no user selected</entry> @@ -923,7 +886,6 @@ <entry key="917">The recording for this interview is already started.</entry> <entry key="918">Cancel</entry> <entry key="919">The post-processing of an interview takes 5 minutes per 1 minute interview. The current progress of the interview post-processing transcoding is:</entry> - <entry key="920">You have to enter your password again to auto create the SIP data</entry> <entry key="921">Re-generate SIP data</entry> <entry key="922">You cannot move this file or folder into its own sub folder.</entry> <entry key="923">Home drive size</entry> @@ -1003,7 +965,6 @@ <entry key="997">Invoice</entry> <entry key="998"></entry> <entry key="999">You need to buy a volume flatrate to be able to send invitations or create meetings via the calendar. With Pay-per-minute it is only possible for you to access {0}. You cannot allow 3th parties to access a meeting.</entry> - <entry key="1000">This email is already used by another user.</entry> <entry key="1001">SIP-Settings</entry> <entry key="1002">The conference number and PIN is automatically created via the OpenXG RPC-Gateway</entry> <entry key="1003">SIP number</entry> @@ -1198,7 +1159,6 @@ <entry key="1192">Hi,</entry> <entry key="1193">would like to add you as contact.</entry> <entry key="1194">Check your contact requests in {0} or click on those links to accept or deny the request</entry> - <entry key="1195">This user is already in your contact list or has received an invitation to your contact list that is not answered yet.</entry> <entry key="1196">Your contact list</entry> <entry key="1197">Edit your contact and messages,<br/> manage your pending contacts.</entry> <entry key="1198">confirmed you as contact.</entry> @@ -1229,12 +1189,8 @@ <entry key="1223">Sent</entry> <entry key="1224">Trash</entry> <entry key="1225">This is you. You cannot add yourself as your own contact.</entry> - <entry key="1226">The user is already denied.</entry> - <entry key="1227">The user is already approved.</entry> - <entry key="1228">This user contact hash is invalid.</entry> <entry key="1229">User added to contact list.</entry> <entry key="1230">User denied as contact and removed from pending contact list.</entry> - <entry key="1231">There is no such contact.</entry> <entry key="1232">Would you really like to remove that contact?</entry> <entry key="1233">Confirm contact removal</entry> <entry key="1234">Delete contact from list</entry> @@ -1274,7 +1230,6 @@ <entry key="1268">The user does not share his personal contact data.</entry> <entry key="1269">The user does share his personal contact data only to contacts.</entry> <entry key="1270">Address & Phone</entry> - <entry key="1271">You invitation code is not valid, the code is only valid during this specific date and time:</entry> <entry key="1272">This event is connected to several calendars of other users. Your change will also update their calendar. Would you really like to update the event?</entry> <entry key="1273">Confirm update</entry> <entry key="1274">Allow contact to see my calendar (view only)</entry> @@ -1309,11 +1264,7 @@ <entry key="1303">Reply</entry> <entry key="1304">Rooms and chats</entry> <entry key="1305">My rooms</entry> - <entry key="1306">My conference room (for 1-16 users)</entry> - <entry key="1307">My webinar room (for 1-120 users)</entry> <entry key="1308">Owner ID</entry> - <entry key="1309">Please enter a password</entry> - <entry key="1310">You need an account with user level user, moderator or admin</entry> <entry key="1311">Webservice (only access via SOAP)</entry> <entry key="1312">Load directly to the Whiteboard</entry> <entry key="1313">Do you really want to remove this whiteboard? This action cannot be undone.</entry> @@ -1419,7 +1370,6 @@ <entry key="1413">active</entry> <entry key="1414">Simple chart</entry> <entry key="1415">Pie chart</entry> - <entry key="1416">Please enter email</entry> <entry key="1417">New message(s)</entry> <entry key="1418">Close poll</entry> <entry key="1419">Are you sure you want to close this poll? No one will be able to vote.</entry> @@ -1434,7 +1384,6 @@ <entry key="1428">Give a permission for exclusive audio.</entry> <entry key="1429">Cam resolution</entry> <entry key="1430">Changing the resolution affects bandwidth, bigger picture needs more bandwith.</entry> - <entry key="1431">You don't have the right to give yourself or others exclusive audio. You need to apply for the right from the moderator or ask the moderator to give you exclusive audio.</entry> <entry key="1432">I would like to get the right for exclusive audio</entry> <entry key="1433">You have the right to give exclusive audio. Click here to make yourself exclusive audio (alternatively click on your video pod or press F12)</entry> <entry key="1434">Microphone is on!</entry> @@ -1542,8 +1491,6 @@ <entry key="1537">Include uploaded files and recordings in backup</entry> <entry key="1538">Enable SIP transport in the room</entry> <entry key="1539">Do you really want to provide this user an exclusive audio?</entry> - <entry key="1540">Please specify your timezone</entry> - <entry key="1544">Configuration with given key already exists, please specify another key or edit existent configuration</entry> <entry key="1545">Content is Saving, Please wait.</entry> <entry key="1546">Welcome</entry> <entry key="1547">Widget displaying basic user info and support links</entry> @@ -1604,6 +1551,26 @@ <entry key="1605">Remove audio of this user</entry> <entry key="1606">I would like to share my audio</entry> <entry key="1607">You are allowed to share your audio</entry> + <entry key="error.unknown">Unknown error. Please report this to the administrator.</entry> + <entry key="error.bad.credentials">Username/email and/or password are incorrect.</entry> + <entry key="error.short.login">Login is too short</entry> + <entry key="error.reg.disabled">Registration disabled</entry> + <entry key="error.login.inuse">The username is already used</entry> + <entry key="error.email.inuse">The mail address is already registered</entry> + <entry key="error.notallowed">Admin authorization required</entry> + <entry key="error.hash.used">This invitation was already used</entry> + <entry key="error.hash.invalid">The invitation code is invalid</entry> + <entry key="error.hash.period">You invitation code is not valid, the code is only valid during this specific date and time:</entry> + <entry key="error.bad.password">Invalid password</entry> + <entry key="error.nogroup">User is not assigned to group.</entry> + <entry key="error.notactivated">Your account is not activated. Please use the link in the email you received during registration.</entry> + <entry key="error.contact.added">This user is already in your contact list or has received an invitation to your contact list that is not answered yet.</entry> + <entry key="error.contact.denied">The user is already denied.</entry> + <entry key="error.contact.approved">The user is already approved.</entry> + <entry key="error.cfg.exist">Configuration with given key already exists, please specify another key or edit existent configuration</entry> + <entry key="warn.nogroup">User added but you need to assign this user to an usergroup, otherwise they won't be able to log in</entry> + <entry key="warn.notverified">You have successfully signed up. An email with a verification code will be sent to your mailbox.</entry> + <entry key="account.created">Your account has been created. You can now login.</entry> <entry key="install.wizard.install.header">Installation</entry> <entry key="install.wizard.welcome.panel"><