OFBiz › OFBiz - Commits

svn commit: r942818 - in /ofbiz/trunk: framework/common/config/ framework/webtools/config/ framework/webtools/webapp/webtools/entity/ specialpurpose/ecommerce/config/ specialpurpose/ecommerce/webapp/ecommerce/forum/

‹ Previous Topic Next Topic ›
 
classic Classic list List threaded Threaded
♦
♦
 1 message Options
jleroux@apache.org
Reply | Threaded
Open this post in threaded view
♦
♦
|

svn commit: r942818 - in /ofbiz/trunk: framework/common/config/ framework/webtools/config/ framework/webtools/webapp/webtools/entity/ specialpurpose/ecommerce/config/ specialpurpose/ecommerce/webapp/ecommerce/forum/

jleroux@apache.org
Author: jleroux
Date: Mon May 10 16:41:18 2010
New Revision: 942818

URL: http://svn.apache.org/viewvc?rev=942818&view=rev
Log:
A patch from Nicolas Malin "Pass eCommerce label to Common Label" https://issues.apache.org/jira/browse/OFBIZ-3694 - OFBIZ-3694

Some labels changes, no functional changes


Modified:
    ofbiz/trunk/framework/common/config/CommonUiLabels.xml
    ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml
    ofbiz/trunk/framework/webtools/webapp/webtools/entity/ListGeneric.ftl
    ofbiz/trunk/specialpurpose/ecommerce/config/EcommerceUiLabels.xml
    ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/bloglib.ftl

Modified: ofbiz/trunk/framework/common/config/CommonUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/config/CommonUiLabels.xml?rev=942818&r1=942817&r2=942818&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/config/CommonUiLabels.xml (original)
+++ ofbiz/trunk/framework/common/config/CommonUiLabels.xml Mon May 10 16:41:18 2010
@@ -4634,10 +4634,20 @@
         <value xml:lang="zh_CN">无</value>
     </property>
     <property key="CommonNoRecordFound">
-        <value xml:lang="de">Kein Datensatz gefunden</value>
-        <value xml:lang="en">No Record Found.</value>
-        <value xml:lang="fr">Aucun résultat trouvé</value>
-        <value xml:lang="hi_IN">कोई रिकॉर्ड नहीं मिला</value>
+        <value xml:lang="da">Der er ikke fundet nogen registreringer</value>
+        <value xml:lang="de">Keine Datensätze gefunden</value>
+        <value xml:lang="en">No Records Found</value>
+        <value xml:lang="es">No se encontraron registros</value>
+        <value xml:lang="fr">Aucun enregistrement trouvé</value>
+        <value xml:lang="hi_IN">कोई जानकारी नहीं</value>
+        <value xml:lang="it">Nessun record trovato</value>
+        <value xml:lang="ja">No records found</value>
+        <value xml:lang="nl">Geen records gevonden</value>
+        <value xml:lang="pt_BR">Nenhum registro encontrado</value>
+        <value xml:lang="ro">Nici-o inregistrare gasita</value>
+        <value xml:lang="ru">Записи не найдены</value>
+        <value xml:lang="th">ไม่มีบันทึกที่ค้นหา</value>
+        <value xml:lang="zh">没有找到记录</value>
     </property>
     <property key="CommonNormal">
         <value xml:lang="en">Normal</value>
@@ -4670,6 +4680,12 @@
         <value xml:lang="fr">Non attribué</value>
         <value xml:lang="hi_IN">निर्दिष्ट नहीं </value>
     </property>
+    <property key="CommonNotAssigned">
+        <value xml:lang="de">Nicht zugewiesen</value>
+        <value xml:lang="en">Not Assigned</value>
+        <value xml:lang="fr">Non attribué</value>
+        <value xml:lang="hi_IN">निर्दिष्ट नहीं </value>
+    </property>
     <property key="CommonNotModifRecreat">
         <value xml:lang="de">kann nur mit Neuanlage geändert werden</value>
         <value xml:lang="en">cannot change without re-creating</value>

Modified: ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml?rev=942818&r1=942817&r2=942818&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml (original)
+++ ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml Mon May 10 16:41:18 2010
@@ -2256,7 +2256,7 @@
         <value xml:lang="th">ไม่ระบุค่าตัวแปร</value>
         <value xml:lang="zh">没有定义参数</value>
     </property>
-    <property key="WebtoolsNoRecordsFound">
+    <property key="WebtoolsNoEntityRecordsFound">
         <value xml:lang="de">Für die Entität wurden keine Datensätze gefunden</value>
         <value xml:lang="en">No Records found for Entity</value>
         <value xml:lang="fr">Aucun enregistrement trouvé pour l'entité</value>

Modified: ofbiz/trunk/framework/webtools/webapp/webtools/entity/ListGeneric.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/entity/ListGeneric.ftl?rev=942818&r1=942817&r2=942818&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/entity/ListGeneric.ftl (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/entity/ListGeneric.ftl Mon May 10 16:41:18 2010
@@ -46,7 +46,7 @@ under the License.
             <#else>
                 <tr>
                     <td colspan="${columnCount}">
-                        <h2>${uiLabelMap.WebtoolsNoRecordsFound} ${entityName}.</h2>
+                        <h2>${uiLabelMap.WebtoolsNoEntityRecordFound} ${entityName}.</h2>
                     </td>
                 </tr>
             </#if>

Modified: ofbiz/trunk/specialpurpose/ecommerce/config/EcommerceUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/config/EcommerceUiLabels.xml?rev=942818&r1=942817&r2=942818&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/config/EcommerceUiLabels.xml (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/config/EcommerceUiLabels.xml Mon May 10 16:41:18 2010
@@ -2034,22 +2034,6 @@
         <value xml:lang="th">ไม่มีสินค้าในคลังสินค้า</value>
         <value xml:lang="zh">这个站点没有产品店铺；请检查设置。</value>
     </property>
-    <property key="EcommerceNoRecordsFound">
-        <value xml:lang="da">Der er ikke fundet nogen registreringer</value>
-        <value xml:lang="de">Keine Datensätze gefunden</value>
-        <value xml:lang="en">No Records Found</value>
-        <value xml:lang="es">No se encontraron registros</value>
-        <value xml:lang="fr">Aucun enregistrement trouvé</value>
-        <value xml:lang="hi_IN">कोई जानकारी नहीं</value>
-        <value xml:lang="it">Nessun record trovato</value>
-        <value xml:lang="ja">No records found</value>
-        <value xml:lang="nl">Geen records gevonden</value>
-        <value xml:lang="pt_BR">Nenhum registro encontrado</value>
-        <value xml:lang="ro">Nici-o inregistrare gasita</value>
-        <value xml:lang="ru">Записи не найдены</value>
-        <value xml:lang="th">ไม่มีบันทึกที่ค้นหา</value>
-        <value xml:lang="zh">没有找到记录</value>
-    </property>
     <property key="EcommerceNoShoppingListsCreate">
         <value xml:lang="cs">Nelze vybrat žádný nákupní seznam, založte nový</value>
         <value xml:lang="da">Ingen indkøbslister kan vælges, opret en ny</value>

Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/bloglib.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/bloglib.ftl?rev=942818&r1=942817&r2=942818&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/bloglib.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/bloglib.ftl Mon May 10 16:41:18 2010
@@ -89,7 +89,7 @@ under the License.
 
 
 <#if sz == 0 >
-  <tr><td class="tabletext" align="center">${uiLabelMap.EcommerceNoRecordsFound}</td></tr>
+  <tr><td class="tabletext" align="center">${uiLabelMap.CommonNoRecordFound}</td></tr>
 </#if>
 <@wrapSubContentCache subContentId=contentIdx wrapTemplateId=stdWrapId contentPurposeList="ARTICLE">
 </@wrapSubContentCache>


Free forum by Nabble Edit this page