From cab2ccdd297fefff1b621abc42aba3a842d48e88 Mon Sep 17 00:00:00 2001 From: Hadi Nategh Date: Wed, 25 Jun 2014 16:26:59 +0000 Subject: [PATCH] Fix widget VFS button_caption translation --- etemplate/js/et2_widget_tree.js | 10 +++++----- etemplate/js/et2_widget_vfs.js | 2 +- etemplate/lang/egw_de.lang | 1 + etemplate/lang/egw_en.lang | 1 + filemanager/lang/egw_de.lang | 1 - filemanager/lang/egw_en.lang | 1 - mail/lang/egw_de.lang | 1 - mail/lang/egw_en.lang | 1 - 8 files changed, 8 insertions(+), 10 deletions(-) diff --git a/etemplate/js/et2_widget_tree.js b/etemplate/js/et2_widget_tree.js index 4a253ddf40..9a0d800223 100644 --- a/etemplate/js/et2_widget_tree.js +++ b/etemplate/js/et2_widget_tree.js @@ -500,13 +500,13 @@ var et2_tree = et2_inputWidget.extend( // Update action // since the action ID has to = this.id, getObjectById() won't work var treeObj = egw_getAppObjectManager().getObjectById(this.id); - for(var i=0; i < treeObj.children.length; i++) - { - if(treeObj.children[i].id == _id) + for(var i=0; i < treeObj.children.length; i++) { - treeObj.children.splice(i,1); + if(treeObj.children[i].id == _id) + { + treeObj.children.splice(i,1); + } } - } }, /** diff --git a/etemplate/js/et2_widget_vfs.js b/etemplate/js/et2_widget_vfs.js index 28acfbe69d..9aabd7fd02 100644 --- a/etemplate/js/et2_widget_vfs.js +++ b/etemplate/js/et2_widget_vfs.js @@ -623,7 +623,7 @@ var et2_vfsSelect = et2_inputWidget.extend( "button_caption":{ name: "button caption", type: "string", - default: "Upload file(s) from Filemanager...", + default: "Select files from Filemanager ...", description: "Caption for vfs-select button.", translate:true } diff --git a/etemplate/lang/egw_de.lang b/etemplate/lang/egw_de.lang index 67019daf0d..75b12906b2 100644 --- a/etemplate/lang/egw_de.lang +++ b/etemplate/lang/egw_de.lang @@ -386,6 +386,7 @@ select columns etemplate de Spalten auswählen select country etemplate de Land auswählen select day etemplate de Tag auswählen select day of week etemplate de Wochentag auswählen +select files from filemanager ... etemplate de Dateien aus Dateimanager auswählen ... select entry etemplate de Eintrag auswählen select hour etemplate de Stunde auswählen select if content of field should not be translated (label gets always translated) etemplate de abhaken wenn Inhalt des Feldes nicht übersetzt werden soll (Beschriftung wird immer übersetzt) diff --git a/etemplate/lang/egw_en.lang b/etemplate/lang/egw_en.lang index 089b9b495b..3d174c163d 100644 --- a/etemplate/lang/egw_en.lang +++ b/etemplate/lang/egw_en.lang @@ -388,6 +388,7 @@ select country etemplate en Select country select day etemplate en Select day select day of week etemplate en Select week day select entry etemplate en Select entry +select files from filemanager ... etemplate en Select files from Filemanager ... select hour etemplate en Select hour select if content of field should not be translated (label gets always translated) etemplate en Select if field content should not be translated, label gets always translated. select language etemplate en Select language diff --git a/filemanager/lang/egw_de.lang b/filemanager/lang/egw_de.lang index bc17f3f034..48dc4a4a7a 100644 --- a/filemanager/lang/egw_de.lang +++ b/filemanager/lang/egw_de.lang @@ -247,7 +247,6 @@ unused space filemanager de Nicht benutzter Platz up filemanager de Nach oben updated comment for %1 filemanager de Kommentar für %1 aktualisiert upload fields filemanager de Dateien hochladen -upload file(s) from filemanager... filemanager de Dateien aus dem Dateimanager upload files filemanager de Dateien hochladen use this tag for addresslabels. put the content, you want to repeat, between two tags. filemanager de Benutzen Sie dieses Symbol für Adressetiketten. Stellen Sie den Inhalt der wiederholt werden soll zwischen 2 Symbole. used space filemanager de Benutzter Platz diff --git a/filemanager/lang/egw_en.lang b/filemanager/lang/egw_en.lang index b6eae70a77..0953131432 100644 --- a/filemanager/lang/egw_en.lang +++ b/filemanager/lang/egw_en.lang @@ -247,7 +247,6 @@ unused space filemanager en Unused space up filemanager en Up updated comment for %1 filemanager en Updated comment for %1 upload fields filemanager en Upload fields -upload file(s) from filemanager... filemanager en Upload file(s) from Filemanager... upload files filemanager en Upload files use this tag for addresslabels. put the content, you want to repeat, between two tags. filemanager en Use this tag for addresslabels. Put the content, you want to repeat, between two tags. used space filemanager en Used space diff --git a/mail/lang/egw_de.lang b/mail/lang/egw_de.lang index 987acf0aac..d9dd38ae4c 100644 --- a/mail/lang/egw_de.lang +++ b/mail/lang/egw_de.lang @@ -425,7 +425,6 @@ undelete mail de Als gelöscht markiert entfernen unflagged mail de Markierung entfernen unread mail de ungelesen unsubscribe folder mail de Ordner Abbestellen -upload file(s) from filemanager... mail de Dateien aus dem EGroupware Dateimanager auswählen.. use default timeout (20 seconds) mail de verwende Standard Timeout (20 Sekunden) use regular expressions (see wikipedia for information on posix regular expressions) mail de reguläre Ausdrücke verwenden (siehe Wikipedia Artikel bzgl. POSIX Regular Expressions) use source as displayed, if applicable mail de Format wie E-Mailanzeige diff --git a/mail/lang/egw_en.lang b/mail/lang/egw_en.lang index d273af2bef..157a2cc08f 100644 --- a/mail/lang/egw_en.lang +++ b/mail/lang/egw_en.lang @@ -423,7 +423,6 @@ undelete mail en Undelete unflagged mail en Unflagged unread mail en unread unsubscribe folder mail en Unsubscribe folder -upload file(s) from filemanager... mail en Upload file(s) from Filemanager... use default timeout (20 seconds) mail en use default timeout (20 seconds) use regular expressions (see wikipedia for information on posix regular expressions) mail en Use regular expressions (see wikipedia for information on POSIX regular expressions) use source as displayed, if applicable mail en use source as displayed, if applicable