Re: svn commit: r1039651 [38/38] - in /ofbiz/branches/jquery: ./ applications/accounting/config/ applications/accounting/src/org/ofbiz/accounting/thirdparty/authorizedotnet/ applications/commonext/config/ applications/content/config/ applications/con

Sat, 27 Nov 2010 03:46:25 -0800 

There are some <value> tags outside of the <property> tags in this commit.
For instance this below:


@@ -59,16 +65,22 @@
        <value xml:lang="it">Cognome mancante</value>
        <value xml:lang="th">ภรุณาภรอภนามสà¸
ุลของท่าน</
value>
        <value xml:lang="zh">ç¼ºå°‘ä½ çš„å§“</value>
+        <value xml:lang="zh_TW">ç¼ºå°‘å§“æ° (Lastname)</value>
    </property>
    <property key="MyPortalMyOrders">
        <value xml:lang="en">My Orders</value>
+        <value xml:lang="zh_TW">我的訂單</value>
    </property>
+        <value xml:lang="zh_TW">我的任務</value>
+        <value xml:lang="zh_TW">我的時間</value>
+        <value xml:lang="zh_TW">æ–°çš„è¨Šæ ¯</value>
    <property key="MyPortalNewRegistration">
        <value xml:lang="en">New Registration </value>
        <value xml:lang="fr">Nouvel enregistrement</value>
        <value xml:lang="it">Nuovo utente</value>
        <value xml:lang="th">ลงทะเบียน </value>
        <value xml:lang="zh">新注册</value>
+        <value xml:lang="zh_TW">新的註冊</value>
    </property>
    <property key="MyPortalPicCaptcha">
        <value xml:lang="en">Code Captcha</value>


2010/11/27 <[email protected]>

> Modified:
> ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/customer/messagelist.ftl
> URL:
> http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/customer/messagelist.ftl?rev=1039651&r1=1039650&r2=1039651&view=diff
>
> ==============================================================================
> ---
> ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/customer/messagelist.ftl
> (original)
> +++
> ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/customer/messagelist.ftl
> Sat Nov 27 10:59:21 2010
> @@ -17,7 +17,7 @@ specific language governing permissions
>  under the License.
>  -->
>
> -<#macro showMessage communicationEvent isSentMessage>
> +<#macro showMessage communicationEvent isSentMessage index>
>   <#if communicationEvent.partyIdFrom?has_content>
>     <#assign partyNameFrom =
> Static["org.ofbiz.party.party.PartyHelper"].getPartyName(delegator,
> communicationEvent.partyIdFrom, true)>
>   <#else/>
> @@ -34,12 +34,16 @@ under the License.
>                 <td><div
> class="tabletext">${communicationEvent.subject?default("")}</div></td>
>                 <td><div
> class="tabletext">${communicationEvent.entryDate}</div></td>
>                 <td align="right">
> -                  <form method="post"
> action="<@ofbizUrl>readmessage</@ofbizUrl>" name="ecomm_read_mess">
> +                  <form method="post"
> action="<@ofbizUrl>readmessage</@ofbizUrl>" name="ecomm_read_mess${index}">
>                     <input name="communicationEventId"
> value="${communicationEvent.communicationEventId}" type="hidden"/>
>                   </form>
> -                  <a
> href="javascript:document.ecomm_read_mess.submit()">${uiLabelMap.EcommerceRead}</a>
> +                  <a
> href="javascript:document.ecomm_read_mess${index}.submit()">${uiLabelMap.EcommerceRead}</a>
> +
>                   <#if isSentMessage>
> -                    <a
> href="<@ofbizUrl>newmessage?communicationEventId=${communicationEvent.communicationEventId}</@ofbizUrl>"
> class="buttontext">${uiLabelMap.PartyReply}</a>
> +                  <form method="post"
> action="<@ofbizUrl>newmessage</@ofbizUrl>" name="ecomm_sent_mess${index}">
> +                    <input name="communicationEventId"
> value="${communicationEvent.communicationEventId}" type="hidden"/>
> +                  </form>
> +                  <a
> href="javascript:document.ecomm_sent_mess${index}.submit()">${uiLabelMap.PartyReply}</a>
>                   </#if>
>                 </td>
>               </tr>
> @@ -70,10 +74,10 @@ under the License.
>             </tr>
>             <tr><td colspan="5"><hr /></td></tr>
>             <#list receivedCommunicationEvents?if_exists as
> receivedCommunicationEvent>
> -              <@showMessage communicationEvent=receivedCommunicationEvent
> isSentMessage=false/>
> +              <@showMessage communicationEvent=receivedCommunicationEvent
> isSentMessage=false index=receivedCommunicationEvent_index/>
>             </#list>
>             <#list sentCommunicationEvents?if_exists as
> sentCommunicationEvent>
> -              <@showMessage communicationEvent=sentCommunicationEvent
> isSentMessage=true/>
> +              <@showMessage communicationEvent=sentCommunicationEvent
> isSentMessage=true index=sentCommunicationEvent_index/>
>             </#list>
>           </#if>
>         </table>
>
> Propchange:
> ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy
>
> ------------------------------------------------------------------------------
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Sat Nov 27 10:59:21 2010
> @@ -1,3 +1,3 @@
>
>  
> /incubator/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:418499-490456
>
>  
> /ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:921280-927264
>
> -/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:951708-1036339
>
> +/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:951708-1039648
>
> Propchange:
> ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy
>
> ------------------------------------------------------------------------------
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Sat Nov 27 10:59:21 2010
> @@ -1,3 +1,3 @@
>
>  
> /incubator/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:418499-490456
>
>  
> /ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:921280-927264
>
> -/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:951708-1036339
>
> +/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:951708-1039648
>
> Propchange:
> ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy
>
> ------------------------------------------------------------------------------
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Sat Nov 27 10:59:21 2010
> @@ -1,3 +1,3 @@
>
>  
> /incubator/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:418499-490456
>
>  
> /ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:921280-927264
>
> -/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:951708-1036339
>
> +/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:951708-1039648
>
> Modified:
> ofbiz/branches/jquery/specialpurpose/myportal/config/MyPortalUiLabels.xml
> URL:
> http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/myportal/config/MyPortalUiLabels.xml?rev=1039651&r1=1039650&r2=1039651&view=diff
>
> ==============================================================================
> ---
> ofbiz/branches/jquery/specialpurpose/myportal/config/MyPortalUiLabels.xml
> (original)
> +++
> ofbiz/branches/jquery/specialpurpose/myportal/config/MyPortalUiLabels.xml
> Sat Nov 27 10:59:21 2010
> @@ -25,9 +25,11 @@
>         <value xml:lang="it">Mia pagina</value>
>         <value xml:lang="th">à¹
> อปพริเคชันของฉัน</value>
>         <value xml:lang="zh">æˆ‘çš„é¡µé ¢åº”ç”¨ç¨‹åº æ  </value>
> +        <value xml:lang="zh_TW">å€‹äººç¶²é  æ‡‰ç”¨ç¨‹å¼ åˆ—</value>
>     </property>
>     <property key="MyPortalBillToCustomer">
>         <value xml:lang="en">Bill To Customer</value>
> +        <value xml:lang="zh_TW">ç™¼é€ å¸³å–®çµ¦å®¢æˆ¶</value>
>     </property>
>     <property key="MyPortalCaptchaMissingError">
>         <value xml:lang="en">Verify code captcha is missing or
> wrong</value>
> @@ -35,9 +37,11 @@
>         <value xml:lang="it">Verifica il codice captcha, è mancante o
> errato</value>
>         <value
> xml:lang="th">รหัสตัวเลขที่ท่านภรอà¸
> มีข้อผิดพลาด</value>
>         <value xml:lang="zh">ç¼ºå°‘éªŒè¯ ç  æˆ–éªŒè¯ ç  é”™è¯¯</value>
> +        <value xml:lang="zh_TW">沒有驗證碼或是錯誤</value>
>     </property>
>     <property key="MyPortalEndUserCustomer">
>         <value xml:lang="en">End User Customer</value>
> +        <value xml:lang="zh_TW">最終使用客戶</value>
>     </property>
>     <property key="MyPortalFirstNameMissing">
>         <value xml:lang="en">Your firstName is missing</value>
> @@ -45,6 +49,7 @@
>         <value xml:lang="it">Nome mancante</value>
>         <value xml:lang="th">ภรุณาภรอà¸
> ชื่อของท่าน</value>
>         <value xml:lang="zh">ç¼ºå°‘ä½ çš„å  </value>
> +        <value xml:lang="zh_TW">ç¼ºå°‘å  å­—(Firstname)</value>
>     </property>
>     <property key="MyPortalInformation">
>         <value xml:lang="en">My Information</value>
> @@ -52,6 +57,7 @@
>         <value xml:lang="it">Mie informazioni</value>
>         <value xml:lang="th">ข้อมูลของฉัน</value>
>         <value xml:lang="zh">æˆ‘çš„ä¿¡æ ¯</value>
> +        <value xml:lang="zh_TW">å…¥å £ç¶²ç«™</value>
>     </property>
>     <property key="MyPortalLastNameMissing">
>         <value xml:lang="en">Your lastname is missing</value>
> @@ -59,16 +65,22 @@
>         <value xml:lang="it">Cognome mancante</value>
>         <value xml:lang="th">ภรุณาภรอภนามสà¸
> ุลของท่าน</value>
>         <value xml:lang="zh">ç¼ºå°‘ä½ çš„å§“</value>
> +        <value xml:lang="zh_TW">ç¼ºå°‘å§“æ° (Lastname)</value>
>     </property>
>     <property key="MyPortalMyOrders">
>         <value xml:lang="en">My Orders</value>
> +        <value xml:lang="zh_TW">我的訂單</value>
>     </property>
> +        <value xml:lang="zh_TW">我的任務</value>
> +        <value xml:lang="zh_TW">我的時間</value>
> +        <value xml:lang="zh_TW">æ–°çš„è¨Šæ ¯</value>
>     <property key="MyPortalNewRegistration">
>         <value xml:lang="en">New Registration </value>
>         <value xml:lang="fr">Nouvel enregistrement</value>
>         <value xml:lang="it">Nuovo utente</value>
>         <value xml:lang="th">ลงทะเบียน </value>
>         <value xml:lang="zh">新注册</value>
> +        <value xml:lang="zh_TW">新的註冊</value>
>     </property>
>     <property key="MyPortalPicCaptcha">
>         <value xml:lang="en">Code Captcha</value>
> @@ -76,9 +88,11 @@
>         <value xml:lang="it">Codice captcha</value>
>         <value xml:lang="th">รหัสตรวจสอบ</value>
>         <value xml:lang="zh">éªŒè¯ ç  </value>
> +        <value xml:lang="zh_TW">驗證碼</value>
>     </property>
>     <property key="MyPortalPlacingCustomer">
>         <value xml:lang="en">Placing Customer</value>
> +        <value xml:lang="zh_TW">安排客戶</value>
>     </property>
>     <property key="MyPortalRegisterComplete">
>         <value xml:lang="en">Register of new person is complete...Please
> </value>
> @@ -86,14 +100,18 @@
>         <value xml:lang="it">Creazione nuovo utente completata...prego
> </value>
>         <value xml:lang="th">à¸
> ารลงทะเบียนใหม่สำหรับบุคคลได้ทำà¸
> ารเสร็จสิ้นสมบูรณ์à¹
> ล้ว...สามารถเข้าสู่ระบบได้
> </value>
>         <value xml:lang="zh">å®Œæˆ æ–°äººå‘˜æ³¨å†Œ...请</value>
> +        <value xml:lang="zh_TW">è¨»å†Šæ–°çš„ä½¿ç”¨è€…å®Œæˆ ...è«‹</value>
>     </property>
>     <property key="MyPortalReloadImage">
>         <value xml:lang="en">reload image</value>
>         <value xml:lang="it">Ricarica immagine</value>
>         <value xml:lang="zh">刷新图片</value>
> +        <value xml:lang="zh_TW">é‡ è¼‰åœ–ç‰‡</value>
>     </property>
> +        <value xml:lang="zh_TW">ç™¼é€ é›»å­ éƒµä»¶çµ¦æ‰€æœ‰å®¢æˆ¶è¦
> 求變更</value>
>     <property key="MyPortalShipToCustomer">
>         <value xml:lang="en">Ship To Customer</value>
> +        <value xml:lang="zh_TW">å¯„é€ çµ¦å®¢æˆ¶</value>
>     </property>
>     <property key="MyPortalTaskActEndDate">
>         <value xml:lang="en">Task Act End</value>
> @@ -101,6 +119,7 @@
>         <value xml:lang="it">Fine compito effettiva</value>
>         <value xml:lang="th">เสร็จสิ้นà¸
> ารทำ</value>
>         <value xml:lang="zh">ä»»åŠ¡æ“ ä½œç»“æ Ÿ</value>
> +        <value xml:lang="zh_TW">ä»»å‹™ä½œæ¥­çµ æ Ÿ</value>
>     </property>
>     <property key="MyPortalTaskActStartDate">
>         <value xml:lang="en">Task Act Start</value>
> @@ -108,6 +127,7 @@
>         <value xml:lang="it">Inizio compito effettivo</value>
>         <value xml:lang="th">เรื่มต้นà¸
> ารทำ</value>
>         <value xml:lang="zh">ä»»åŠ¡æ“ ä½œå¼€å§‹</value>
> +        <value xml:lang="zh_TW">任務作業開始</value>
>     </property>
>     <property key="MyPortalTaskPlanEndDate">
>         <value xml:lang="en">Task Plan End</value>
> @@ -115,6 +135,7 @@
>         <value xml:lang="it">Fine compito pianificata</value>
>         <value
> xml:lang="th">สิ้นสุดชิ้นงาน</value>
>         <value xml:lang="zh">ä»»åŠ¡è®¡åˆ’ç»“æ Ÿ</value>
> +        <value xml:lang="zh_TW">ä»»å‹™è¨ˆç•«çµ æ Ÿ</value>
>     </property>
>     <property key="MyPortalTaskPlanStartDate">
>         <value xml:lang="en">Task Plan Start</value>
> @@ -122,6 +143,7 @@
>         <value xml:lang="it">Inizio compito pianificato</value>
>         <value
> xml:lang="th">เริ่มต้นชิ้นงาน</value>
>         <value xml:lang="zh">任务计划开始</value>
> +        <value xml:lang="zh_TW">任務計畫開始</value>
>     </property>
>     <property key="MyPortalTaskStatus">
>         <value xml:lang="en">Task Status</value>
> @@ -129,6 +151,7 @@
>         <value xml:lang="it">Stato compito</value>
>         <value xml:lang="th">สถานะของงาน</value>
>         <value xml:lang="zh">ä»»åŠ¡çŠ¶æ€ </value>
> +        <value xml:lang="zh_TW">任務狀態</value>
>     </property>
>     <property key="MyPortalTasks">
>         <value xml:lang="en">My Tasks</value>
> @@ -136,6 +159,7 @@
>         <value xml:lang="it">Miei compiti</value>
>         <value xml:lang="th">งานของฉัน</value>
>         <value xml:lang="zh">我的任务</value>
> +        <value xml:lang="zh_TW">我的任務</value>
>     </property>
>     <property key="MyPortalUserLogin">
>         <value xml:lang="en">User Login</value>
> @@ -143,6 +167,7 @@
>         <value xml:lang="it">Login utente</value>
>         <value xml:lang="th">ข้อมูลà¸
> ารลงทะเบียน</value>
>         <value xml:lang="zh">用户登录</value>
> +        <value xml:lang="zh_TW">使用者登入</value>
>     </property>
>     <property key="MyPortalVerifyCaptcha">
>         <value xml:lang="en">Verify captcha code</value>
> @@ -150,10 +175,12 @@
>         <value xml:lang="it">Verifica codice captcha</value>
>         <value
> xml:lang="th">ใส่รหัสตามรูป</value>
>         <value xml:lang="zh">éªŒè¯ éªŒè¯ ç  </value>
> +        <value xml:lang="zh_TW">驗證碼</value>
>     </property>
>     <property key="PageTitleFindPortalPage">
>         <value xml:lang="en">Find Portal page</value>
>         <value xml:lang="fr">Rech. page portail</value>
> +        <value xml:lang="zh_TW">æŸ¥æ‰¾å…¥å £ç¶²é  </value>
>     </property>
>     <property key="PageTitleMyPortal">
>         <value xml:lang="en">My Portal for : </value>
> @@ -161,6 +188,7 @@
>         <value xml:lang="it">Mio portale per : </value>
>         <value xml:lang="th">ส่วนตัวสำหรับ
> </value>
>         <value xml:lang="zh">我的门户用于：</value>
> +        <value xml:lang="zh_TW">å…¥å £ç¶²ç«™ä½¿ç”¨è€…:</value>
>     </property>
>     <property key="PageTitleMyPortalForNoLogin">
>         <value xml:lang="en">My Portal Page</value>
> @@ -168,5 +196,6 @@
>         <value xml:lang="it">Pagina mio portale</value>
>         <value
> xml:lang="th">หน้าส่วนตัวของฉัน</value>
>         <value xml:lang="zh">æˆ‘çš„é—¨æˆ·é¡µé ¢</value>
> +        <value xml:lang="zh_TW">å…¥å £ç¶²é  </value>
>     </property>
>  </resource>
>
> Modified: ofbiz/branches/jquery/specialpurpose/myportal/widget/login.ftl
> URL:
> http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/myportal/widget/login.ftl?rev=1039651&r1=1039650&r2=1039651&view=diff
>
> ==============================================================================
> --- ofbiz/branches/jquery/specialpurpose/myportal/widget/login.ftl
> (original)
> +++ ofbiz/branches/jquery/specialpurpose/myportal/widget/login.ftl Sat Nov
> 27 10:59:21 2010
> @@ -42,11 +42,15 @@ under the License.
>             <td class="label">${uiLabelMap.CommonPassword}</td>
>             <td><input type="password" name="PASSWORD" value=""
> size="20"/></td>
>           </tr>
> -          <#if ("Y" == useMultitenant)>
> -            <tr>
> -              <td class="label">${uiLabelMap.CommonTenantId}</td>
> -              <td><input type="text" name="tenantId"
> value="${parameters.tenantId?if_exists}" size="20"/></td>
> -            </tr>
> +          <#if ("Y" == useMultitenant) >
> +              <#if !requestAttributes.tenantId?exists>
> +                  <tr>
> +                      <td class="label">${uiLabelMap.CommonTenantId}</td>
> +                      <td><input type="text" name="tenantId"
> value="${parameters.tenantId?if_exists}" size="20"/></td>
> +                  </tr>
> +              <#else>
> +                  <input type="hidden" name="tenantId"
> value="${requestAttributes.tenantId?if_exists}"/>
> +              </#if>
>           </#if>
>           <tr>
>             <td colspan="2" align="center">
>
>
>

Reply via email to