Merge branch 'develop' of http://github.com/pydio/pydio-core into dev…

…elop * 'develop' of http://github.com/pydio/pydio-core: Fix smb throw error and block access via webdav Fix notification sent to parent when parent is a template - could possibly break the hooks loop, preventing email. Fix detail display for date Fix missing Drag'n'drop for detail display (close #1354) Hide info panel blue toolbar if empty * Added new translation keys (user frontend)
pydio · Jun 2, 2017 · d6b4fa8 · d6b4fa8
2 parents 41eaa82 + 9742f40
commit d6b4fa8
Show file tree

Hide file tree

Showing 58 changed files with 233 additions and 42 deletions.
diff --git a/core/src/plugins/access.ajxp_conf/res/i18n/admin/de.php b/core/src/plugins/access.ajxp_conf/res/i18n/admin/de.php
@@ -106,10 +106,10 @@
     "home.49" => "Widgets hinzufügen/entfernen",
     "home.50" => "Widget hinzufügen...",
     "home.51" => "Dadurch wird Ihr Layout verloren gehen. Möchten Sie fortfahren?",
-    "home.52" => "Widget erstellen",
+    "home.52" => "Widget hinzufügen",
     "home.53" => "Dashboard konfigurieren",
     "home.54" => "Bestehende Widgets können durch einen Klick auf ENTFERNEN ausgeblendet werden. ",
-    "home.55" => "Wählen Sie unterhalb einen Typ aus, um ein neues Widget zu erstellen.",
+    "home.55" => "Wählen Sie unterhalb einen Typ aus, um ein neues Widget hinzuzufügen.",
     "home.56" => "Layout zurücksetzen",
 
     // Default Widgets

diff --git a/core/src/plugins/access.ajxp_home/res/i18n/ca.php b/core/src/plugins/access.ajxp_home/res/i18n/ca.php
@@ -153,4 +153,7 @@
     "89" => "Selected file for upload",
     "90" => "Select target workspace",
     "91" => "Keep your files offline with our Desktop Sync Client",
-);
+    "92" => "Applications Download",
+    "93" => "Quick Upload",
+    "94" => "Video Tutorial",
+);
diff --git a/core/src/plugins/access.ajxp_home/res/i18n/de.php b/core/src/plugins/access.ajxp_home/res/i18n/de.php
@@ -32,7 +32,7 @@
 "46"=> "Adressbuch",
 "47"=> "Von Ihnen erstellte Benutzer",
 "48"=> "Meine Benutzer",
-"49"=> "Externe Benutzer, die Sie erstellt haben",
+"49"=> "Freigaben-Benutzer, die Sie erstellt haben",
 "50"=> "Meine Teams",
 "51"=> "Um Inhalte schnell an einen bestimmten Personenkreis freizugeben.",
 "52"=> "Möchten Sie dieses Team wirklich löschen? Es werden dabei keine Benutzer gelöscht.",
@@ -150,4 +150,7 @@
     "89" => "Zum Hochladen ausgeählte Datei",
     "90" => "Ziel-Arbeitsumgebung auswählen",
     "91" => "Dateien mit dem Sync-Client offline synchronisieren",
+    "92" => "Programme herunterladen",
+    "93" => "Dateien hochladen",
+    "94" => "Video-Tutorial",
 );
diff --git a/core/src/plugins/access.ajxp_home/res/i18n/en.php b/core/src/plugins/access.ajxp_home/res/i18n/en.php
@@ -151,4 +151,7 @@
     "89" => "Selected file for upload",
     "90" => "Select target workspace",
     "91" => "Keep your files offline with our Desktop Sync Client",
+    "92" => "Applications Download",
+    "93" => "Quick Upload",
+    "94" => "Video Tutorial",
 );
diff --git a/core/src/plugins/access.ajxp_home/res/i18n/es.php b/core/src/plugins/access.ajxp_home/res/i18n/es.php
@@ -155,4 +155,7 @@
     "89" => "Seleccionado archivo para subir",
     "90" => "Seleccionar workspace de destino",
     "91" => "Archivos offline con Desktop Sync Client",
+    "92" => "Applications Download",
+    "93" => "Quick Upload",
+    "94" => "Video Tutorial",
 );
diff --git a/core/src/plugins/access.ajxp_home/res/i18n/fr.php b/core/src/plugins/access.ajxp_home/res/i18n/fr.php
@@ -152,4 +152,7 @@
     "89" => "Fichier sélectionné",
     "90" => "Choisir un workspace de destination",
     "91" => "Vos fichiers hors-ligne avec l'application de synchro",
+    "92" => "Applications Download",
+    "93" => "Quick Upload",
+    "94" => "Video Tutorial",
 );
diff --git a/core/src/plugins/access.ajxp_home/res/i18n/hu.php b/core/src/plugins/access.ajxp_home/res/i18n/hu.php
@@ -153,4 +153,7 @@
     "89" => "Selected file for upload",
     "90" => "Select target workspace",
     "91" => "Keep your files offline with our Desktop Sync Client",
+    "92" => "Applications Download",
+    "93" => "Quick Upload",
+    "94" => "Video Tutorial",
 );
diff --git a/core/src/plugins/access.ajxp_home/res/i18n/it.php b/core/src/plugins/access.ajxp_home/res/i18n/it.php
@@ -150,4 +150,7 @@
     "89" => "Selected file for upload",
     "90" => "Select target workspace",
     "91" => "Keep your files offline with our Desktop Sync Client",
+    "92" => "Applications Download",
+    "93" => "Quick Upload",
+    "94" => "Video Tutorial",
 );
diff --git a/core/src/plugins/access.ajxp_home/res/i18n/nl.php b/core/src/plugins/access.ajxp_home/res/i18n/nl.php
@@ -150,5 +150,8 @@
     "89" => "Selected file for upload",
     "90" => "Select target workspace",
     "91" => "Keep your files offline with our Desktop Sync Client",
+    "92" => "Applications Download",
+    "93" => "Quick Upload",
+    "94" => "Video Tutorial",
 );
 
diff --git a/core/src/plugins/access.ajxp_home/res/i18n/pt-br.php b/core/src/plugins/access.ajxp_home/res/i18n/pt-br.php
@@ -150,4 +150,7 @@
     "89" => "Selected file for upload",
     "90" => "Select target workspace",
     "91" => "Keep your files offline with our Desktop Sync Client",
+    "92" => "Applications Download",
+    "93" => "Quick Upload",
+    "94" => "Video Tutorial",
 );
diff --git a/core/src/plugins/access.ajxp_home/res/i18n/pt.php b/core/src/plugins/access.ajxp_home/res/i18n/pt.php
@@ -150,4 +150,7 @@
     "89" => "Selected file for upload",
     "90" => "Select target workspace",
     "91" => "Keep your files offline with our Desktop Sync Client",
+    "92" => "Applications Download",
+    "93" => "Quick Upload",
+    "94" => "Video Tutorial",
 );
diff --git a/core/src/plugins/access.ajxp_home/res/i18n/ru.php b/core/src/plugins/access.ajxp_home/res/i18n/ru.php
@@ -150,4 +150,7 @@
     "89" => "Selected file for upload",
     "90" => "Select target workspace",
     "91" => "Keep your files offline with our Desktop Sync Client",
+    "92" => "Applications Download",
+    "93" => "Quick Upload",
+    "94" => "Video Tutorial",
 );
diff --git a/core/src/plugins/access.ajxp_home/res/i18n/si.php b/core/src/plugins/access.ajxp_home/res/i18n/si.php
@@ -151,4 +151,7 @@
     "89" => "Selected file for upload",
     "90" => "Select target workspace",
     "91" => "Keep your files offline with our Desktop Sync Client",
+    "92" => "Applications Download",
+    "93" => "Quick Upload",
+    "94" => "Video Tutorial",
 );
diff --git a/core/src/plugins/access.ajxp_home/res/react/apps/DlAppsCard.js b/core/src/plugins/access.ajxp_home/res/react/apps/DlAppsCard.js
@@ -111,5 +111,5 @@ let DlAppsCard = React.createClass({
     }
 });
 
-DlAppsCard = asGridItem(DlAppsCard,'Applications Download',{gridWidth:2,gridHeight:10},[]);
+DlAppsCard = asGridItem(DlAppsCard,global.pydio.MessageHash['user_home.92'],{gridWidth:2,gridHeight:10},[]);
 export {DlAppsCard as default}
diff --git a/core/src/plugins/access.ajxp_home/res/react/quicksend/QuickSendCard.js b/core/src/plugins/access.ajxp_home/res/react/quicksend/QuickSendCard.js
@@ -110,5 +110,5 @@ let QuickSendCard = React.createClass({
 
 });
 
-QuickSendCard = asGridItem(QuickSendCard,'Quick Upload',{gridWidth:2,gridHeight:10},[]);
+QuickSendCard = asGridItem(QuickSendCard,global.pydio.MessageHash['user_home.93'],{gridWidth:2,gridHeight:10},[]);
 export {QuickSendCard as default}
diff --git a/core/src/plugins/access.ajxp_home/res/react/videos/VideoCard.js b/core/src/plugins/access.ajxp_home/res/react/videos/VideoCard.js
@@ -131,5 +131,5 @@ let VideoCard = React.createClass({
     }
 });
 
-VideoCard = asGridItem(VideoCard,'Video Tutorial',{gridWidth:2,gridHeight:12},[]);
+VideoCard = asGridItem(VideoCard,global.pydio.MessageHash['user_home.94'],{gridWidth:2,gridHeight:12},[]);
 export {VideoCard as default}
diff --git a/core/src/plugins/access.fs/FsAccessDriver.php b/core/src/plugins/access.fs/FsAccessDriver.php
@@ -1743,7 +1743,8 @@ public function localizeNodeInfo(&$ajxpNode, $parentNode = false, $details = fal
         $currentMeta = $ajxpNode->getNodeInfoMeta();
         if(!empty($currentMeta["ajxp_modiftime"])){
             $dateModif = $currentMeta["ajxp_modiftime"];
-            $localMeta["ajxp_description"] = $localMeta["ajxp_relativetime"] = $messages[4]." ". StatHelper::relativeDate($dateModif, $messages);
+            $localMeta["ajxp_relativetime"] = StatHelper::relativeDate($dateModif, $messages);
+            $localMeta["ajxp_description"] = $messages[4]." ". $localMeta["ajxp_relativetime"];
         }
 
         // Recompute human readable size

diff --git a/core/src/plugins/access.smb/smb.php b/core/src/plugins/access.smb/smb.php
@@ -272,7 +272,9 @@ public function client ($params, $purl)
                                 : array();
                             break;
                         case 'error':
-                            if (strstr($regs[1], "NO_SUCH_FILE") !== false) {
+                            if ((strstr($regs[1], "NO_SUCH_FILE") !== false) ||
+                                (strstr($regs[1], "OBJECT_NAME_NOT_FOUND") !== false)
+                            ){
                                 return "NOT_FOUND";
                             }
                             trigger_error($regs[1], E_USER_ERROR);

diff --git a/core/src/plugins/action.user/res/js/ModalDashboard.js b/core/src/plugins/action.user/res/js/ModalDashboard.js
@@ -47,7 +47,7 @@ let ModalDashboard = React.createClass({
     },
 
     getDefaultButtons: function(){
-        return [<FlatButton label="Close" onTouchTap={this.props.onDismiss}/>];
+        return [<FlatButton label={this.props.pydio.MessageHash[86]} onTouchTap={this.props.onDismiss}/>];
     },
 
     getButtons: function(updater){

diff --git a/core/src/plugins/action.user/res/js/PasswordPopover.js b/core/src/plugins/action.user/res/js/PasswordPopover.js
@@ -74,7 +74,7 @@ class PasswordPopover extends React.Component{
                         />
                         <Divider/>
                         <div style={{textAlign:'right', padding: '8px 0'}}>
-                            <FlatButton label="Cancel" onTouchTap={this.passClosePopover.bind(this)}/>
+                            <FlatButton label={this.props.pydio.MessageHash[49]} onTouchTap={this.passClosePopover.bind(this)}/>
                             <FlatButton disabled={!passValid} label="Ok" onTouchTap={this.passSubmit.bind(this)}/>
                         </div>
                     </div>

diff --git a/core/src/plugins/action.user/res/js/ProfilePane.js b/core/src/plugins/action.user/res/js/ProfilePane.js
@@ -88,10 +88,10 @@ let ProfilePane = React.createClass({
         if(updater) this._updater = updater;
         let button, revert;
         if(this.state.dirty){
-            revert = <FlatButton label={"Revert"} onTouchTap={this.revert}/>;
+            revert = <FlatButton label={this.props.pydio.MessageHash[628]} onTouchTap={this.revert}/>;
             button = <FlatButton label={this.props.pydio.MessageHash[53]} secondary={true} onTouchTap={this.saveForm}/>;
         }else{
-            button = <FlatButton label="Close" onTouchTap={this.props.onDismiss}/>;
+            button = <FlatButton label={this.props.pydio.MessageHash[86]} onTouchTap={this.props.onDismiss}/>;
         }
         if(this.props.pydio.Controller.getActionByName('pass_change')){
             return [

diff --git a/core/src/plugins/core.ajaxplorer/i18n/ca.php b/core/src/plugins/core.ajaxplorer/i18n/ca.php
@@ -726,5 +726,10 @@
 "623" => "Copy",
 "624" => "Copied!",
 "625" => "Letter",
+"626" => "Files Shared with me",
+"627" => "Shares from remote servers",
+"628" => "Revert",
+"629" => "No records yet",
+"630" => "Folders shared with me",
 
 );
diff --git a/core/src/plugins/core.ajaxplorer/i18n/cs.php b/core/src/plugins/core.ajaxplorer/i18n/cs.php
@@ -723,4 +723,9 @@
 "623" => "Copy",
 "624" => "Copied!",
 "625" => "Letter",
+"626" => "Files Shared with me",
+"627" => "Shares from remote servers",
+"628" => "Revert",
+"629" => "No records yet",
+"630" => "Folders shared with me",
 );
diff --git a/core/src/plugins/core.ajaxplorer/i18n/da.php b/core/src/plugins/core.ajaxplorer/i18n/da.php
@@ -728,5 +728,10 @@
 "623" => "Copy",
 "624" => "Copied!",
 "625" => "Letter",
+"626" => "Files Shared with me",
+"627" => "Shares from remote servers",
+"628" => "Revert",
+"629" => "No records yet",
+"630" => "Folders shared with me",
 /* END SENTENCE */
-);
+);
diff --git a/core/src/plugins/core.ajaxplorer/i18n/de.php b/core/src/plugins/core.ajaxplorer/i18n/de.php
@@ -237,7 +237,7 @@
 "177" => "Sollen die gewählten Dateien/Ordner wirklich gelöscht werden?",
 "178" => "Zurück",
 "179" => "Weiter",
-"180" => "Bitte Benutzernamen und Passwort eingeben",
+"180" => "Anmeldung",
 "181" => "Benutzername",
 "182" => "Passwort",
 "183" => "Bitte einen vom Quellordner unterschiedlichen Zielordner wählen!",
@@ -307,8 +307,8 @@
 "246" => "Meldung",
 "247" => "Entpacken",
 "248" => "Ausgewählte Dateien entpacken nach...",
-"249" => "Benutzerverwaltung",
-"250" => "Verzeichnisverwaltung",
+"249" => "Benutzer",
+"250" => "Ordner",
 "251" => "Log-Dateien",
 "252" => "Maximal erlaubte Dateigröße erreicht.",
 "253" => "Ein HTTP-Fehler ist aufgetreten:",
@@ -319,7 +319,7 @@
 "258" => "Anzahl der Dateien:",
 "259" => "Gesamtgröße:",
 "260" => "Bytes",
-"261" => "Auf diesem Computer merken",
+"261" => "Anmeldung merken",
 "262" => "Eine oder mehrere Dateien \\nexistieren im Zielordner!",
 "263" => "überschreiben",
 "264" => "überspringen",
@@ -514,7 +514,7 @@
 "452" => "Thumbnails Größe",
 "453" => "Setze Größe der Thumbnails",
 "454" => "Durchsuchen",
-"455" => "Meine Arbeitsumgebung",
+"455" => "Arbeitsumgebungen",
 "456" => "Mehr",
 "457" => "Bearbeiten",
 "458" => "löschen",
@@ -529,8 +529,8 @@
 "465" => "Zeige alternative URLs (momentane Arbeitsumgebungen)",
 "466" => "Lade...",
 "467" => "Alle geteilten Inhalte",
-"468" => "Meine Arbeitsumgebung",
-"469" => "Mit mir Geteilt",
+"468" => "Meine Arbeitsumgebungen",
+"469" => "Mit mir geteilt",
 "470" => "Erstellt %date",
 "471" => "Erstellt von %user %date",
 "472" => "Geteilt von %user",
@@ -590,7 +590,7 @@
 "526"=> "Niedrig aufgelöste Version zur schnellen Anzeige",
 "527"=> "Geteilt mit",
 "528"=> "Interne Benutzer",
-"530"=> "Externe Benutzer",
+"530"=> "Freigaben-Benutzer",
 "531"=> "Benutzer",
 "532"=> "Gruppen",
 "533" => "Kennung für die Anmeldung (nur alphanumerische Zeichen und Kleinschreibung)",
@@ -677,32 +677,32 @@
 "570" => "Team löschen",
 "571" => "Keine Teams",
 "572" => "Erstellen Sie Teams, um Elemente einfach freizugeben",
-"573" => "Benutzer zum Team hinzufügen",
+"573" => "Benutzer zu Team hinzufügen",
 "574" => "Aus Team entfernen",
 "575" => "Teammitglieder",
 "576" => "%s Mitglieder",
 "577" => "Keine Mitglieder",
 "578" => "Name des Teams",
 "579" => "Team erstellen",
 "580" => "Name des Teams bearbeiten",
-"581" => "Benutzer ist Mitglied von %s Team(s)",
+"581" => "Benutzer ist Mitglied in %s Team(s)",
 "582" => "Benutzer löschen",
 "583" => "Ordner durchsuchen",
 "584" => "Verzeichnis",
 "585" => "Keine Freigaben-Benutzer",
 "586" => "Legen Sie Benutzer an, um Dateien und Ordner Ihrer Arbeitsumgebung freizugeben.",
 "587" => "Keine Ergebnisse gefunden",
 "588" => "Geben Sie einen Suchbegriff ein, um Benutzer zu finden",
-"589" => "Externe Benutzer",
-"590" => "Interne Benutzer",
+"589" => "Freigaben-Benutzer",
+"590" => "Interner Benutzer",
 "591" => "Legen Sie einen Namen für das Team fest, bevor Sie Benutzer hinzufügen können.",
 "592" => "Adressbuch",
 "593" => "Meine Benutzer",
 "594" => "Vertrauenswürdige Server",
 "595" => "Benutzer suchen...",
 "596" => "Server '%s'",
 "597" => "Alle",
-"598" => "Nachricht sendene",
+"598" => "Nachricht senden",
 "599" => "Benutzen hinzufügen",
 "600" => "Benutzer bearbeiten",
 "601" => "%1 hat %2 Element(e) für Sie freigegeben.",
@@ -730,6 +730,11 @@
 "623" => "Kopieren",
 "624" => "Erfolgreich kopiert!",
 "625" => "Letter",
+"626" => "Mit mir geteilte Ordner",
+"627" => "Remote-Server-Freigaben",
+"628" => "Zurücksetzen",
+"629" => "Noch keine Einträge",
+"630" => "Mit mir geteilte Dateien",
 /* END SENTENCE */
 /* password strength tester */
 );
diff --git a/core/src/plugins/core.ajaxplorer/i18n/en.php b/core/src/plugins/core.ajaxplorer/i18n/en.php
@@ -725,4 +725,9 @@
 "623" => "Copy",
 "624" => "Copied!",
 "625" => "Letter",
+"626" => "Files Shared with me",
+"627" => "Shares from remote servers",
+"628" => "Revert",
+"629" => "No records yet",
+"630" => "Folders shared with me",
 );
diff --git a/core/src/plugins/core.ajaxplorer/i18n/es.php b/core/src/plugins/core.ajaxplorer/i18n/es.php
@@ -730,4 +730,9 @@
 "623" => "Copy",
 "624" => "Copied!",
 "625" => "Letter",
+"626" => "Files Shared with me",
+"627" => "Shares from remote servers",
+"628" => "Revert",
+"629" => "No records yet",
+"630" => "Folders shared with me",
 );
diff --git a/core/src/plugins/core.ajaxplorer/i18n/et.php b/core/src/plugins/core.ajaxplorer/i18n/et.php
@@ -726,5 +726,10 @@
 "623" => "Copy",
 "624" => "Copied!",
 "625" => "Letter",
+"626" => "Files Shared with me",
+"627" => "Shares from remote servers",
+"628" => "Revert",
+"629" => "No records yet",
+"630" => "Folders shared with me",
 /* END SENTENCE */
 );
diff --git a/core/src/plugins/core.ajaxplorer/i18n/eus.php b/core/src/plugins/core.ajaxplorer/i18n/eus.php
@@ -724,5 +724,10 @@
 "623" => "Copy",
 "624" => "Copied!",
 "625" => "Letter",
+"626" => "Files Shared with me",
+"627" => "Shares from remote servers",
+"628" => "Revert",
+"629" => "No records yet",
+"630" => "Folders shared with me",
 /* END SENTENCE */
 );
diff --git a/core/src/plugins/core.ajaxplorer/i18n/fi.php b/core/src/plugins/core.ajaxplorer/i18n/fi.php
@@ -726,5 +726,10 @@
 "623" => "Copy",
 "624" => "Copied!",
 "625" => "Letter",
+"626" => "Files Shared with me",
+"627" => "Shares from remote servers",
+"628" => "Revert",
+"629" => "No records yet",
+"630" => "Folders shared with me",
 /* END SENTENCE */
 );