You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2006/11/26 09:46:32 UTC

svn commit: r479310 - in /lenya/trunk/src: modules-core/ac-impl/usecases/ webapp/lenya/resources/i18n/

Author: andreas
Date: Sun Nov 26 00:46:31 2006
New Revision: 479310

URL: http://svn.apache.org/viewvc?view=rev&rev=479310
Log:
Update login screen of blog publication (no user alice)

Modified:
    lenya/trunk/src/modules-core/ac-impl/usecases/login.jx
    lenya/trunk/src/webapp/lenya/resources/i18n/cmsui.xml
    lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_de.xml
    lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_es.xml
    lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_fr.xml
    lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_it.xml
    lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_ja.xml
    lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_nl.xml
    lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_pt.xml
    lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_ru.xml

Modified: lenya/trunk/src/modules-core/ac-impl/usecases/login.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/ac-impl/usecases/login.jx?view=diff&rev=479310&r1=479309&r2=479310
==============================================================================
--- lenya/trunk/src/modules-core/ac-impl/usecases/login.jx (original)
+++ lenya/trunk/src/modules-core/ac-impl/usecases/login.jx Sun Nov 26 00:46:31 2006
@@ -57,18 +57,30 @@
       </div>
     </jx:if>
     
-    <jx:if test="${pubId.equals('default') || pubId.equals('blog')}">
-      <p>
-        <strong> <i18n:text>NOTE</i18n:text>: </strong>
-        <i18n:translate>
-          <i18n:text i18n:key="try-user-lenya" />
-          <i18n:param>"lenya"</i18n:param>
-          <i18n:param>"levi"</i18n:param>
-          <i18n:param>"alice"</i18n:param>
-          <i18n:param>"levi"</i18n:param>
-        </i18n:translate>
-      </p>
-    </jx:if>
+    <jx:choose>
+      <jx:when test="${pubId.equals('default')}">
+        <p>
+          <strong> <i18n:text>NOTE</i18n:text>: </strong>
+          <i18n:translate>
+            <i18n:text i18n:key="try-user-lenya-alice" />
+            <i18n:param>"lenya"</i18n:param>
+            <i18n:param>"levi"</i18n:param>
+            <i18n:param>"alice"</i18n:param>
+            <i18n:param>"levi"</i18n:param>
+          </i18n:translate>
+        </p>
+      </jx:when>
+      <jx:when test="${pubId.equals('blog')}">
+        <p>
+          <strong> <i18n:text>NOTE</i18n:text>: </strong>
+          <i18n:translate>
+            <i18n:text i18n:key="try-user-lenya" />
+            <i18n:param>"lenya"</i18n:param>
+            <i18n:param>"levi"</i18n:param>
+          </i18n:translate>
+        </p>
+      </jx:when>
+    </jx:choose>
     
     <div class="lenya-box">
       <div class="lenya-box-title">

Modified: lenya/trunk/src/webapp/lenya/resources/i18n/cmsui.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/src/webapp/lenya/resources/i18n/cmsui.xml?view=diff&rev=479310&r1=479309&r2=479310
==============================================================================
--- lenya/trunk/src/webapp/lenya/resources/i18n/cmsui.xml (original)
+++ lenya/trunk/src/webapp/lenya/resources/i18n/cmsui.xml Sun Nov 26 00:46:31 2006
@@ -106,7 +106,8 @@
   <message key="Password">Password</message>
   <message key="Username">Username</message>
   <message key="Authentication failed">Authentication failed</message>
-  <message key="try-user-lenya">Try user {0} and password {1} (editor), or user {2} and password {3} (reviewer)</message>
+  <message key="try-user-lenya-alice">Try user {0} and password {1} (editor), or user {2} and password {3} (reviewer)</message>
+  <message key="try-user-lenya">Try user {0} and password {1}</message>
   <message key="Access Denied">Access Denied</message>
   <message key="user-not-authorized">The user '{0}' is not authorized to access the page '{1}'.</message>
   <message key="have-another-account">If you have another user account with the corresponding privileges, please provide user name and password below.</message>

Modified: lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_de.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_de.xml?view=diff&rev=479310&r1=479309&r2=479310
==============================================================================
--- lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_de.xml (original)
+++ lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_de.xml Sun Nov 26 00:46:31 2006
@@ -108,7 +108,8 @@
   <message key="Password">Passwort</message>    
   <message key="Username">Benutzername</message>                
   <message key="Authentication failed">Anmeldung ist fehlgeschlagen</message>  
-  <message key="try-user-lenya">Versuchen Sie Benutzername {0} und Passwort {1} (Bearbeiter), oder Benutzername {2} und Passwort {3} (Prüfer)</message>
+  <message key="try-user-lenya-alice">Versuchen Sie Benutzername {0} und Passwort {1} (Bearbeiter), oder Benutzername {2} und Passwort {3} (Prüfer)</message>
+  <message key="try-user-lenya">Versuchen Sie Benutzername {0} und Passwort {1}</message>
   <message key="Access Denied">Zugriff verweigert</message>
   <message key="user-not-authorized">Der Benutzer '{0}' ist nicht berechtigt, auf die Seite '{1}' zuzugreifen.</message>
   <message key="have-another-account">Wenn Sie ein weiteres Benutzerkonto mit den entsprechenden Berechtigungen haben, geben Sie bitte Benutzernamen und Passwort unten ein.</message>

Modified: lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_es.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_es.xml?view=diff&rev=479310&r1=479309&r2=479310
==============================================================================
--- lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_es.xml (original)
+++ lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_es.xml Sun Nov 26 00:46:31 2006
@@ -113,8 +113,9 @@
   <message key="Password">Contraseña</message>
   <message key="Username">Nombre&#160;de&#160;usuario</message>
   <message key="Authentication failed">Error&#160;en&#160;la&#160;autentificación</message>
-  <message key="try-user-lenya">Pruebe con usuario {0} y contraseña {1} (editor) o usuario {2} y contraseña {3} (revisor)</message>
-
+  <message key="try-user-lenya-alice">Pruebe con usuario {0} y contraseña {1} (editor) o usuario {2} y contraseña {3} (revisor)</message>
+  <message key="try-user-lenya">Pruebe con usuario {0} y contraseña {1}</message>
+  
   <!-- logout screen -->
   <message key="logout-from-pub">Salir&#160;de&#160;la&#160;Publicación&#160;{0}</message>
   <message key="Your History">Su&#160;Historial</message>

Modified: lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_fr.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_fr.xml?view=diff&rev=479310&r1=479309&r2=479310
==============================================================================
--- lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_fr.xml (original)
+++ lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_fr.xml Sun Nov 26 00:46:31 2006
@@ -105,8 +105,9 @@
   <message key="Password">Mot de passe</message>
   <message key="Username">Utilisateur</message>
   <message key="Authentication failed">L'authentification a échoué</message>
-  <message key="try-user-lenya">Essayez l'utilisateur {0} et le mot de passe {1} (éditeur) ou l'utilisateur {2} et le mot de passe {3} (réviseur)</message>
-
+  <message key="try-user-lenya">Essayez l'utilisateur {0} et le mot de passe {1}</message>
+  <message key="try-user-lenya-alice">Essayez l'utilisateur {0} et le mot de passe {1} (éditeur) ou l'utilisateur {2} et le mot de passe {3} (réviseur)</message>
+  
   <!-- logout screen -->
   <message key="logout-from-pub">DECONNEXION de la publication {0}</message>
   <message key="Your History">Votre historique</message>

Modified: lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_it.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_it.xml?view=diff&rev=479310&r1=479309&r2=479310
==============================================================================
--- lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_it.xml (original)
+++ lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_it.xml Sun Nov 26 00:46:31 2006
@@ -93,8 +93,9 @@
 	<message key="Password">Password</message>
 	<message key="Username">Nome utente</message>
 	<message key="Authentication failed">Autenticazione fallita</message>
-	<message key="try-user-lenya">Prova utente {0} e password {1} (editore) o utente {2} e password {3} (revisore)</message>
-	<!-- logout screen -->
+	<message key="try-user-lenya-alice">Prova utente {0} e password {1} (editore) o utente {2} e password {3} (revisore)</message>
+  <message key="try-user-lenya">Prova utente {0} e password {1}</message>
+  <!-- logout screen -->
 	<message key="logout-from-pub">LOGOUT dalla Pubblicazione {0}</message>
 	<message key="Your History">Le tue modifiche</message>
 	<message key="Login to Authoring Area">Login nell'area Authoring</message>

Modified: lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_ja.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_ja.xml?view=diff&rev=479310&r1=479309&r2=479310
==============================================================================
--- lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_ja.xml (original)
+++ lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_ja.xml Sun Nov 26 00:46:31 2006
@@ -100,8 +100,8 @@
   <message key="Password">パスワード</message>
   <message key="Username">ユーザ名</message>
   <message key="Authentication failed">認証失敗</message>
-  <message key="try-user-lenya">ユーザ {0} のパスワード {1} （編集者）、あるいは、ユーザ {2} のパスワード {3} （レビュアー）を使ってください</message>
-
+  <message key="try-user-lenya-alice">ユーザ {0} のパスワード {1} （編集者）、あるいは、ユーザ {2} のパスワード {3} （レビュアー）を使ってください</message>
+  
   <!-- logout screen -->
   <message key="logout-from-pub">{0} パブリケーションからのログアウト</message>
   <message key="Your History">履歴</message>

Modified: lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_nl.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_nl.xml?view=diff&rev=479310&r1=479309&r2=479310
==============================================================================
--- lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_nl.xml (original)
+++ lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_nl.xml Sun Nov 26 00:46:31 2006
@@ -113,8 +113,9 @@
   <message key="Username">Gebruikersnaam</message>
 
   <message key="Authentication failed">Authenticatie mislukt</message>
-  <message key="try-user-lenya">Probeer gebruiker {0} met wachtwoord {1} (auteur), of gebruiker {2} en wachtwoord {3} (reviewer)</message>
-
+  <message key="try-user-lenya-alice">Probeer gebruiker {0} met wachtwoord {1} (auteur), of gebruiker {2} en wachtwoord {3} (reviewer)</message>
+  <message key="try-user-lenya">Probeer gebruiker {0} met wachtwoord {1}</message>
+  
   <!-- logout screen -->
   <message key="logout-from-pub">Afmelden voor de {0} Publicatie</message>
   <message key="Your History">Uw historie</message>

Modified: lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_pt.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_pt.xml?view=diff&rev=479310&r1=479309&r2=479310
==============================================================================
--- lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_pt.xml (original)
+++ lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_pt.xml Sun Nov 26 00:46:31 2006
@@ -103,8 +103,9 @@
   <message key="Password">Password</message>
   <message key="Username">Nome do utilizador</message>
   <message key="Authentication failed">Erro na autenticação</message>
-  <message key="try-user-lenya">Tente com utilizador {0} e password {1} (editor) ou utilizador {2} e password {3} (revisor)</message>
-
+  <message key="try-user-lenya-alice">Tente com utilizador {0} e password {1} (editor) ou utilizador {2} e password {3} (revisor)</message>
+  <message key="try-user-lenya">Tente com utilizador {0} e password {1}</message>
+  
   <!-- logout screen -->
   <message key="logout-from-pub">Sair da publicação {0}</message>
   <message key="Your History">O seu historial</message>

Modified: lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_ru.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_ru.xml?view=diff&rev=479310&r1=479309&r2=479310
==============================================================================
--- lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_ru.xml (original)
+++ lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_ru.xml Sun Nov 26 00:46:31 2006
@@ -109,7 +109,8 @@
 <message key="Password">Пароль</message>
 <message key="Username">Имя пользователя</message>
 <message key="Authentication failed">Авторизация провалилась</message>
-<message key="try-user-lenya">Попробуйте логин {0} и пароль {1} (редактор), или логин {2} и пароль {3} (обозреватель)</message>
+<message key="try-user-lenya-alice">Попробуйте логин {0} и пароль {1} (редактор), или логин {2} и пароль {3} (обозреватель)</message>
+<message key="try-user-lenya">Попробуйте логин {0} и пароль {1}</message>
 <!-- logout screen -->
 <message key="logout-from-pub">Выйти из {0} Публикации</message>
 <message key="Your History">Ваша история</message>



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org