You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by mr...@apache.org on 2009/02/20 23:53:34 UTC

svn commit: r746406 [2/2] - in /ofbiz/trunk: applications/accounting/config/ applications/accounting/widget/ applications/content/config/ applications/content/webapp/content/cms/ applications/content/webapp/content/datasetup/ applications/content/webap...

Modified: ofbiz/trunk/specialpurpose/shark/config/SharkUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/shark/config/SharkUiLabels.xml?rev=746406&r1=746405&r2=746406&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/shark/config/SharkUiLabels.xml (original)
+++ ofbiz/trunk/specialpurpose/shark/config/SharkUiLabels.xml Fri Feb 20 22:53:32 2009
@@ -67,4 +67,20 @@
         <value xml:lang="ro">Pagina Principala</value>
         <value xml:lang="th">หน้าหลักของการจัดการ Shark</value>
     </property>
+    <property key="SharkProcessDetailList">
+        <value xml:lang="en">Process Detail List</value>
+        <value xml:lang="it">Lista dettagli processi</value>
+    </property>
+    <property key="SharkProcessHistory">
+        <value xml:lang="en">Process History</value>
+        <value xml:lang="it">Lista processi</value>
+    </property>
+    <property key="SharkProcessSteps">
+        <value xml:lang="en">Process Steps</value>
+        <value xml:lang="it">Passi processi</value>
+    </property>
+    <property key="SharkWorkList">
+        <value xml:lang="en">Work List</value>
+        <value xml:lang="it">Lista lavoro</value>
+    </property>
 </resource>

Modified: ofbiz/trunk/specialpurpose/shark/widget/ProcessScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/shark/widget/ProcessScreens.xml?rev=746406&r1=746405&r2=746406&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/shark/widget/ProcessScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/shark/widget/ProcessScreens.xml Fri Feb 20 22:53:32 2009
@@ -41,7 +41,7 @@
         <section>
             <actions>
                 <set field="headerItem" value="main"/>
-                <set field="titleProperty" value="Process Detail List"/>
+                <set field="titleProperty" value="SharkProcessDetailList"/>
                 
                 <script location="component://shark/webapp/shark/WEB-INF/actions/process/processDetailList.bsh"/>
             </actions>
@@ -58,7 +58,7 @@
         <section>
             <actions>
                 <set field="headerItem" value="main"/>
-                <set field="titleProperty" value="Process History"/>
+                <set field="titleProperty" value="SharkProcessHistory"/>
                 
                 <script location="component://shark/webapp/shark/WEB-INF/actions/process/processHistory.bsh"/>
             </actions>
@@ -75,7 +75,7 @@
         <section>
             <actions>
                 <set field="headerItem" value="main"/>
-                <set field="titleProperty" value="Process Steps"/>
+                <set field="titleProperty" value="SharkProcessSteps"/>
                 
                 <script location="component://shark/webapp/shark/WEB-INF/actions/process/processSteps.bsh"/>
             </actions>

Modified: ofbiz/trunk/specialpurpose/shark/widget/TaskListScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/shark/widget/TaskListScreens.xml?rev=746406&r1=746405&r2=746406&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/shark/widget/TaskListScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/shark/widget/TaskListScreens.xml Fri Feb 20 22:53:32 2009
@@ -24,7 +24,7 @@
         <section>
             <actions>
                 <set field="headerItem" value="main"/>
-                <set field="titleProperty" value="Work List"/>
+                <set field="titleProperty" value="SharkWorkList"/>
 
                 <script location="component://shark/webapp/shark/WEB-INF/actions/tasklist/worklist.bsh"/>
             </actions>

Modified: ofbiz/trunk/specialpurpose/webpos/config/WebPosUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/config/WebPosUiLabels.xml?rev=746406&r1=746405&r2=746406&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/webpos/config/WebPosUiLabels.xml (original)
+++ ofbiz/trunk/specialpurpose/webpos/config/WebPosUiLabels.xml Fri Feb 20 22:53:32 2009
@@ -560,9 +560,17 @@
         <value xml:lang="fr">Montant dû</value>
         <value xml:lang="it">Totale Dovuto</value>
     </property>
+    <property key="WebPosUnableToLogIn">
+        <value xml:lang="en">Unable To Log In</value>
+        <value xml:lang="it">Non è stato possibile autenticarsi</value>
+    </property>
     <property key="WebPosUnitPrice">
         <value xml:lang="en">Unit Price</value>
         <value xml:lang="fr">Prix unitaire</value>
         <value xml:lang="it">Prezzo unitario</value>
     </property>
+    <property key="WebPosUserLoginNotValid">
+        <value xml:lang="en">User Login Not Valid</value>
+        <value xml:lang="it">Utente non valido</value>
+    </property>
 </resource>

Modified: ofbiz/trunk/specialpurpose/webpos/src/org/ofbiz/webpos/session/WebPosSession.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/src/org/ofbiz/webpos/session/WebPosSession.java?rev=746406&r1=746405&r2=746406&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/webpos/src/org/ofbiz/webpos/session/WebPosSession.java (original)
+++ ofbiz/trunk/specialpurpose/webpos/src/org/ofbiz/webpos/session/WebPosSession.java Fri Feb 20 22:53:32 2009
@@ -176,7 +176,7 @@
     public GenericValue checkLogin(String username, String password, LocalDispatcher dispatcher) throws UserLoginFailure {
         // check the required parameters and objects
         if (UtilValidate.isEmpty(dispatcher)) {
-            throw new UserLoginFailure(UtilProperties.getMessage("WebPosUiLabels", "UnableToLogIn", getLocale()));
+            throw new UserLoginFailure(UtilProperties.getMessage("WebPosUiLabels", "WebPosUnableToLogIn", getLocale()));
         }
         if (UtilValidate.isEmpty(username)) {
             throw new UserLoginFailure(UtilProperties.getMessage("PartyUiLabels", "PartyUserNameMissing", getLocale()));
@@ -202,7 +202,7 @@
         } else {
             GenericValue ul = (GenericValue) result.get("userLogin");
             if (ul == null) {
-                throw new UserLoginFailure(UtilProperties.getMessage("WebPosUiLabels", "UserLoginNotValid", getLocale()));
+                throw new UserLoginFailure(UtilProperties.getMessage("WebPosUiLabels", "WebPosUserLoginNotValid", getLocale()));
             }
             return ul;
         }