Author: nmalin
Date: Sun Jan 24 12:41:38 2016
New Revision: 1726485
URL: http://svn.apache.org/viewvc?rev=1726485&view=rev
Log:
* add missing french translation
* correct typo error on label WebtoolsEntityCretePermissionError ->
WebtoolsEntityCreatePermissionError
* correct typo error on labels WebtoolsErrror* -> WebtoolsError*
Modified:
ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml
ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/WebToolsServices.java
ofbiz/trunk/framework/webtools/webapp/webtools/entity/ViewGeneric.ftl
ofbiz/trunk/framework/webtools/webapp/webtools/entity/ViewRelations.ftl
Modified: ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml?rev=1726485&r1=1726484&r2=1726485&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml (original)
+++ ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml Sun Jan 24
12:41:38 2016
@@ -165,6 +165,7 @@
<property key="FormFieldTitle_date1">
<value xml:lang="de">Datum1</value>
<value xml:lang="en">date1</value>
+ <value xml:lang="fr">date 1</value>
<value xml:lang="it">data 1</value>
<value xml:lang="ja">æ¥ä»1</value>
<value xml:lang="pt">data1</value>
@@ -175,6 +176,7 @@
<property key="FormFieldTitle_date2">
<value xml:lang="de">Datum2</value>
<value xml:lang="en">date2</value>
+ <value xml:lang="fr">date 2</value>
<value xml:lang="it">data 2</value>
<value xml:lang="ja">æ¥ä»2</value>
<value xml:lang="pt">data2</value>
@@ -185,6 +187,7 @@
<property key="FormFieldTitle_entityGroupId">
<value xml:lang="de">Entität Gruppen ID</value>
<value xml:lang="en">Entity Group Id</value>
+ <value xml:lang="fr">Réf du groupe d'entité</value>
<value xml:lang="it">Gruppo entità </value>
<value xml:lang="ja">ã¨ã³ãã£ãã¤ã°ã«ã¼ãID</value>
<value xml:lang="pt">ID do Grupo da Entity</value>
@@ -208,6 +211,7 @@
<property key="FormFieldTitle_eomodeldFullPath">
<value xml:lang="de">EoModell abs. Pfad</value>
<value xml:lang="en">EoModel Full Path</value>
+ <value xml:lang="fr">Chemin absolue du EoModel</value>
<value xml:lang="it">Path completo EoModel</value>
<value xml:lang="ja">EoModelãã«ãã¹</value>
<value xml:lang="pt">Caminho completo EoModel</value>
@@ -218,6 +222,7 @@
<property key="FormFieldTitle_exprAssocType">
<value xml:lang="de">Ausdruck Verknüpfungstyp</value>
<value xml:lang="en">Expr Assoc Type</value>
+ <value xml:lang="fr">Type d'association d'expresion</value>
<value xml:lang="it">Tipo associazione espressione</value>
<value xml:lang="ja">表ç¾å²å½ç¨®é¡</value>
<value xml:lang="pt">Tipo de associação da expressão</value>
@@ -254,6 +259,7 @@
<property key="FormFieldTitle_integer1">
<value xml:lang="de">Integer1</value>
<value xml:lang="en">integer1</value>
+ <value xml:lang="fr">entier 1</value>
<value xml:lang="it">intero 1</value>
<value xml:lang="ja">æ´æ°1</value>
<value xml:lang="pt">INTEIRO1</value>
@@ -264,6 +270,7 @@
<property key="FormFieldTitle_integer2">
<value xml:lang="de">Integer2</value>
<value xml:lang="en">integer2</value>
+ <value xml:lang="fr">entier 2</value>
<value xml:lang="it">intero 2</value>
<value xml:lang="ja">æ´æ°2</value>
<value xml:lang="vi">SỠnguyên2</value>
@@ -362,6 +369,7 @@
<property key="FormFieldTitle_string1">
<value xml:lang="de">String1</value>
<value xml:lang="en">string1</value>
+ <value xml:lang="fr">Chaîne de caractère 1</value>
<value xml:lang="it">stringa 1</value>
<value xml:lang="ja">æåå1</value>
<value xml:lang="pt">string1</value>
@@ -372,6 +380,7 @@
<property key="FormFieldTitle_string2">
<value xml:lang="de">String2</value>
<value xml:lang="en">string2</value>
+ <value xml:lang="fr">Chaîne de caractère 2</value>
<value xml:lang="it">stringa 2</value>
<value xml:lang="ja">æåå2</value>
<value xml:lang="pt">string2</value>
@@ -958,6 +967,7 @@
</property>
<property key="WebtoolsCacheMemory">
<value xml:lang="en">Cache Memory</value>
+ <value xml:lang="fr">Mémoire cache</value>
<value xml:lang="zh">ç¼åå
å</value>
<value xml:lang="zh-TW">å¿«åè¨æ¶é«</value>
</property>
@@ -1278,6 +1288,7 @@
<property key="WebtoolsConfiguration">
<value xml:lang="de">Konfiguration</value>
<value xml:lang="en">Configuration</value>
+ <value xml:lang="fr">Configuration</value>
<value xml:lang="it">Configurazione</value>
<value xml:lang="ja">è¨å®</value>
<value xml:lang="pt">Configuração</value>
@@ -1572,6 +1583,7 @@
</property>
<property key="WebtoolsDefinitionLocation">
<value xml:lang="en">Definition Location</value>
+ <value xml:lang="fr">Emplacement de la définition</value>
<value xml:lang="zh">å®ä¹ä½ç½®</value>
<value xml:lang="zh-TW">å®ç¾©ä½ç½®</value>
</property>
@@ -1699,9 +1711,10 @@
<value xml:lang="zh">å®ä½</value>
<value xml:lang="zh-TW">è³æå¯¦é«</value>
</property>
- <property key="WebtoolsEntityCretePermissionError">
+ <property key="WebtoolsEntityCreatePermissionError">
<value xml:lang="de">Sie haben keine Berechtigung, eine Entität zu
erstellen</value>
<value xml:lang="en">You do not have permission to create a
entity</value>
+ <value xml:lang="fr">Vous n'avez pas les authorisations nécessaire
pour créer une entrée</value>
<value xml:lang="it">Non hai il permesso di creare un'entità </value>
<value
xml:lang="ja">ã¨ã³ãã£ãã£ã使ããæ¨©éãããã¾ãã</value>
<value xml:lang="pt">Você não tem permissão para criar uma
entidade</value>
@@ -1945,6 +1958,7 @@
<property key="WebtoolsEntityXMLRepresentation">
<value xml:lang="de">XML Repräsentation der Entität</value>
<value xml:lang="en">Entity XML Representation</value>
+ <value xml:lang="fr">Représentation XML de l'entité</value>
<value xml:lang="ja">ã¨ã³ãã£ãã£ã®XML表ç¾</value>
<value xml:lang="vi">Trình diá»
n XML Thá»±c thá»</value>
<value xml:lang="zh">å®ä½XML表述</value>
@@ -1974,6 +1988,7 @@
</property>
<property key="WebtoolsEomodelErrorGettingEntityNames">
<value xml:lang="en">ERROR: getting entity names:
${errorString}</value>
+ <value xml:lang="fr">ERREUR: Lors de l'optention des noms d'entité
({errorString})</value>
<value xml:lang="it">ERRORE: ottenendo i nomi delle entità :
${errorString}</value>
<value xml:lang="ja">ã¨ã©ã¼: ã¨ã³ãã£ãã£åã®åå¾ä¸:
${errorString}</value>
<value xml:lang="vi">Lá»i: lấy tên Thá»±c thá»:
${errorString}</value>
@@ -1982,6 +1997,7 @@
</property>
<property key="WebtoolsEomodelExported">
<value xml:lang="en">Exported eomodeld file for ${entityNamesSize}
entities to: ${eomodeldFullPath}</value>
+ <value xml:lang="fr">Fichier EoModel exporté avec ${entityNamesSize}
entités vers ${eomodeldFullPath}</value>
<value xml:lang="it">Esportato file eomodeld per ${entityNamesSize}
entità in: ${eomodeldFullPath}</value>
<value xml:lang="ja">${entityNamesSize}
ã¨ã³ãã£ãã£ã«å¯¾ããEOMODELDãã¡ã¤ã«ãã¨ã¯ã¹ãã¼ããã¾ãã:
${eomodeldFullPath}</value>
<value xml:lang="vi">Äã kết xuất eomodeld táºp tin cho
${entityNamesSize} Thá»±c thá» tá»i: ${eomodeldFullPath}</value>
@@ -1990,6 +2006,7 @@
</property>
<property key="WebtoolsEomodelFileOrDirectoryNotFound">
<value xml:lang="en">ERROR: file/directory not found:
${errorString}</value>
+ <value xml:lang="fr">ERREUR: ficher/dossier non trouvé
(${errorString})</value>
<value xml:lang="it">ERRORE: file/directory non trovata:
${errorString}</value>
<value xml:lang="ja">ã¨ã©ã¼:
ãã¡ã¤ã«/ãã£ã¬ã¯ããªãè¦ã¤ããã¾ãã: ${errorString}</value>
<value xml:lang="vi">Lá»i: Táºp tin / Thư mục không tìm thấy:
${errorString}</value>
@@ -1998,6 +2015,7 @@
</property>
<property key="WebtoolsEomodelFullPathIsNotADirectory">
<value xml:lang="en">eomodel Full Path is not a directory:
${eomodeldFullPath}</value>
+ <value xml:lang="fr">Le chemin absolu donnée (${eomodeldFullPath})
n'est pas un dossier</value>
<value xml:lang="it">eomodel path completo non è una directory:
${eomodeldFullPath}</value>
<value
xml:lang="ja">EOMODELã®ãã«ãã¹ããã£ã¬ã¯ããªã§ã¯ããã¾ãã:
${eomodeldFullPath}</value>
<value xml:lang="vi">ÄÆ°á»ng dẫn Äầy Äá»§ eomodel không
phải là thư mục: ${eomodeldFullPath}</value>
@@ -2006,6 +2024,7 @@
</property>
<property key="WebtoolsEomodelFullPathIsNotWriteable">
<value xml:lang="en">eomodel Full Path is not write-able:
${eomodeldFullPath}</value>
+ <value xml:lang="fr">Le chemin absolu donnée (${eomodeldFullPath})
n'est pas ouvert en écriture</value>
<value xml:lang="it">eomodel path completo non è scrivibile:
${eomodeldFullPath}</value>
<value
xml:lang="ja">EOMODELã®ãã«ãã¹ãæ¸ãè¾¼ã¿å¯è½ã§ã¯ããã¾ãã:
${eomodeldFullPath}</value>
<value
xml:lang="zh">eomodel宿´è·¯å¾ä¸å¯åï¼${eomodeldFullPath}</value>
@@ -2013,6 +2032,7 @@
</property>
<property key="WebtoolsEomodelSavingFileError">
<value xml:lang="en">ERROR saving file: ${errorString}</value>
+ <value xml:lang="fr">ERREUR lors de la sauvegarde du fichier
(${eomodeldFullPath})</value>
<value xml:lang="it">ERRORE durante il salvataggio del file:
${errorString}</value>
<value xml:lang="ja">ãã¡ã¤ã«ã®ä¿åä¸ã«ã¨ã©ã¼:
${errorString}</value>
<value xml:lang="vi">Lá»i lưu táºp tin: ${errorString}</value>
@@ -2045,32 +2065,36 @@
<value xml:lang="zh">é误级å«ä¼æåºé£äºä»ç¶å
许åºç¨ç¨åºç»§ç»æ§è¡çé误äºä»¶ã</value>
<value xml:lang="zh-TW">é¯èª¤ç´å¥ææåºé£äºä»ç¶å
許æç¨ç¨å¼ç¹¼çºå·è¡çé¯èª¤äºä»¶.</value>
</property>
- <property key="WebtoolsErrrorParsingFile">
+ <property key="WebtoolsErrorParsingFile">
<value xml:lang="en">ERROR: parsing file: ${errorString}</value>
+ <value xml:lang="fr">ERREUR : Lors de l'analyse du fichier
(${errorString})</value>
<value xml:lang="it">ERRORE: errore di parsing file:
${errorString}</value>
<value xml:lang="ja">ã¨ã©ã¼: ãã¡ã¤ã«ãã¼ã¹ä¸:
${errorString}</value>
<value xml:lang="vi">Lá»i: phân tÃcf táºp tin:
${errorString}</value>
<value xml:lang="zh">é误ï¼è§£ææä»¶ï¼${errorString}</value>
<value xml:lang="zh-TW">é¯èª¤:è§£ææª:${errorString}</value>
</property>
- <property key="WebtoolsErrrorProcessingTemplateFile">
+ <property key="WebtoolsErrorProcessingTemplateFile">
<value xml:lang="en">ERROR: processing template file ${filename}:
${errorString}</value>
+ <value xml:lang="fr">ERREUR : lors du traitement du fichier modèle
${filename}, une exception c'est levée (${errorString})</value>
<value xml:lang="it">ERRORE: errore di esecuzione template file
${filename}: ${errorString}</value>
<value xml:lang="ja">ã¨ã©ã¼: ãã³ãã¬ã¼ããã¡ã¤ã«
${filename} ã®å¦çä¸: ${errorString}</value>
<value xml:lang="vi">Lá»i: xá» lý táºp tin biá»u mẫu
${filename}: ${errorString}</value>
<value xml:lang="zh">é误ï¼å¤çæ¨¡æ¿æä»¶
${filename}ï¼${errorString}</value>
<value xml:lang="zh-TW">é¯èª¤:èçæ¨¡æ¿æª
${filename}:${errorString}</value>
</property>
- <property key="WebtoolsErrrorReadingFileName">
+ <property key="WebtoolsErrorReadingFileName">
<value xml:lang="en">ERROR: reading file name ${filename}:
${errorString}</value>
+ <value xml:lang="fr">ERREUR : lors de la lecture du fichier
${filename}, une exception c'est levée (${errorString})</value>
<value xml:lang="it">ERRORE: errore di lettura file ${filename}:
${errorString}</value>
<value xml:lang="ja">ã¨ã©ã¼: ãã¡ã¤ã«å ${filename}
ã®èªã¿è¾¼ã¿ä¸: ${errorString}</value>
<value xml:lang="vi">Lá»i: Äá»c táºp tin vá»i tên ${filename}:
${errorString}</value>
<value xml:lang="zh">é误ï¼è¯»åæä»¶å
${filename}ï¼${errorString}</value>
<value xml:lang="zh-TW">é¯èª¤:è®åæªæ¡å
${filename}:${errorString}</value>
</property>
- <property key="WebtoolsErrrorReadingTemplateFile">
+ <property key="WebtoolsErrorReadingTemplateFile">
<value xml:lang="en">ERROR: reading template file ${filename}:
${errorString}</value>
+ <value xml:lang="fr">ERREUR : lors de la lecture du fichier modèle
${filename}, une exception c'est levée (${errorString})</value>
<value xml:lang="it">ERRORE: errore di lettura template file
${filename}: ${errorString}</value>
<value xml:lang="ja">ã¨ã©ã¼: ãã³ãã¬ã¼ããã¡ã¤ã«
${filename} ã®èªã¿è¾¼ã¿ä¸: ${errorString}</value>
<value xml:lang="vi">Lá»i: Äá»c táºp tin biá»u mẫu ${filename}:
${errorString}</value>
@@ -2472,6 +2496,7 @@
</property>
<property key="WebtoolsGeoPoints">
<value xml:lang="en">GEO Points</value>
+ <value xml:lang="fr">Points GEO</value>
<value xml:lang="zh">å°çç¹</value>
</property>
<property key="WebtoolsGeosSelect">
@@ -2544,6 +2569,7 @@
</property>
<property key="WebtoolsImportExport">
<value xml:lang="en">Import/Export</value>
+ <value xml:lang="fr">Importer/Exporter</value>
<value xml:lang="it">Importazione / Esportazione</value>
<value xml:lang="ja">ã¤ã³ãã¼ã/ã¨ã¯ã¹ãã¼ã</value>
<value xml:lang="pt">Importar/Exportar</value>
@@ -2707,6 +2733,7 @@
</property>
<property key="WebtoolsInvalidFileName">
<value xml:lang="en">ERROR: invalid file name ${filename}:
${errorString}</value>
+ <value xml:lang="fr">ERREUR : nom de fichier ${filename} invalide,
(trace d'erreur : ${errorString})</value>
<value xml:lang="it">ERRORE: nome file invalido ${filename}:
${errorString}</value>
<value xml:lang="ja">ã¨ã©ã¼: ãã¡ã¤ã«å ${filename}
ãæ£ããããã¾ãã: ${errorString}</value>
<value xml:lang="vi">Lá»i: tên táºp tin ${filename} không Äúng
Äá»nh dạng: ${errorString}</value>
@@ -2979,6 +3006,7 @@
<property key="WebtoolsLabelManagerHardcoded">
<value xml:lang="de">Fest kodierte Label</value>
<value xml:lang="en">Hardcoded labels</value>
+ <value xml:lang="fr">Labels codés en dure</value>
<value xml:lang="it">Label non traducibili</value>
<value xml:lang="ja">ãã¼ãã³ã¼ããããã©ãã«</value>
<value xml:lang="pt">Labels Hardcoded</value>
@@ -3055,6 +3083,7 @@
<property key="WebtoolsLabelManagerOnlyMissingTranslations">
<value xml:lang="de">Nur fehlende Ãbersetzungen</value>
<value xml:lang="en">Only Missing Translations</value>
+ <value xml:lang="fr">Seulement les traductions manquantes</value>
<value xml:lang="it">Solo traduzioni mancanti</value>
<value xml:lang="ja">翻訳æ¼ãã®ã¿</value>
<value xml:lang="pt">Só Traduções ausentes</value>
@@ -3065,6 +3094,7 @@
<property key="WebtoolsLabelManagerOnlyNotUsedLabels">
<value xml:lang="de">Nur ungenutzte Labels</value>
<value xml:lang="en">Only Not Used Labels</value>
+ <value xml:lang="fr">Seulement les labels non utilisés</value>
<value xml:lang="it">Solo traduzioni non usate</value>
<value xml:lang="ja">使ç¨ããã¦ããªãã©ãã«ã®ã¿</value>
<value xml:lang="pt">Só não labels não utilizados</value>
@@ -3075,6 +3105,7 @@
<property key="WebtoolsLabelManagerReferences">
<value xml:lang="de">Referenzen</value>
<value xml:lang="en">References</value>
+ <value xml:lang="fr">Références</value>
<value xml:lang="it">Referenze</value>
<value xml:lang="ja">åç
§</value>
<value xml:lang="pt">Referências</value>
@@ -3096,6 +3127,7 @@
<property key="WebtoolsLabelManagerRow">
<value xml:lang="de">Zeile N</value>
<value xml:lang="en">Row n.</value>
+ <value xml:lang="fr">Ligne n.</value>
<value xml:lang="it">N.riga</value>
<value xml:lang="ja">è¡No</value>
<value xml:lang="pt">Linha nú</value>
@@ -3166,6 +3198,7 @@
</property>
<property key="WebtoolsLabelManagerViewFile">
<value xml:lang="en">View file</value>
+ <value xml:lang="fr">Voir le fichier</value>
<value xml:lang="it">Mostra file</value>
<value xml:lang="ja">ãã¡ã¤ã«ã表示</value>
<value xml:lang="vi">Xem táºp tin</value>
@@ -3175,6 +3208,7 @@
<property key="WebtoolsLabelManagerViewReferences">
<value xml:lang="de">Labelreferenzen ansehen</value>
<value xml:lang="en">View Labels References</value>
+ <value xml:lang="fr">Voir les références des labels</value>
<value xml:lang="it">Mostra referenze labels</value>
<value xml:lang="ja">ã©ãã«ã®åç
§ã表示</value>
<value xml:lang="pt">Visualizar referências de labels</value>
@@ -3196,6 +3230,7 @@
<property key="WebtoolsLabelStatsExist">
<value xml:lang="de">Vorhandene Labels in Locale</value>
<value xml:lang="en">Existing labels in locale</value>
+ <value xml:lang="fr">Tradutions existantes dans la langue</value>
<value xml:lang="it">Label definite per la lingua</value>
<value xml:lang="ja">å°åã®ã©ãã«ãåå¨</value>
<value xml:lang="vi">Äã tá»n tại Nhãn á» cùng Ngôn
ngữ</value>
@@ -3205,6 +3240,7 @@
<property key="WebtoolsLabelStatsMissing">
<value xml:lang="de">Fehlende Labels in Locale</value>
<value xml:lang="en">Missing labels in locale</value>
+ <value xml:lang="fr">Traductions manquantes dans la langue</value>
<value xml:lang="it">Label mancanti per la lingua</value>
<value xml:lang="ja">å°åã®ã©ãã«æ¼ã</value>
<value xml:lang="vi">Thiếu Nhãn ỠNgôn ngữ</value>
@@ -3214,6 +3250,7 @@
<property key="WebtoolsLabelStatsTotal">
<value xml:lang="de">Gesamtzahl der Labels</value>
<value xml:lang="en">Total labels count</value>
+ <value xml:lang="fr">Total des traductions</value>
<value xml:lang="it">Numero totale label</value>
<value xml:lang="ja">ã©ãã«ä»¶æ°åè¨</value>
<value xml:lang="vi">Tá»ng sá» Nhãn</value>
@@ -3394,6 +3431,7 @@
</property>
<property key="WebtoolsMaxInMemory">
<value xml:lang="en">Max In Memory</value>
+ <value xml:lang="fr">Max en mémoire</value>
<value xml:lang="ja">ã¡ã¢ãªä¸æå¤§</value>
<value xml:lang="vi">Tá»i Äa trong bá» nhá»</value>
<value xml:lang="zh">æå¤§å
å</value>
@@ -4526,6 +4564,7 @@
</property>
<property key="WebtoolsRunTimeDataInfo">
<value xml:lang="en">Run Time Data Info</value>
+ <value xml:lang="fr">Information sur le moment de l'exécution </value>
<value xml:lang="zh">è¿è¡æ¶é´æ°æ®ä¿¡æ¯</value>
<value xml:lang="zh-TW">å·è¡æéè³æè³è¨</value>
</property>
@@ -5481,6 +5520,7 @@
<property key="WebtoolsThreadId">
<value xml:lang="de">ThreadID</value>
<value xml:lang="en">ID</value>
+ <value xml:lang="fr">Réf</value>
<value xml:lang="th">รหัส</value>
<value xml:lang="vi">Id</value>
<value xml:lang="zh">æ è¯</value>
@@ -5753,6 +5793,7 @@
</property>
<property key="WebtoolsViewMetrics">
<value xml:lang="en">View Metrics</value>
+ <value xml:lang="fr">Voir les mesures</value>
<value xml:lang="zh">æµè§åº¦é</value>
<value xml:lang="zh-TW">檢è¦åº¦é</value>
</property>
Modified:
ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/WebToolsServices.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/WebToolsServices.java?rev=1726485&r1=1726484&r2=1726485&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/WebToolsServices.java
(original)
+++ ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/WebToolsServices.java
Sun Jan 24 12:41:38 2016
@@ -135,7 +135,7 @@ public class WebToolsServices {
} catch (MalformedURLException mue) {
return
ServiceUtil.returnError(UtilProperties.getMessage(resource,
"WebtoolsInvalidFileName", UtilMisc.toMap("filename", filename, "errorString",
mue.getMessage()), locale));
} catch (Exception exc) {
- return
ServiceUtil.returnError(UtilProperties.getMessage(resource,
"WebtoolsErrrorReadingFileName", UtilMisc.toMap("filename", filename,
"errorString", exc.getMessage()), locale));
+ return
ServiceUtil.returnError(UtilProperties.getMessage(resource,
"WebtoolsErrorReadingFileName", UtilMisc.toMap("filename", filename,
"errorString", exc.getMessage()), locale));
}
}
@@ -147,7 +147,7 @@ public class WebToolsServices {
try {
templateReader = new FileReader(fmfilename);
} catch (FileNotFoundException e) {
- return
ServiceUtil.returnError(UtilProperties.getMessage(resource,
"WebtoolsErrrorReadingTemplateFile", UtilMisc.toMap("filename", fmfilename,
"errorString", e.getMessage()), locale));
+ return
ServiceUtil.returnError(UtilProperties.getMessage(resource,
"WebtoolsErrorReadingTemplateFile", UtilMisc.toMap("filename", fmfilename,
"errorString", e.getMessage()), locale));
}
StringWriter outWriter = new StringWriter();
@@ -177,7 +177,7 @@ public class WebToolsServices {
template.process(fmcontext, outWriter);
fulltext = outWriter.toString();
} catch (Exception ex) {
- return
ServiceUtil.returnError(UtilProperties.getMessage(resource,
"WebtoolsErrrorProcessingTemplateFile", UtilMisc.toMap("filename", fmfilename,
"errorString", ex.getMessage()), locale));
+ return
ServiceUtil.returnError(UtilProperties.getMessage(resource,
"WebtoolsErrorProcessingTemplateFile", UtilMisc.toMap("filename", fmfilename,
"errorString", ex.getMessage()), locale));
}
}
@@ -199,7 +199,7 @@ public class WebToolsServices {
}
Map<String, Object> outputMap =
dispatcher.runSync("parseEntityXmlFile", inputMap);
if (ServiceUtil.isError(outputMap)) {
- return
ServiceUtil.returnError(UtilProperties.getMessage(resource,
"WebtoolsErrrorParsingFile", UtilMisc.toMap("errorString",
ServiceUtil.getErrorMessage(outputMap)), locale));
+ return
ServiceUtil.returnError(UtilProperties.getMessage(resource,
"WebtoolsErrorParsingFile", UtilMisc.toMap("errorString",
ServiceUtil.getErrorMessage(outputMap)), locale));
} else {
Long numberRead = (Long)outputMap.get("rowProcessed");
messages.add(UtilProperties.getMessage(resource,
"EntityImportRowProcessed", UtilMisc.toMap("numberRead",
numberRead.toString()), locale));
Modified: ofbiz/trunk/framework/webtools/webapp/webtools/entity/ViewGeneric.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/entity/ViewGeneric.ftl?rev=1726485&r1=1726484&r2=1726485&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/entity/ViewGeneric.ftl
(original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/entity/ViewGeneric.ftl Sun
Jan 24 12:41:38 2016
@@ -124,7 +124,7 @@ function ShowTab(lname) {
</#list>
</#if>
<#else>
- ${uiLabelMap.WebtoolsEntityCretePermissionError}
${entityName} ${plainTableName}
+ ${uiLabelMap.WebtoolsEntityCreatePermissionError}
${entityName} ${plainTableName}
<#assign showFields = false>
</#if>
<#else>
@@ -165,7 +165,7 @@ function ShowTab(lname) {
</#list>
</#if>
<#else>
- <p>${uiLabelMap.WebtoolsEntityCretePermissionError}
${entityName} ${plainTableName}</p>
+ <p>${uiLabelMap.WebtoolsEntityCreatePermissionError}
${entityName} ${plainTableName}</p>
<#assign showFields = false>
</#if>
</#if>
Modified:
ofbiz/trunk/framework/webtools/webapp/webtools/entity/ViewRelations.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/entity/ViewRelations.ftl?rev=1726485&r1=1726484&r2=1726485&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/entity/ViewRelations.ftl
(original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/entity/ViewRelations.ftl Sun
Jan 24 12:41:38 2016
@@ -57,7 +57,7 @@ under the License.
</#list>
</table>
<#else>
- <h3>${uiLabelMap.WebtoolsEntityCretePermissionError} ${entityName}
${plainTableName}.</h3>
+ <h3>${uiLabelMap.WebtoolsEntityCreatePermissionError} ${entityName}
${plainTableName}.</h3>
</#if>
</div>
</div>