Author: jleroux
Date: Sat Sep 17 14:03:49 2011
New Revision: 1171983
URL: http://svn.apache.org/viewvc?rev=1171983&view=rev
Log:
Closes https://issues.apache.org/jira/browse/OFBIZ-3403 "webtools xml data export to
browser not working"
I finally think it's enough for this feature (I used html in label, but who
cares)
Modified:
ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml
ofbiz/trunk/framework/webtools/webapp/webtools/entity/xmldsdump.ftl
Modified: ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml?rev=1171983&r1=1171982&r2=1171983&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml (original)
+++ ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml Sat Sep 17
14:03:49 2011
@@ -19,6 +19,66 @@
under the License.
-->
<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <property key="EntityImportDeletFile">
+ <value xml:lang="en">Deleting ${fileName}</value>
+ <value xml:lang="it">Stò cancellando il file ${fileName}</value>
+ </property>
+ <property key="EntityImportErrorRetrievingEntityNames">
+ <value xml:lang="en">Error retrieving entity names.</value>
+ <value xml:lang="it">Errore nell'ottenere i nome delle entità .</value>
+ </property>
+ <property key="EntityImportFailedFile">
+ <value xml:lang="en">Failed ${fileName} adding to retry list for next
pass</value>
+ <value xml:lang="it">Fallita ${fileName} aggiunta alla lista di riprova al
successivo passaggio</value>
+ </property>
+ <property key="EntityImportFailedFileList">
+ <value xml:lang="en">Failed Files:</value>
+ <value xml:lang="it">Lista file che hanno avuto fallimento:</value>
+ </property>
+ <property key="EntityImportFailedNumberFile">
+ <value xml:lang="en">Failed: ${failed} of ${total}</value>
+ <value xml:lang="it">Failed: ${failed} di ${total}</value>
+ </property>
+ <property key="EntityImportNoDataSourceSpecified">
+ <value xml:lang="en">Unable to locate the datasource helper for the group
${groupNameToUse}</value>
+ <value xml:lang="it">Non è possibile localizzare la sorgente dati per il
gruppo ${groupNameToUse}</value>
+ </property>
+ <property key="EntityImportNoXmlFileOrTextSpecified">
+ <value xml:lang="en">No entity xml file or text specified</value>
+ <value xml:lang="it">Nessun file xml entità o testo specificato</value>
+ </property>
+ <property key="EntityImportNoXmlFileSpecified">
+ <value xml:lang="en">No filename/URL or complete XML document specified,
doing nothing.</value>
+ <value xml:lang="it">Nessun nome file/URL o documento XML completo
specificato, nientre verrà fatto.</value>
+ </property>
+ <property key="EntityImportNumberOfEntityToBeProcessed">
+ <value xml:lang="en">Got ${numberRead} entities from
${fileName}</value>
+ <value xml:lang="it">Ottenute ${numberRead} entità da
${fileName}</value>
+ </property>
+ <property key="EntityImportParsingError">
+ <value xml:lang="en">ERROR parsing Entity Xml file:
${errorString}</value>
+ <value xml:lang="it">ERRORE di parsing file entità XML:
${errorString}</value>
+ </property>
+ <property key="EntityImportPassedFile">
+ <value xml:lang="en">Pass ${passes} complete</value>
+ <value xml:lang="it">Passati ${passes} completati</value>
+ </property>
+ <property key="EntityImportPathNotFound">
+ <value xml:lang="en">path not found or can't be read</value>
+ <value xml:lang="it">path non trovato o non può essere letto</value>
+ </property>
+ <property key="EntityImportPathNotSpecified">
+ <value xml:lang="en">No path specified, doing nothing.</value>
+ <value xml:lang="it">Nessun path specificato, non verrà fatto
niente.</value>
+ </property>
+ <property key="EntityImportRowProcessed">
+ <value xml:lang="en">Got ${numberRead} entities to write to the
datasource.</value>
+ <value xml:lang="it">Ottenute ${numberRead} entità da scrivere sulla
sorgente dati.</value>
+ </property>
+ <property key="EntityImportSucceededNumberFile">
+ <value xml:lang="en">Succeeded: ${succeeded} of ${total}</value>
+ <value xml:lang="it">Successo: ${succeeded} di ${total}</value>
+ </property>
<property key="FormFieldTitle_date1">
<value xml:lang="de">Datum1</value>
<value xml:lang="en">date1</value>
@@ -108,8 +168,8 @@
<value xml:lang="zh_TW">æ´æ¸2</value>
</property>
<property key="FormFieldTitle_keepRemoveInfoHours">
- <value xml:lang="en">Keep Remove Info Hours</value>
<value xml:lang="de">Info-Stunden beibehalten/entfernen</value>
+ <value xml:lang="en">Keep Remove Info Hours</value>
<value xml:lang="fr">Maintenir le retrait des heures
d'information</value>
<value xml:lang="it">Mantieni gli orari delle informazioni
eliminate</value>
<value xml:lang="ro">Mentine Orariul Informatii Sterse </value>
@@ -558,6 +618,10 @@
<value xml:lang="zh">è°æ´è°è¯çº§å«</value>
<value xml:lang="zh_TW">調æ´èª¿è©¦ç´å¥</value>
</property>
+ <property key="WebtoolsAdminPortalPage">
+ <value xml:lang="en">Portal page Admin.</value>
+ <value xml:lang="fr">Admin. Page portail</value>
+ </property>
<property key="WebtoolsAdministration">
<value xml:lang="de">Administration</value>
<value xml:lang="en">Administration</value>
@@ -568,10 +632,6 @@
<value xml:lang="zh">管ç</value>
<value xml:lang="zh_TW">管ç</value>
</property>
- <property key="WebtoolsAdminPortalPage">
- <value xml:lang="en">Portal page Admin.</value>
- <value xml:lang="fr">Admin. Page portail</value>
- </property>
<property key="WebtoolsAll">
<value xml:lang="de">Alle</value>
<value xml:lang="en">All</value>
@@ -1372,66 +1432,6 @@
<value xml:lang="zh">å®ä½å¼æå·¥å
·</value>
<value xml:lang="zh_TW">實é«å¼æå·¥å
·</value>
</property>
- <property key="EntityImportDeletFile">
- <value xml:lang="en">Deleting ${fileName}</value>
- <value xml:lang="it">Stò cancellando il file ${fileName}</value>
- </property>
- <property key="EntityImportErrorRetrievingEntityNames">
- <value xml:lang="en">Error retrieving entity names.</value>
- <value xml:lang="it">Errore nell'ottenere i nome delle entità .</value>
- </property>
- <property key="EntityImportFailedNumberFile">
- <value xml:lang="en">Failed: ${failed} of ${total}</value>
- <value xml:lang="it">Failed: ${failed} di ${total}</value>
- </property>
- <property key="EntityImportFailedFile">
- <value xml:lang="en">Failed ${fileName} adding to retry list for next
pass</value>
- <value xml:lang="it">Fallita ${fileName} aggiunta alla lista di riprova al
successivo passaggio</value>
- </property>
- <property key="EntityImportFailedFileList">
- <value xml:lang="en">Failed Files:</value>
- <value xml:lang="it">Lista file che hanno avuto fallimento:</value>
- </property>
- <property key="EntityImportNoDataSourceSpecified">
- <value xml:lang="en">Unable to locate the datasource helper for the group
${groupNameToUse}</value>
- <value xml:lang="it">Non è possibile localizzare la sorgente dati per il
gruppo ${groupNameToUse}</value>
- </property>
- <property key="EntityImportNoXmlFileOrTextSpecified">
- <value xml:lang="en">No entity xml file or text specified</value>
- <value xml:lang="it">Nessun file xml entità o testo specificato</value>
- </property>
- <property key="EntityImportNoXmlFileSpecified">
- <value xml:lang="en">No filename/URL or complete XML document specified,
doing nothing.</value>
- <value xml:lang="it">Nessun nome file/URL o documento XML completo
specificato, nientre verrà fatto.</value>
- </property>
- <property key="EntityImportNumberOfEntityToBeProcessed">
- <value xml:lang="en">Got ${numberRead} entities from
${fileName}</value>
- <value xml:lang="it">Ottenute ${numberRead} entità da
${fileName}</value>
- </property>
- <property key="EntityImportParsingError">
- <value xml:lang="en">ERROR parsing Entity Xml file:
${errorString}</value>
- <value xml:lang="it">ERRORE di parsing file entità XML:
${errorString}</value>
- </property>
- <property key="EntityImportPathNotFound">
- <value xml:lang="en">path not found or can't be read</value>
- <value xml:lang="it">path non trovato o non può essere letto</value>
- </property>
- <property key="EntityImportPathNotSpecified">
- <value xml:lang="en">No path specified, doing nothing.</value>
- <value xml:lang="it">Nessun path specificato, non verrà fatto
niente.</value>
- </property>
- <property key="EntityImportPassedFile">
- <value xml:lang="en">Pass ${passes} complete</value>
- <value xml:lang="it">Passati ${passes} completati</value>
- </property>
- <property key="EntityImportRowProcessed">
- <value xml:lang="en">Got ${numberRead} entities to write to the
datasource.</value>
- <value xml:lang="it">Ottenute ${numberRead} entità da scrivere sulla
sorgente dati.</value>
- </property>
- <property key="EntityImportSucceededNumberFile">
- <value xml:lang="en">Succeeded: ${succeeded} of ${total}</value>
- <value xml:lang="it">Successo: ${succeeded} di ${total}</value>
- </property>
<property key="WebtoolsEntityName">
<value xml:lang="de">Entität</value>
<value xml:lang="en">Entity Name</value>
@@ -1924,24 +1924,6 @@
<value xml:lang="zh">éç¨Java线ç¨</value>
<value xml:lang="zh_TW">éç¨Javaç·ç¨</value>
</property>
- <property key="WebtoolsGroup">
- <value xml:lang="de">Gruppe</value>
- <value xml:lang="en">Group</value>
- <value xml:lang="fr">Groupe</value>
- <value xml:lang="it">Gruppo</value>
- <value xml:lang="th">à¸à¸¥à¸¸à¹à¸¡</value>
- <value xml:lang="zh">ç»</value>
- <value xml:lang="zh_TW">çµ</value>
- </property>
- <property key="WebtoolsGroupName">
- <value xml:lang="de">Gruppenname</value>
- <value xml:lang="en">Group Name</value>
- <value xml:lang="fr">Nom de groupe</value>
- <value xml:lang="it">Nome gruppo</value>
- <value xml:lang="th">à¸à¸·à¹à¸à¸à¸¥à¸¸à¹à¸¡</value>
- <value xml:lang="zh">ç»å称</value>
- <value xml:lang="zh_TW">çµå稱</value>
- </property>
<property key="WebtoolsGeoCreateNew">
<value xml:lang="en">Create/Edit Geo</value>
<value xml:lang="fr">Créer/Modifier une zone géographique</value>
@@ -1949,7 +1931,7 @@
<property key="WebtoolsGeoEdit">
<value xml:lang="en">Create/Edit Geo</value>
<value xml:lang="fr">Créer/Modifier la zone géographique</value>
- </property>
+ </property>
<property key="WebtoolsGeoManagement">
<value xml:lang="en">Geo Management</value>
<value xml:lang="fr">Gestion des zones géographiques</value>
@@ -1970,6 +1952,24 @@
<value xml:lang="en">Select Geos to associate</value>
<value xml:lang="fr">Sélectionner les zones géographiques Ã
associer</value>
</property>
+ <property key="WebtoolsGroup">
+ <value xml:lang="de">Gruppe</value>
+ <value xml:lang="en">Group</value>
+ <value xml:lang="fr">Groupe</value>
+ <value xml:lang="it">Gruppo</value>
+ <value xml:lang="th">à¸à¸¥à¸¸à¹à¸¡</value>
+ <value xml:lang="zh">ç»</value>
+ <value xml:lang="zh_TW">çµ</value>
+ </property>
+ <property key="WebtoolsGroupName">
+ <value xml:lang="de">Gruppenname</value>
+ <value xml:lang="en">Group Name</value>
+ <value xml:lang="fr">Nom de groupe</value>
+ <value xml:lang="it">Nome gruppo</value>
+ <value xml:lang="th">à¸à¸·à¹à¸à¸à¸¥à¸¸à¹à¸¡</value>
+ <value xml:lang="zh">ç»å称</value>
+ <value xml:lang="zh_TW">çµå稱</value>
+ </property>
<property key="WebtoolsHits">
<value xml:lang="de">Besuche</value>
<value xml:lang="en">Hits</value>
@@ -2088,7 +2088,7 @@
<value xml:lang="en">Index Name</value>
<value xml:lang="fr">Nom d'index</value>
<value xml:lang="it">Nome indice</value>
- <value xml:lang="pt">Nome do ÃÂndice</value>
+ <value xml:lang="pt">Nome do Índice</value>
<value xml:lang="th">à¸à¸·à¹à¸à¸à¸±à¸§à¸§à¸±à¸</value>
<value xml:lang="zh">ç´¢å¼å称</value>
<value xml:lang="zh_TW">ç´¢å¼å稱</value>
@@ -2483,7 +2483,7 @@
<value xml:lang="de">Um zu beginnen, wählen Sie eine Datei aus; danach werden alle Optionen aktiviert. Sofern kein Button
erscheint, setzen Sie den Cursor in ein Feld und validieren Sie mit 'Enter'.</value>
<value xml:lang="en">For the moment, to begin you need to choose one file, after all options are opened. Without button
put the cursor in a field and validate.</value>
<value xml:lang="fr">Pour le moment, pour commencer vous devez choisir un fichier, ensuite tout est ouvert. Si aucun
bouton n'apparaît, postionnez le curseur dans un champ et validez.</value>
- </property>
+ </property>
<property key="WebtoolsLabelManagerUpdate">
<value xml:lang="de">Label aktualisieren</value>
<value xml:lang="en">Update Label</value>
@@ -2686,6 +2686,9 @@
<value xml:lang="zh">ç»´æ¤æ¶é´æ³ï¼</value>
<value xml:lang="zh_TW">ç¶è·æéæ³ï¼</value>
</property>
+ <property key="WebtoolsMaxInMemory">
+ <value xml:lang="en">Max In Memory</value>
+ </property>
<property key="WebtoolsMaxMemory">
<value xml:lang="de">Max. Speicher</value>
<value xml:lang="en">MAX</value>
@@ -2738,9 +2741,6 @@
<value xml:lang="zh">æ大大å°</value>
<value xml:lang="zh_TW">æ大大å°</value>
</property>
- <property key="WebtoolsMaxInMemory">
- <value xml:lang="en">Max In Memory</value>
- </property>
<property key="WebtoolsMemory">
<value xml:lang="de">Speicher</value>
<value xml:lang="en">Memory</value>
@@ -2877,6 +2877,16 @@
<value xml:lang="zh">没æå®ä½è¯»</value>
<value xml:lang="zh_TW">æ²æ實é«è®</value>
</property>
+ <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>
+ <value xml:lang="it">Nessun records trovato per l'entità </value>
+ <value xml:lang="ro">Nici-un Record gasit pentru Entitatea WebtoolsNoUtilCacheFound=Nici-o instanta de Cache
gasita</value>
+ <value
xml:lang="th">à¹à¸¡à¹à¸à¸à¸à¹à¸à¸¡à¸¹à¸¥à¸à¸µà¹à¸à¸±à¸à¸à¸¶à¸à¸ªà¸³à¸«à¸£à¸±à¸à¹à¸à¸à¸à¸´à¸à¸µà¹</value>
+ <value xml:lang="zh">没ææ¾å°å®ä½è®°å½</value>
+ <value xml:lang="zh_TW">æ²ææ¾å°å¯¦é«è¨é</value>
+ </property>
<property key="WebtoolsNoFilenameSpecified">
<value xml:lang="de">Kein Dateiname oder keine Entitätennamen
angegeben</value>
<value xml:lang="en">No filename specified or no entity names specified,
doing nothing.</value>
@@ -2896,16 +2906,6 @@
<value xml:lang="zh">没æå®ä¹åæ°</value>
<value xml:lang="zh_TW">æ²æå®ç¾©åæ¸</value>
</property>
- <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>
- <value xml:lang="it">Nessun records trovato per l'entità </value>
- <value xml:lang="ro">Nici-un Record gasit pentru Entitatea WebtoolsNoUtilCacheFound=Nici-o instanta de Cache
gasita</value>
- <value
xml:lang="th">à¹à¸¡à¹à¸à¸à¸à¹à¸à¸¡à¸¹à¸¥à¸à¸µà¹à¸à¸±à¸à¸à¸¶à¸à¸ªà¸³à¸«à¸£à¸±à¸à¹à¸à¸à¸à¸´à¸à¸µà¹</value>
- <value xml:lang="zh">没ææ¾å°å®ä½è®°å½</value>
- <value xml:lang="zh_TW">æ²ææ¾å°å¯¦é«è¨é</value>
- </property>
<property key="WebtoolsNoRunningProcesses">
<value xml:lang="de">Es laufen keine Prozesse</value>
<value xml:lang="en">No running processes</value>
@@ -3087,8 +3087,8 @@
</property>
<property key="WebtoolsOutToBrowser">
<value xml:lang="de">ODER Browserausgabe</value>
- <value xml:lang="en">OR Out to Browser</value>
- <value xml:lang="fr">OU en dehors vers le navigateur</value>
+ <value xml:lang="en"><U>OR</U> Out to Browser (FireFox, Safari and Opera: view source. Chrome does not
work)</value>
+ <value xml:lang="fr"><U>OU</U> dans le navigateur (FireFox, Safari et Opera : voir le source. Chrome ne
fontionne pas)</value>
<value xml:lang="it">O output al browser</value>
<value xml:lang="pt">Ou devolver para o navegador</value>
<value xml:lang="th">หรืà¸à¸à¸à¹à¸à¸ªà¸¹à¹ Browser</value>
@@ -4767,5 +4767,5 @@
<value xml:lang="th">à¸à¸¸à¸à¸ªà¸²à¸¡à¸²à¸£à¸à¸à¸µà¹à¸à¸°à¸ªà¸£à¹à¸²à¸ Entity à¹à¸à¹ ${entityName}
à¹à¸à¸¢à¸à¸²à¸£à¹à¸à¹à¸²à¸ªà¸¹à¹à¸à¹à¸²à¸à¸µà¹à¸à¸¸à¸à¸à¹à¸à¸à¸à¸²à¸£à¹à¸¥à¸°à¸à¸¥à¸´à¸ Create.</value>
<value xml:lang="zh">å建ä¸ä¸ªå®ä½ ${entityName}
ï¼è¾å
¥å¼ï¼ç¶åç¹å»æ°å»º.</value>
<value xml:lang="zh_TW">åµå»ºä¸åå¯¦é« ${entityName}
ï¼è¼¸å
¥å¼ï¼ç¶å¾é»ææ°å»º.</value>
- </property>
+ </property>
</resource>
Modified: ofbiz/trunk/framework/webtools/webapp/webtools/entity/xmldsdump.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/entity/xmldsdump.ftl?rev=1171983&r1=1171982&r2=1171983&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/entity/xmldsdump.ftl
(original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/entity/xmldsdump.ftl Sat Sep
17 14:03:49 2011
@@ -82,7 +82,7 @@ under the License.
</td>
</tr>
<tr>
- <td class="label">${uiLabelMap.WebtoolsOutToBrowser}</td>
+ <td
class="label">${StringUtil.wrapString(uiLabelMap.WebtoolsOutToBrowser)}</td>
<td><input type="checkbox" name="tobrowser"<#if tobrowser?has_content>
checked="checked"</#if> /></td>
</tr>
</table>