You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2013/09/29 16:10:44 UTC

svn commit: r1527326 - in /openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web: app/ pages/install/ user/

Author: solomax
Date: Sun Sep 29 14:10:43 2013
New Revision: 1527326

URL: http://svn.apache.org/r1527326
Log:
[OPENMEETINGS-663] installer localizations are moving to properties.xml files

Removed:
    openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep1_de.html
    openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep1_es.html
    openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep1_fr.html
    openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep1_hu.html
    openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep1_pt_BR.html
    openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep1_ru.html
    openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$WelcomeStep_ru.html
Modified:
    openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
    openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
    openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
    openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml
    openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml
    openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml
    openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml
    openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep1.html
    openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/ChatPanel.java

Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml?rev=1527326&r1=1527325&r2=1527326&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml Sun Sep 29 14:10:43 2013
@@ -155,4 +155,15 @@
 		target="_blank">Mailing lists</a></span>
 	<br />
 	]]></entry>
+	<entry key="install.wizard.params.step1.userdata">Userdata</entry>
+	<entry key="install.wizard.params.step1.username">Username</entry>
+	<entry key="install.wizard.params.step1.username.title">Enter a username</entry>
+	<entry key="install.wizard.params.step1.password">Userpass</entry>
+	<entry key="install.wizard.params.step1.password.title">Enter a password</entry>
+	<entry key="install.wizard.params.step1.email">EMail</entry>
+	<entry key="install.wizard.params.step1.email.title">Enter a EMail</entry>
+	<entry key="install.wizard.params.step1.tz">User Time Zone</entry>
+	<entry key="install.wizard.params.step1.groupdata">Organisation(Domains)</entry>
+	<entry key="install.wizard.params.step1.group">Name</entry>
+	<entry key="install.wizard.params.step1.group.title">Enter a default Organisation</entry>
 </properties>
\ No newline at end of file

Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml?rev=1527326&r1=1527325&r2=1527326&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml Sun Sep 29 14:10:43 2013
@@ -149,4 +149,15 @@
         target="_blank">http://openmeetings.apache.org/commercial-support.html</a></span>
     <br />
 	]]></entry>
+	<entry key="install.wizard.params.step1.userdata">Nutzerdaten</entry>
+	<entry key="install.wizard.params.step1.username">Nutzername</entry>
+	<entry key="install.wizard.params.step1.username.title">Geben Sie einen Nutzernamen ein</entry>
+	<entry key="install.wizard.params.step1.password">Nutzerpasswort</entry>
+	<entry key="install.wizard.params.step1.password.title">Geben Sie ein Passwort ein</entry>
+	<entry key="install.wizard.params.step1.email">E-Mail</entry>
+	<entry key="install.wizard.params.step1.email.title">Geben Sie eine E-Mail-Adresse ein</entry>
+	<entry key="install.wizard.params.step1.tz">Zeitzone</entry>
+	<entry key="install.wizard.params.step1.groupdata">Organisation(Domains)</entry>
+	<entry key="install.wizard.params.step1.group">Name</entry>
+	<entry key="install.wizard.params.step1.group.title">Geben Sie den Namen Ihrer Organisation ein</entry>
 </properties>
\ No newline at end of file

Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml?rev=1527326&r1=1527325&r2=1527326&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml Sun Sep 29 14:10:43 2013
@@ -145,4 +145,15 @@
         target="_blank">http://openmeetings.apache.org/commercial-support.html</a></span>
     <br />
     ]]></entry>
+	<entry key="install.wizard.params.step1.userdata">Datos del usuario</entry>
+	<entry key="install.wizard.params.step1.username">Nombre de usuario</entry>
+	<entry key="install.wizard.params.step1.username.title">Enter a username</entry>
+	<entry key="install.wizard.params.step1.password">Contraseña</entry>
+	<entry key="install.wizard.params.step1.password.title">Enter a password</entry>
+	<entry key="install.wizard.params.step1.email">Dirección de correo</entry>
+	<entry key="install.wizard.params.step1.email.title">Enter a EMail</entry>
+	<entry key="install.wizard.params.step1.tz">Time Zone del Usuario</entry>
+	<entry key="install.wizard.params.step1.groupdata">Organización (Dominios)</entry>
+	<entry key="install.wizard.params.step1.group">Nombre</entry>
+	<entry key="install.wizard.params.step1.group.title">Enter a default Organisation</entry>
 </properties>
\ No newline at end of file

Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml?rev=1527326&r1=1527325&r2=1527326&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml Sun Sep 29 14:10:43 2013
@@ -130,4 +130,15 @@
 		target="_blank">Listes de diffusion</a></span>
 	<br />
 	]]></entry>
+	<entry key="install.wizard.params.step1.userdata">Données utilisateur</entry>
+	<entry key="install.wizard.params.step1.username">Nom d'utilisateur</entry>
+	<entry key="install.wizard.params.step1.username.title">Entrez un nom d'utilisateur</entry>
+	<entry key="install.wizard.params.step1.password">Mot de passe</entry>
+	<entry key="install.wizard.params.step1.password.title">Entrez un mot de passe</entry>
+	<entry key="install.wizard.params.step1.email">E-Mail</entry>
+	<entry key="install.wizard.params.step1.email.title">Entrez une adresse E-Mail</entry>
+	<entry key="install.wizard.params.step1.tz">Fuseau horaire</entry>
+	<entry key="install.wizard.params.step1.groupdata">Organisation(Domaines)</entry>
+	<entry key="install.wizard.params.step1.group">Nom</entry>
+	<entry key="install.wizard.params.step1.group.title">Entrez le nom de votre organisation</entry>
 </properties>
\ No newline at end of file

Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml?rev=1527326&r1=1527325&r2=1527326&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml Sun Sep 29 14:10:43 2013
@@ -135,4 +135,15 @@
 		target="_blank">http://openmeetings.apache.org/commercial-support.html</a></span>
 	<br />
 	]]></entry>
+	<entry key="install.wizard.params.step1.userdata">Felhasználói adatok</entry>
+	<entry key="install.wizard.params.step1.username">Felhasználónév</entry>
+	<entry key="install.wizard.params.step1.username.title">Adja meg a felhasználói nevét</entry>
+	<entry key="install.wizard.params.step1.password">Jelszó</entry>
+	<entry key="install.wizard.params.step1.password.title">Adja meg a jelszavát</entry>
+	<entry key="install.wizard.params.step1.email">EMail</entry>
+	<entry key="install.wizard.params.step1.email.title">Adja meg az e-mail címét</entry>
+	<entry key="install.wizard.params.step1.tz">Időzóna kiválasztása</entry>
+	<entry key="install.wizard.params.step1.groupdata">Szervezeti egység (Domain)</entry>
+	<entry key="install.wizard.params.step1.group">Név (domain)</entry>
+	<entry key="install.wizard.params.step1.group.title">Adja meg a nevet (domain)</entry>
 </properties>
\ No newline at end of file

Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml?rev=1527326&r1=1527325&r2=1527326&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml Sun Sep 29 14:10:43 2013
@@ -147,4 +147,15 @@
         target="_blank">http://openmeetings.apache.org/commercial-support.html</a></span>
     <br />
 	]]></entry>
+	<entry key="install.wizard.params.step1.userdata"><![CDATA[Dados do usu&aacute;rio]]></entry>
+	<entry key="install.wizard.params.step1.username"><![CDATA[Usu&aacute;rio]]></entry>
+	<entry key="install.wizard.params.step1.username.title"><![CDATA[Digite um usu&aacute;rio]]></entry>
+	<entry key="install.wizard.params.step1.password">Senha</entry>
+	<entry key="install.wizard.params.step1.password.title">Digite uma senha</entry>
+	<entry key="install.wizard.params.step1.email">E-Mail</entry>
+	<entry key="install.wizard.params.step1.email.title">Digite um e-mail</entry>
+	<entry key="install.wizard.params.step1.tz">Time Zone</entry>
+	<entry key="install.wizard.params.step1.groupdata"><![CDATA[Organização (Dom&iacute;nios)]]></entry>
+	<entry key="install.wizard.params.step1.group">Nome</entry>
+	<entry key="install.wizard.params.step1.group.title"><![CDATA[Digite a Organiza&ccedil;&atilde;o padr&atilde;o]]></entry>
 </properties>
\ No newline at end of file

Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml?rev=1527326&r1=1527325&r2=1527326&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml Sun Sep 29 14:10:43 2013
@@ -151,4 +151,15 @@
 		target="_blank">http://openmeetings.apache.org/commercial-support.html</a></span>
 	<br />
 	]]></entry>
+	<entry key="install.wizard.params.step1.userdata">Пользовательские данные</entry>
+	<entry key="install.wizard.params.step1.username">Логин</entry>
+	<entry key="install.wizard.params.step1.username.title">Введите логин пользователя</entry>
+	<entry key="install.wizard.params.step1.password">Пароль</entry>
+	<entry key="install.wizard.params.step1.password.title">Введите пароль</entry>
+	<entry key="install.wizard.params.step1.email">Электронная почта</entry>
+	<entry key="install.wizard.params.step1.email.title">Введите адрес электронной почты</entry>
+	<entry key="install.wizard.params.step1.tz">Часовой пояс пользователя</entry>
+	<entry key="install.wizard.params.step1.groupdata">Организация(Домен)</entry>
+	<entry key="install.wizard.params.step1.group">Наименование</entry>
+	<entry key="install.wizard.params.step1.group.title">Введите организацию по умолчанию</entry>
 </properties>
\ No newline at end of file

Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep1.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard%24ParamsStep1.html?rev=1527326&r1=1527325&r2=1527326&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep1.html (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep1.html Sun Sep 29 14:10:43 2013
@@ -21,30 +21,28 @@
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:panel>
 	<fieldset id="userData">
-
-		<legend>Userdata</legend>
+		<legend><wicket:message key="install.wizard.params.step1.userdata"/></legend>
 		<ul>
-			<li><label wicket:for="cfg.username">Username</label>
-				<input wicket:id="cfg.username" title="Enter a username" type="text" />
+			<li><label wicket:for="cfg.username"><wicket:message key="install.wizard.params.step1.username"/></label>
+				<input wicket:id="cfg.username" wicket:message="title:install.wizard.params.step1.username.title" type="text" />
 			</li>
-			<li><label wicket:for="cfg.password">Userpass</label>
-				<input wicket:id="cfg.password" title="Enter a password" type="password" />
+			<li><label wicket:for="cfg.password"><wicket:message key="install.wizard.params.step1.password"/></label>
+				<input wicket:id="cfg.password" wicket:message="title:install.wizard.params.step1.password.title" type="password" />
 			</li>
-			<li><label wicket:for="cfg.email">EMail</label>
-				<input wicket:id="cfg.email" title="Enter a EMail" type="text" />
+			<li><label wicket:for="cfg.email"><wicket:message key="install.wizard.params.step1.email"/></label>
+				<input wicket:id="cfg.email" wicket:message="title:install.wizard.params.step1.email.title" type="text" />
 			</li>
-			<li><label wicket:for="ical_timeZone">User Time Zone</label>
+			<li><label wicket:for="ical_timeZone"><wicket:message key="install.wizard.params.step1.tz"/></label>
 				<select wicket:id="ical_timeZone"></select>
 			</li>
 		</ul>
 	</fieldset>
 
 	<fieldset id="userOrga">
-
-		<legend>Organisation(Domains)</legend>
+		<legend><wicket:message key="install.wizard.params.step1.groupdata"/></legend>
 		<ul>
-			<li><label wicket:for="cfg.group">Name</label>
-				<input wicket:id="cfg.group" title="Enter a default Organisation" type="text" /></li>
+			<li><label wicket:for="cfg.group"><wicket:message key="install.wizard.params.step1.group"/></label>
+				<input wicket:id="cfg.group" wicket:message="title:install.wizard.params.step1.group.title" type="text" /></li>
 		</ul>
 	</fieldset>
 </wicket:panel>

Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/ChatPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/ChatPanel.java?rev=1527326&r1=1527325&r2=1527326&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/ChatPanel.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/ChatPanel.java Sun Sep 29 14:10:43 2013
@@ -71,7 +71,6 @@ public class ChatPanel extends UserPanel
 		setOutputMarkupId(true);
 		setMarkupId(id);
 
-		//TODO script should be moved from the html to parameterized file!
 		add(new Behavior() {
 			private static final long serialVersionUID = -2205036360048419129L;