From a6faa34e0669ec10e021f311a01549a8e658a5a1 Mon Sep 17 00:00:00 2001 From: Sergio Ribeiro Date: Fri, 17 Jan 2025 12:17:25 +0000 Subject: [PATCH 1/3] [PDI-19926] Put a file with FTP: An error doesn't occur when we change the local directory permissions. --- .../pentaho/di/job/entries/ftpput/JobEntryFTPPUT.java | 10 ++++++++++ .../entries/ftpput/messages/messages_en_US.properties | 2 ++ 2 files changed, 12 insertions(+) diff --git a/plugins/put-a-file-with-ftp/impl/src/main/java/org/pentaho/di/job/entries/ftpput/JobEntryFTPPUT.java b/plugins/put-a-file-with-ftp/impl/src/main/java/org/pentaho/di/job/entries/ftpput/JobEntryFTPPUT.java index 4232fefb4a0b..e94d94b4dfd2 100644 --- a/plugins/put-a-file-with-ftp/impl/src/main/java/org/pentaho/di/job/entries/ftpput/JobEntryFTPPUT.java +++ b/plugins/put-a-file-with-ftp/impl/src/main/java/org/pentaho/di/job/entries/ftpput/JobEntryFTPPUT.java @@ -21,6 +21,7 @@ import java.io.IOException; import java.net.InetAddress; import java.net.URI; +import java.nio.file.Files; import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -635,6 +636,15 @@ public Result execute( Result previousResult, int nr ) { File localFiles = new File( realLocalDirectory ); File[] children = localFiles.listFiles(); if ( children == null ) { + // Unable to read local directory for some reason... + if ( log.isDebug() ) { + logDebug( + BaseMessages.getString( PKG, "JobFTPPUT.Log.UnableToReadLocalDirectoryExtended", realLocalDirectory, + Files.isReadable( localFiles.toPath() ) ) ); + } else if ( log.isDetailed() ) { + logDetailed( + BaseMessages.getString( PKG, "JobFTPPUT.Log.UnableToReadLocalDirectory", realLocalDirectory ) ); + } files = Collections.emptyList(); } else { files = new ArrayList( children.length ); diff --git a/plugins/put-a-file-with-ftp/impl/src/main/resources/org/pentaho/di/job/entries/ftpput/messages/messages_en_US.properties b/plugins/put-a-file-with-ftp/impl/src/main/resources/org/pentaho/di/job/entries/ftpput/messages/messages_en_US.properties index 681d1f940ec7..4b97b88e753a 100644 --- a/plugins/put-a-file-with-ftp/impl/src/main/resources/org/pentaho/di/job/entries/ftpput/messages/messages_en_US.properties +++ b/plugins/put-a-file-with-ftp/impl/src/main/resources/org/pentaho/di/job/entries/ftpput/messages/messages_en_US.properties @@ -108,3 +108,5 @@ JobFTPPUT.Password.Label=Password\: JobFTPPUT.Tab.General.Label=General JobFTPPUT.ProxyHost.Label=Proxy host JobFTPPUT.Log.UnableToLoadFromXml=Unable to load job entry of type ''FTPPUT'' from XML node +JobFTPPUT.Log.UnableToReadLocalDirectory=Unable to get list of files from local directory [{0}] possibly due to insufficient permissions. +JobFTPPUT.Log.UnableToReadLocalDirectoryExtended=Unable to get list of files from local directory [{0}] possibly due to insufficient permissions (Readable=[{1}]). From b5f75bbe1c87adc30c34e15dc1716e6e45b87243 Mon Sep 17 00:00:00 2001 From: Sergio Ribeiro Date: Fri, 17 Jan 2025 12:23:06 +0000 Subject: [PATCH 2/3] [CLEANUP] Sonar suggestions --- .../di/job/entries/ftpput/JobEntryFTPPUT.java | 57 +++++++++---------- 1 file changed, 28 insertions(+), 29 deletions(-) diff --git a/plugins/put-a-file-with-ftp/impl/src/main/java/org/pentaho/di/job/entries/ftpput/JobEntryFTPPUT.java b/plugins/put-a-file-with-ftp/impl/src/main/java/org/pentaho/di/job/entries/ftpput/JobEntryFTPPUT.java index e94d94b4dfd2..a184586fcb5f 100644 --- a/plugins/put-a-file-with-ftp/impl/src/main/java/org/pentaho/di/job/entries/ftpput/JobEntryFTPPUT.java +++ b/plugins/put-a-file-with-ftp/impl/src/main/java/org/pentaho/di/job/entries/ftpput/JobEntryFTPPUT.java @@ -207,45 +207,45 @@ public void loadXML( Node entrynode, List databases, List databases, + public void loadRep( Repository rep, IMetaStore metaStore, ObjectId jobEntryId, List databases, List slaveServers ) throws KettleException { try { - serverName = rep.getJobEntryAttributeString( id_jobentry, "servername" ); - serverPort = rep.getJobEntryAttributeString( id_jobentry, "serverport" ); - userName = rep.getJobEntryAttributeString( id_jobentry, "username" ); + serverName = rep.getJobEntryAttributeString( jobEntryId, "servername" ); + serverPort = rep.getJobEntryAttributeString( jobEntryId, "serverport" ); + userName = rep.getJobEntryAttributeString( jobEntryId, "username" ); password = - Encr.decryptPasswordOptionallyEncrypted( rep.getJobEntryAttributeString( id_jobentry, "password" ) ); - remoteDirectory = rep.getJobEntryAttributeString( id_jobentry, "remoteDirectory" ); - localDirectory = rep.getJobEntryAttributeString( id_jobentry, "localDirectory" ); - wildcard = rep.getJobEntryAttributeString( id_jobentry, "wildcard" ); - binaryMode = rep.getJobEntryAttributeBoolean( id_jobentry, "binary" ); - timeout = (int) rep.getJobEntryAttributeInteger( id_jobentry, "timeout" ); - remove = rep.getJobEntryAttributeBoolean( id_jobentry, "remove" ); - onlyPuttingNewFiles = rep.getJobEntryAttributeBoolean( id_jobentry, "only_new" ); - activeConnection = rep.getJobEntryAttributeBoolean( id_jobentry, "active" ); - controlEncoding = rep.getJobEntryAttributeString( id_jobentry, "control_encoding" ); + Encr.decryptPasswordOptionallyEncrypted( rep.getJobEntryAttributeString( jobEntryId, "password" ) ); + remoteDirectory = rep.getJobEntryAttributeString( jobEntryId, "remoteDirectory" ); + localDirectory = rep.getJobEntryAttributeString( jobEntryId, "localDirectory" ); + wildcard = rep.getJobEntryAttributeString( jobEntryId, "wildcard" ); + binaryMode = rep.getJobEntryAttributeBoolean( jobEntryId, "binary" ); + timeout = (int) rep.getJobEntryAttributeInteger( jobEntryId, "timeout" ); + remove = rep.getJobEntryAttributeBoolean( jobEntryId, "remove" ); + onlyPuttingNewFiles = rep.getJobEntryAttributeBoolean( jobEntryId, "only_new" ); + activeConnection = rep.getJobEntryAttributeBoolean( jobEntryId, "active" ); + controlEncoding = rep.getJobEntryAttributeString( jobEntryId, "control_encoding" ); if ( controlEncoding == null ) { // if we couldn't retrieve an encoding, assume it's an old instance and - // put in the the encoding used before v 2.4.0 + // put in the encoding used before v 2.4.0 controlEncoding = LEGACY_CONTROL_ENCODING; } - proxyHost = rep.getJobEntryAttributeString( id_jobentry, "proxy_host" ); - proxyPort = rep.getJobEntryAttributeString( id_jobentry, "proxy_port" ); - proxyUsername = rep.getJobEntryAttributeString( id_jobentry, "proxy_username" ); + proxyHost = rep.getJobEntryAttributeString( jobEntryId, "proxy_host" ); + proxyPort = rep.getJobEntryAttributeString( jobEntryId, "proxy_port" ); + proxyUsername = rep.getJobEntryAttributeString( jobEntryId, "proxy_username" ); proxyPassword = Encr - .decryptPasswordOptionallyEncrypted( rep.getJobEntryAttributeString( id_jobentry, "proxy_password" ) ); - socksProxyHost = rep.getJobEntryAttributeString( id_jobentry, "socksproxy_host" ); - socksProxyPort = rep.getJobEntryAttributeString( id_jobentry, "socksproxy_port" ); - socksProxyUsername = rep.getJobEntryAttributeString( id_jobentry, "socksproxy_username" ); + .decryptPasswordOptionallyEncrypted( rep.getJobEntryAttributeString( jobEntryId, "proxy_password" ) ); + socksProxyHost = rep.getJobEntryAttributeString( jobEntryId, "socksproxy_host" ); + socksProxyPort = rep.getJobEntryAttributeString( jobEntryId, "socksproxy_port" ); + socksProxyUsername = rep.getJobEntryAttributeString( jobEntryId, "socksproxy_username" ); socksProxyPassword = Encr.decryptPasswordOptionallyEncrypted( rep.getJobEntryAttributeString( - id_jobentry, "socksproxy_password" ) ); + jobEntryId, "socksproxy_password" ) ); } catch ( KettleException dbe ) { throw new KettleException( BaseMessages.getString( PKG, "JobFTPPUT.UnableToLoadFromRepo", String - .valueOf( id_jobentry ) ), dbe ); + .valueOf( jobEntryId ) ), dbe ); } } @@ -609,7 +609,7 @@ public Result execute( Result previousResult, int nr ) { logDetailed( BaseMessages.getString( PKG, "JobFTPPUT.Log.Logged", realUsername ) ); } - // Fix for PDI-2534 - add auxilliary FTP File List parsers to the ftpclient object. + // Fix for PDI-2534 - add auxiliary FTP File List parsers to the ftpclient object. this.hookInOtherParsers( ftpclient ); // move to spool dir ... @@ -631,7 +631,6 @@ public Result execute( Result previousResult, int nr ) { } } - final List files; File localFiles = new File( realLocalDirectory ); File[] children = localFiles.listFiles(); @@ -647,7 +646,7 @@ public Result execute( Result previousResult, int nr ) { } files = Collections.emptyList(); } else { - files = new ArrayList( children.length ); + files = new ArrayList<>( children.length ); for ( File child : children ) { // Get filename of file or directory if ( !child.isDirectory() ) { @@ -811,7 +810,7 @@ FTPClient createAndSetUpFtpClient() throws IOException, FTPException { if ( !Utils.isEmpty( socksProxyUsername ) && Utils.isEmpty( socksProxyPassword ) || Utils.isEmpty( socksProxyUsername ) && !Utils.isEmpty( socksProxyPassword ) ) { - // we have a username without a password or vica versa + // we have a username without a password or vice versa throw new FTPException( BaseMessages.getString( PKG, "JobFTPPUT.SocksProxy.IncompleteCredentials", environmentSubstitute( socksProxyHost ), getName() ) ); @@ -898,7 +897,7 @@ protected void hookInOtherParsers( FTPClient ftpClient ) throws FTPException, IO Object parserInstance = null; for ( int i = 0; i < parserClasses.length; i++ ) { cName = parserClasses[ i ].trim(); - if ( cName.length() > 0 ) { + if ( !cName.isEmpty() ) { try { clazz = Class.forName( cName ); parserInstance = clazz.newInstance(); From aaea421dd4c009d558dad9c139afc389aff4da7e Mon Sep 17 00:00:00 2001 From: Sergio Ribeiro Date: Fri, 17 Jan 2025 12:23:35 +0000 Subject: [PATCH 3/3] [PDI-19926] Fix MVSFileParser messages --- .../ftp/messages/messages_en_US.properties | 23 +++++++++++++++++ .../ftp/messages/messages_fr_FR.properties | 10 ++++++++ .../ftp/messages/messages_it_IT.properties | 23 +++++++++++++++++ .../ftp/messages/messages_ja_JP.properties | 23 +++++++++++++++++ .../ftp/messages/messages_en_US.properties | 25 ------------------- .../ftp/messages/messages_fr_FR.properties | 10 -------- .../ftp/messages/messages_it_IT.properties | 23 ----------------- .../ftp/messages/messages_ja_JP.properties | 25 ------------------- 8 files changed, 79 insertions(+), 83 deletions(-) create mode 100644 engine/src/main/resources/org/pentaho/di/job/entries/ftp/messages/messages_en_US.properties create mode 100644 engine/src/main/resources/org/pentaho/di/job/entries/ftp/messages/messages_fr_FR.properties create mode 100644 engine/src/main/resources/org/pentaho/di/job/entries/ftp/messages/messages_it_IT.properties create mode 100644 engine/src/main/resources/org/pentaho/di/job/entries/ftp/messages/messages_ja_JP.properties diff --git a/engine/src/main/resources/org/pentaho/di/job/entries/ftp/messages/messages_en_US.properties b/engine/src/main/resources/org/pentaho/di/job/entries/ftp/messages/messages_en_US.properties new file mode 100644 index 000000000000..eab7eda3ca20 --- /dev/null +++ b/engine/src/main/resources/org/pentaho/di/job/entries/ftp/messages/messages_en_US.properties @@ -0,0 +1,23 @@ +MVSFileParser.DEBUG.Checking.Parser=Checking MVS Parser for Valid Format... +MVSFileParser.DEBUG.Date.Parse.Choose.Alt=Choosing alternate format - {0} +MVSFileParser.DEBUG.Date.Parse.Error=Date parse exception - probably swapped day/month +MVSFileParser.DEBUG.Detected.Migrated=Detected a migrated entry +MVSFileParser.DEBUG.Found.File=Found a file (PS) - {0} +MVSFileParser.DEBUG.Found.Folder=Found a folder (PO/PO-E) - {0} +MVSFileParser.DEBUG.Guess.Date.Ambiguous=Ambiguous one - found obvious year, but day/month could be wrong so created alternate +MVSFileParser.DEBUG.Guess.Date.Decided=Decided on {0} +MVSFileParser.DEBUG.Guess.Date.Obvious=Easy one - found obvious year, and obvious day +MVSFileParser.DEBUG.Guess.Date.Unparsable=Parse failed - Invalid Date: {0} +MVSFileParser.DEBUG.Guess.Date.Year.Ambiguous=Could not figure out year from this date format: {0} +MVSFileParser.DEBUG.Guess.Date=Guessing the date format... +MVSFileParser.DEBUG.Ignore.Locale=Ignoring the set locale. +MVSFileParser.DEBUG.Skip.ARCIVE=Skipping ARCIVE file - not supported +MVSFileParser.DEBUG.Skip.Header=Skipping header +MVSFileParser.DEBUG.Skip.Migrated=Skipping Migrated file - not supported +MVSFileParser.DEBUG.Skip.dso=Skipping unsupported organization - must be PS, PO, or PO-E +MVSFileParser.DEBUG.Skip.recf=Skipping unsupported recf - needs to start with F or V +MVSFileParser.ERROR.Date.Parse.Fail=FAIL - no alternate to fall back on. Date cannot be parsed - {0} +MVSFileParser.ERROR.Invalid.Folder.Line=Invalid Directory Line: {0} +MVSFileParser.ERROR.Invalid.PDS.Line=Invalid PDS Line: {0} +MVSFileParser.INFO.Detected.Dir=Detected MVS Directory Listing Format +MVSFileParser.INFO.Detected.PDS=Detected MVS Partitioned Dataset Listing Format diff --git a/engine/src/main/resources/org/pentaho/di/job/entries/ftp/messages/messages_fr_FR.properties b/engine/src/main/resources/org/pentaho/di/job/entries/ftp/messages/messages_fr_FR.properties new file mode 100644 index 000000000000..802ff9aa124e --- /dev/null +++ b/engine/src/main/resources/org/pentaho/di/job/entries/ftp/messages/messages_fr_FR.properties @@ -0,0 +1,10 @@ +MVSFileParser.DEBUG.Date.Parse.Choose.Alt=Utilisation de format de date alternatif- {0} +MVSFileParser.DEBUG.Date.Parse.Error=Erreur lors de l''analyse de la date +MVSFileParser.DEBUG.Found.File=Un fichier (PS) - {0} a \u00E9t\u00E9 trouv\u00E9 +MVSFileParser.DEBUG.Found.Folder=Un r\u00E9pertoire (PO/PO-E) - {0} a \u00E9t\u00E9 trouv\u00E9 +MVSFileParser.DEBUG.Guess.Date.Ambiguous=L''ann\u00E9e a \u00E9t\u00E9 trouv\u00E9e mais le jour et le mois peuvent \u00EAtre incorrects. +MVSFileParser.DEBUG.Guess.Date.Obvious=L''ann\u00E9e et le jour ont \u00E9t\u00E9 trouv\u00E9s +MVSFileParser.DEBUG.Guess.Date.Unparsable=Date invalide\: {0} +MVSFileParser.DEBUG.Guess.Date.Year.Ambiguous=Impossible de r\u00E9cup\u00E9rer l''ann\u00E9e depuis le format de date\: {0} +MVSFileParser.DEBUG.Guess.Date=R\u00E9cup\u00E9ration du format de date... +MVSFileParser.ERROR.Invalid.Folder.Line=R\u00E9pertoire invalide \: {0} diff --git a/engine/src/main/resources/org/pentaho/di/job/entries/ftp/messages/messages_it_IT.properties b/engine/src/main/resources/org/pentaho/di/job/entries/ftp/messages/messages_it_IT.properties new file mode 100644 index 000000000000..4c9a643305d0 --- /dev/null +++ b/engine/src/main/resources/org/pentaho/di/job/entries/ftp/messages/messages_it_IT.properties @@ -0,0 +1,23 @@ +MVSFileParser.DEBUG.Checking.Parser=Controllo del parser MVS per il formato valido... +MVSFileParser.DEBUG.Date.Parse.Choose.Alt=Scelta del formato alternativo - {0} +MVSFileParser.DEBUG.Date.Parse.Error=Eccezione nell''analisi della data - probabilmente invertito giorno/mese +MVSFileParser.DEBUG.Detected.Migrated=Rilevata un''entry migrata +MVSFileParser.DEBUG.Found.File=Trovato un file (PS) - {0} +MVSFileParser.DEBUG.Found.Folder=Trovata una cartella (PO/PO-E) - {0} +MVSFileParser.DEBUG.Guess.Date.Ambiguous=Ambiguo - trovato anno, ma giorno/mese potrebbero essere sbagliati, quindi creata alternativa +MVSFileParser.DEBUG.Guess.Date.Decided=Decisione su {0} +MVSFileParser.DEBUG.Guess.Date.Obvious=Facile - trovato anno e giorno +MVSFileParser.DEBUG.Guess.Date.Unparsable=P +MVSFileParser.DEBUG.Guess.Date.Year.Ambiguous=Impossibile rilevare l''anno da questo formato di data\: {0} +MVSFileParser.DEBUG.Guess.Date=Ricerca del formato data... +MVSFileParser.DEBUG.Ignore.Locale=Viene ignorato il locale impostato. +MVSFileParser.DEBUG.Skip.ARCIVE=Viene saltato il file ARCIVE - non supportato +MVSFileParser.DEBUG.Skip.Header=Viene saltato l''header +MVSFileParser.DEBUG.Skip.Migrated=Saltato file migrato - non supportato +MVSFileParser.DEBUG.Skip.dso=Viene saltata l''organizzazione non supportata - deve essere PS, PO oppure PO-E +MVSFileParser.DEBUG.Skip.recf=Saltato recf non supportato - occorre che inizi con F o V +MVSFileParser.ERROR.Date.Parse.Fail=FALLITO - nessuna alternativa. La data non pu\u00F2 essere analizzata - {0} +MVSFileParser.ERROR.Invalid.Folder.Line=Linea directory non valida\: {0} +MVSFileParser.ERROR.Invalid.PDS.Line=Linea PSD non valida\: {0} +MVSFileParser.INFO.Detected.Dir=Rilevato il formato per la lista delle directory MVS +MVSFileParser.INFO.Detected.PDS=Rilevato il formato per la lista del dataset partizionato MVS diff --git a/engine/src/main/resources/org/pentaho/di/job/entries/ftp/messages/messages_ja_JP.properties b/engine/src/main/resources/org/pentaho/di/job/entries/ftp/messages/messages_ja_JP.properties new file mode 100644 index 000000000000..eab7eda3ca20 --- /dev/null +++ b/engine/src/main/resources/org/pentaho/di/job/entries/ftp/messages/messages_ja_JP.properties @@ -0,0 +1,23 @@ +MVSFileParser.DEBUG.Checking.Parser=Checking MVS Parser for Valid Format... +MVSFileParser.DEBUG.Date.Parse.Choose.Alt=Choosing alternate format - {0} +MVSFileParser.DEBUG.Date.Parse.Error=Date parse exception - probably swapped day/month +MVSFileParser.DEBUG.Detected.Migrated=Detected a migrated entry +MVSFileParser.DEBUG.Found.File=Found a file (PS) - {0} +MVSFileParser.DEBUG.Found.Folder=Found a folder (PO/PO-E) - {0} +MVSFileParser.DEBUG.Guess.Date.Ambiguous=Ambiguous one - found obvious year, but day/month could be wrong so created alternate +MVSFileParser.DEBUG.Guess.Date.Decided=Decided on {0} +MVSFileParser.DEBUG.Guess.Date.Obvious=Easy one - found obvious year, and obvious day +MVSFileParser.DEBUG.Guess.Date.Unparsable=Parse failed - Invalid Date: {0} +MVSFileParser.DEBUG.Guess.Date.Year.Ambiguous=Could not figure out year from this date format: {0} +MVSFileParser.DEBUG.Guess.Date=Guessing the date format... +MVSFileParser.DEBUG.Ignore.Locale=Ignoring the set locale. +MVSFileParser.DEBUG.Skip.ARCIVE=Skipping ARCIVE file - not supported +MVSFileParser.DEBUG.Skip.Header=Skipping header +MVSFileParser.DEBUG.Skip.Migrated=Skipping Migrated file - not supported +MVSFileParser.DEBUG.Skip.dso=Skipping unsupported organization - must be PS, PO, or PO-E +MVSFileParser.DEBUG.Skip.recf=Skipping unsupported recf - needs to start with F or V +MVSFileParser.ERROR.Date.Parse.Fail=FAIL - no alternate to fall back on. Date cannot be parsed - {0} +MVSFileParser.ERROR.Invalid.Folder.Line=Invalid Directory Line: {0} +MVSFileParser.ERROR.Invalid.PDS.Line=Invalid PDS Line: {0} +MVSFileParser.INFO.Detected.Dir=Detected MVS Directory Listing Format +MVSFileParser.INFO.Detected.PDS=Detected MVS Partitioned Dataset Listing Format diff --git a/plugins/get-file-with-ftp/impl/src/main/resources/org/pentaho/di/job/entries/ftp/messages/messages_en_US.properties b/plugins/get-file-with-ftp/impl/src/main/resources/org/pentaho/di/job/entries/ftp/messages/messages_en_US.properties index c2f6d700ee29..4411dd97d5ee 100644 --- a/plugins/get-file-with-ftp/impl/src/main/resources/org/pentaho/di/job/entries/ftp/messages/messages_en_US.properties +++ b/plugins/get-file-with-ftp/impl/src/main/resources/org/pentaho/di/job/entries/ftp/messages/messages_en_US.properties @@ -151,28 +151,3 @@ JobEntryFTP.DEBUG.Getting.Other.Parsers=Getting other parsers JobEntryFTP.DEBUG.Creating.Parsers=Trying to create other parsers JobEntryFTP.DEBUG.Created.Other.Parser=Created ftp file parser - {0} JobEntryFTP.ERROR.Creating.Parser=Exception getting ftp file parser - {0} - - -MVSFileParser.DEBUG.Checking.Parser=Checking MVS Parser for Valid Format... -MVSFileParser.INFO.Detected.Dir=Detected MVS Directory Listing Format -MVSFileParser.INFO.Detected.PDS=Detected MVS Partitioned Dataset Listing Format -MVSFileParser.DEBUG.Detected.Migrated=Detected a migrated entry -MVSFileParser.DEBUG.Skip.Header=Skipping header -MVSFileParser.DEBUG.Skip.ARCIVE=Skipping ARCIVE file - not supported -MVSFileParser.DEBUG.Skip.Migrated=Skipping Migrated file - not supported -MVSFileParser.DEBUG.Skip.recf=Skipping unsupported recf - needs to start with F or V -MVSFileParser.DEBUG.Skip.dso=Skipping unsupported organization - must be PS, PO, or PO-E -MVSFileParser.DEBUG.Found.File=Found a file (PS) - {0} -MVSFileParser.DEBUG.Found.Folder=Found a folder (PO/PO-E) - {0} -MVSFileParser.DEBUG.Ignore.Locale=Ignoring the set locale. -MVSFileParser.DEBUG.Date.Parse.Error=Date parse exception - probably swapped day/month -MVSFileParser.DEBUG.Date.Parse.Choose.Alt=Choosing alternate format - {0} -MVSFileParser.ERROR.Date.Parse.Fail=FAIL - no alternate to fall back on. Date cannot be parsed - {0} -MVSFileParser.DEBUG.Guess.Date=Guessing the date format... -MVSFileParser.DEBUG.Guess.Date.Obvious=Easy one - found obvious year, and obvious day -MVSFileParser.DEBUG.Guess.Date.Ambiguous=Ambiguous one - found obvious year, but day/month could be wrong so created alternate -MVSFileParser.DEBUG.Guess.Date.Decided=Decided on {0} -MVSFileParser.DEBUG.Guess.Date.Unparsable=Parse failed - Invalid Date: {0} -MVSFileParser.DEBUG.Guess.Date.Year.Ambiguous=Could not figure out year from this date format: {0} -MVSFileParser.ERROR.Invalid.Folder.Line=Invalid Directory Line: {0} -MVSFileParser.ERROR.Invalid.PDS.Line=Invalid PDS Line: {0} diff --git a/plugins/get-file-with-ftp/impl/src/main/resources/org/pentaho/di/job/entries/ftp/messages/messages_fr_FR.properties b/plugins/get-file-with-ftp/impl/src/main/resources/org/pentaho/di/job/entries/ftp/messages/messages_fr_FR.properties index 5d7dcb390854..7a8793adfa23 100644 --- a/plugins/get-file-with-ftp/impl/src/main/resources/org/pentaho/di/job/entries/ftp/messages/messages_fr_FR.properties +++ b/plugins/get-file-with-ftp/impl/src/main/resources/org/pentaho/di/job/entries/ftp/messages/messages_fr_FR.properties @@ -10,7 +10,6 @@ JobFTP.FolderExists.NOK=Impossible de trouver le r\u00E9pertoire {0}\! JobFTP.Server.Tooltip=Nom / adresse IP du serveur FTP JobEntryFTP.MovedFile=Le fichier distant [{0}] a \u00E9t\u00E9 d\u00E9plac\u00E9 vers le r\u00E9pertoire distant [{1}] JobEntryFTP.OpenedProxyConnectionOn=Connexion FTP \u00E9tablie sur [{0}] -MVSFileParser.DEBUG.Guess.Date.Year.Ambiguous=Impossible de r\u00E9cup\u00E9rer l''ann\u00E9e depuis le format de date\: {0} JobFTP.ServerSettings.Group.Label=Serveur JobFTP.Tab.Socks.Label=Proxy JobFTP.ControlEncoding.Label=Encodage @@ -38,7 +37,6 @@ JobEntryFTP.SetActive=Basculement de la connexion en mode actif JobFTP.RemoteDir.Label=R\u00E9pertoire distant JobFTP.Name.Default=R\u00e9cup\u00e9ration fichiers via FTP JobFTP.SuccessWhenNrErrorsLessThan.Label=Nombre erreurs inf\u00E9rieur \u00E0 -MVSFileParser.DEBUG.Date.Parse.Error=Erreur lors de l''analyse de la date JobEntryFTP.DEBUG.Get.Variable.Space=R\u00E9cup\u00E9ration espace variable JobFTP.MoveFiles.Label=D\u00E9placer fichiers apr\u00E8s r\u00E9cup\u00E9ration JobFTP.ProxyPort.Label=Port @@ -67,11 +65,8 @@ JobEntryFTP.SetEncoding=Encodage utilis\u00E9 \: {0} JobFTP.SuccessCondition.Label=Condition de succ\u00E8s JobFTP.NrBadFormedLessThan.Tooltip=Limite JobFTP.DontOverwrite.Label=Ne pas remplacer les fichiers -MVSFileParser.DEBUG.Guess.Date=R\u00E9cup\u00E9ration du format de date... -MVSFileParser.DEBUG.Found.File=Un fichier (PS) - {0} a \u00E9t\u00E9 trouv\u00E9 JobEntryFTP.DEBUG.Getting.Other.Parsers=R\u00E9cup\u00E9ration autres parseurs JobEntryFTP.FileAddedToResult=Le nom du fichier [{0}] a \u00E9t\u00E9 ajout\u00E9 \u00E0 la liste des noms de fichiers li\u00E9e au r\u00E9sultat -MVSFileParser.DEBUG.Guess.Date.Ambiguous=L''ann\u00E9e a \u00E9t\u00E9 trouv\u00E9e mais le jour et le mois peuvent \u00EAtre incorrects. JobEntryFTP.CheckMoveToFolderSwitchBack=Repositionnement sur le r\u00E9pertoire [{0}] JobFTP.MoveFolder.Tooltip=Specifier ici le r\u00E9pertoire de destination. JobEntryFTP.SetAscii=Basculement du transfert en mode ASCII @@ -84,7 +79,6 @@ JobEntryFTP.UnableToLoadFromXml=Impossible charger les informations de l''entr\u JobEntryFTP.MoveToFolderEmpty=Le nom du r\u00E9pertoire de d\u00E9placement n''a pas \u00E9t\u00E9 renseign\u00E9\! JobFTP.Server.Label=Nom / adresse IP serveur FTP JobEntryFTP.SocksProxy.PortMissingException=Le num\u00E9ro du port du serveur proxy {0} n''a pas \u00E9t\u00E9 sp\u00E9cifi\u00E9. -MVSFileParser.ERROR.Invalid.Folder.Line=R\u00E9pertoire invalide \: {0} JobFTP.SuccessWhenAllWorksFine.Label=Aucune erreur n''est report\u00E9e JobEntryFTP.MoveToFolderCreated=Le r\u00E9pertoire [{0}] a \u00E9t\u00E9 cr\u00E9e. JobEntryFTP.OpenedConnectionTo=Connexion ouverte vers [{0}] @@ -115,7 +109,6 @@ JobFTP.Password.Tooltip=Saisissez le mot de passe du compte JobEntryFTP.Error.SuccessConditionbroken=La condition de succ\u00E8s a \u00E9t\u00E9 viol\u00E9e\! Nous avons {0} erreur(s) JobFTP.SuccessOn.Group.Label=Condition de succ\u00E8s JobFTP.ActiveConns.Label=Utiliser connexion FTP active -MVSFileParser.DEBUG.Guess.Date.Obvious=L''ann\u00E9e et le jour ont \u00E9t\u00E9 trouv\u00E9s JobFTP.Port.Label=Port JobFTP.SocksProxyPassword.Label=Mot de passe JobEntryFTP.SkippingNotAFile=[{0}] sera ignor\u00E9 car ce n''est pas un fichier\! @@ -147,13 +140,10 @@ JobFTP.ControlEncoding.Tooltip=Caract\u00E8re encodage noms fichiers/r\u00E9pert JobEntryFTP.ErrorGetting=Erreur lors de la r\u00E9cup\u00E9ration des fichiers depuis le serveur FTP \: {0} JobFTP.AddTime.Tooltip=Ajouter l''heure au nom\r\ndes fichiers JobFTP.Tab.General.Label=G\u00E9n\u00E9ral -MVSFileParser.DEBUG.Guess.Date.Unparsable=Date invalide\: {0} -MVSFileParser.DEBUG.Date.Parse.Choose.Alt=Utilisation de format de date alternatif- {0} JobFTP.Connected.Title.Ok=Succ\u00E8s connexion JobEntryFTP.LocalFileNotExists=Le fichier local [{0}] n''existe pas. JobFTP.CreateMoveFolder.Label=Cr\u00E9er r\u00E9pertoire JobFTP.RemoteSettings.Group.Label=Distant -MVSFileParser.DEBUG.Found.Folder=Un r\u00E9pertoire (PO/PO-E) - {0} a \u00E9t\u00E9 trouv\u00E9 JobEntryFTP.LocalFileExists=Le fichier local [{0}] existe\! JobFTP.SocksProxyPassword.Tooltip=Mot de passe JobFTP.TargetDir.Tooltip=Le r\u00E9peroire cible sur le serveur distant diff --git a/plugins/get-file-with-ftp/impl/src/main/resources/org/pentaho/di/job/entries/ftp/messages/messages_it_IT.properties b/plugins/get-file-with-ftp/impl/src/main/resources/org/pentaho/di/job/entries/ftp/messages/messages_it_IT.properties index cabf29068d79..75ad782bead5 100644 --- a/plugins/get-file-with-ftp/impl/src/main/resources/org/pentaho/di/job/entries/ftp/messages/messages_it_IT.properties +++ b/plugins/get-file-with-ftp/impl/src/main/resources/org/pentaho/di/job/entries/ftp/messages/messages_it_IT.properties @@ -9,8 +9,6 @@ JobFTP.FolderExists.NOK=Impossibile trovare la cartella {0}\! JobFTP.Server.Tooltip=Il nome del server FTP o l''indirizzo IP JobEntryFTP.MovedFile=Il file remoto [{0}] \u00E8 stato spostato nella cartella remota [{1}] JobEntryFTP.OpenedProxyConnectionOn=Aperta connessione FTP al server proxy [{0}] -MVSFileParser.DEBUG.Guess.Date.Year.Ambiguous=Impossibile rilevare l''anno da questo formato di data\: {0} -MVSFileParser.DEBUG.Guess.Date.Decided=Decisione su {0} JobFTP.ServerSettings.Group.Label=Server JobFTP.Tab.Socks.Label=Proxy Socks JobFTP.ControlEncoding.Label=Codifica di controllo\: @@ -26,7 +24,6 @@ JobFTP.UnexpectedError=Errore inatteso\: {0} JobFTP.AdvancedSettings.Group.Label=Avanzato JobFTP.ProxyHost.Tooltip=Nome o indirizzo dell''host proxy che si desidera utilizzare. Lasciare vuoto se non si utilizza un proxy. JobFTP.DateTimeFormat.Label=Formato data/ora -MVSFileParser.DEBUG.Skip.recf=Saltato recf non supportato - occorre che inizi con F o V JobFTP.Connected.OK=Connesso a {0} JobFTP.CreateMoveFolder.Tooltip=Crea la cartella se necessario JobFTP.ErrorConnect.NOK=Errore di connessione\: {0} @@ -39,7 +36,6 @@ JobEntryFTP.SetActive=imposta connessione ftp attiva JobFTP.RemoteDir.Label=Cartella remota\: JobFTP.Name.Default=Preleva file con FTP JobFTP.SuccessWhenNrErrorsLessThan.Label=N. errori inferiore a -MVSFileParser.DEBUG.Date.Parse.Error=Eccezione nell''analisi della data - probabilmente invertito giorno/mese JobEntryFTP.DEBUG.Get.Variable.Space=Prelievo dello spazio variabili JobFTP.MoveFiles.Label=Spostare i file dopo il recupero? JobFTP.ProxyPort.Label=Porta proxy\: @@ -69,13 +65,9 @@ JobEntryFTP.SetEncoding=imposta codifica controllo a {0} JobFTP.SuccessCondition.Label=Successo JobFTP.NrBadFormedLessThan.Tooltip=File limite JobFTP.DontOverwrite.Label=Non sovrascrivere i file\: -MVSFileParser.DEBUG.Guess.Date=Ricerca del formato data... -MVSFileParser.DEBUG.Found.File=Trovato un file (PS) - {0} JobEntryFTP.DEBUG.Getting.Other.Parsers=Prelievo degli altri parser JobEntryFTP.FileAddedToResult=Il file [{0}] \u00E8 stato aggiunto al file del risultato -MVSFileParser.DEBUG.Guess.Date.Ambiguous=Ambiguo - trovato anno, ma giorno/mese potrebbero essere sbagliati, quindi creata alternativa JobEntryFTP.CheckMoveToFolderSwitchBack=Tornare alla cartella [{0}] -MVSFileParser.ERROR.Invalid.PDS.Line=Linea PSD non valida\: {0} JobFTP.MoveFolder.Tooltip=ATTENZIONE\! Questa cartella deve appartenere alla cartella della connesione FTP (default). JobEntryFTP.SetAscii=imposta modo trasferimento ASCII JobFTP.SpecifyFormat.Tooltip=Specifica il formato data/ora @@ -85,10 +77,8 @@ JobFTP.RemoveFiles.Label=Rimuovere i file dopo lo scaricamento? JobEntryFTP.GettingFile=Prelievo del file [{0}] nella cartella [{1}] JobEntryFTP.UnableToLoadFromXml=Impossibile caricare job entry di tipo 'ftp' dal nodo XML JobEntryFTP.MoveToFolderEmpty=Lo spostamento nella cartella (dopo il processo di dwonload) \u00E8 vuoto\! -MVSFileParser.DEBUG.Checking.Parser=Controllo del parser MVS per il formato valido... JobFTP.Server.Label=Nome server FTP / indirizzo IP\: JobEntryFTP.SocksProxy.PortMissingException=Il server proxy socks {0} non ha la porta specificata. -MVSFileParser.ERROR.Invalid.Folder.Line=Linea directory non valida\: {0} JobFTP.SuccessWhenAllWorksFine.Label=Tutto funziona correttamente JobEntryFTP.MoveToFolderCreated=La cartella {0} \u00E8 stata creata. JobEntryFTP.OpenedConnectionTo=Aperta connessione FTP al server [{0}] @@ -106,24 +96,20 @@ JobFTP.User.Tooltip=Inserisci lo username del server FTP JobEntryFTP.DEBUG.Hooking.Parsers=Collegamento ad altri parser per server FTP JobFTP.User.Label=Username\: JobFTP.FolderExists.OK=La cartella {0} esiste\! -MVSFileParser.DEBUG.Ignore.Locale=Viene ignorato il locale impostato. JobEntryFTP.Downloaded=Scaricato dal server FTP {0} JobEntryFTP.FoundNFiles=Trovati {0} file nella cartella ftp remota JobFTP.Fail.Label=Fallito JobFTP.SuccessWhenAtLeat.Label=Almeno x file JobFTP.MoveToDirectory.Tooltip=Sposta nella cartella -MVSFileParser.DEBUG.Skip.Header=Viene saltato l''header JobFTP.AddDateBeforeExtension.Tooltip=Seleziona quest''opzione per aggiungere la data e l''orario prima dell''estensione. JobEntryFTP.SetPassive=imposta modo connessione ftp passiva JobFTP.SocksProxyPort.Label=Porta\: JobEntryFTP.DEBUG.Created.MVS.Parser=Creato parser -MVSFileParser.DEBUG.Skip.dso=Viene saltata l''organizzazione non supportata - deve essere PS, PO oppure PO-E JobFTP.ProxyHost.Label=Host proxy\: JobFTP.Password.Tooltip=Inserisci la password del server FTP JobEntryFTP.Error.SuccessConditionbroken=La condizione di successo \u00E8 stata violata\! Ci sono {0} errori. JobFTP.SuccessOn.Group.Label=Condizione di successo JobFTP.ActiveConns.Label=Utilizza connessione FTP attiva\: -MVSFileParser.DEBUG.Guess.Date.Obvious=Facile - trovato anno e giorno JobFTP.Port.Label=Porta del server JobFTP.SocksProxyPassword.Label=Password\: JobEntryFTP.SkippingNotAFile=Viene saltato il file [{0}] poich\u00E9 non \u00E8 un file\! @@ -132,7 +118,6 @@ JobEntryFTP.DEBUG.Created.Factory=Creato factory JobFTP.Timeout.Label=Timeout\: JobEntryFTP.AnalysingFile=Analisi del file remoto [{0}] ... JobFTP.FolderExists.Title.Ok=OK -MVSFileParser.INFO.Detected.PDS=Rilevato il formato per la lista del dataset partizionato MVS JobEntryFTP.JobStopped=Il job \u00E8 stato fermato\! JobFTP.SocksProxyHost.Tooltip=Il nome dell''host o l''indirizzo IP dell''host proxy socks JobFTP.TargetDir.Label=Cartella di destinazione\: @@ -141,9 +126,7 @@ JobFTP.TestConnection.Tooltip=Test di connessione JobEntryFTP.ChangedDir=Cambiato nella cartella [{0}] JobFTP.Name.Label=Nome di questa job entry\: JobEntryFTP.Log.Info.FilesRetrieved=N\u00B0 file scaricati\: {0} -MVSFileParser.DEBUG.Skip.ARCIVE=Viene saltato il file ARCIVE - non supportato JobEntryFTP.Start=Inizio della job entry FTP -MVSFileParser.INFO.Detected.Dir=Rilevato il formato per la lista delle directory MVS JobFTP.Connected.Title.Bad=Errore JobFTP.Wildcard.Tooltip=Inserisci un''espressione regolare per specificare i file da recuperare.\r\nEs. ".*\\.txt" (senza le virgolette), per scaricare tutti i file di testo dalla cartella remota. JobEntryFTP.SetBinary=imposta modo trasferimento binario @@ -156,20 +139,14 @@ JobFTP.Title=Preleva file con FTP JobFTP.MoveFiles.Tooltip=Sposta i file nella cartella dopo il recupero JobFTP.ControlEncoding.Tooltip=Quale set di caratteri utilizzare per file/cartelle JobEntryFTP.ErrorGetting=Errore durante il prelievo dei file da FTP \: {0} -MVSFileParser.DEBUG.Detected.Migrated=Rilevata un''entry migrata JobFTP.AddTime.Tooltip=Selezionare quest''opzione per includere l''orario nel nome file. -MVSFileParser.DEBUG.Skip.Migrated=Saltato file migrato - non supportato JobFTP.Tab.General.Label=Generale -MVSFileParser.DEBUG.Guess.Date.Unparsable=P -MVSFileParser.DEBUG.Date.Parse.Choose.Alt=Scelta del formato alternativo - {0} JobFTP.Connected.Title.Ok=Connessione OK JobEntryFTP.LocalFileNotExists=Il file locale [{0}] non esiste. JobFTP.CreateMoveFolder.Label=Crea cartella -MVSFileParser.DEBUG.Found.Folder=Trovata una cartella (PO/PO-E) - {0} JobFTP.RemoteSettings.Group.Label=Remoto JobEntryFTP.LocalFileExists=Il file locale [{0}] esiste\! JobFTP.SocksProxyPassword.Tooltip=La password per il proxy Socks 5 JobFTP.TargetDir.Tooltip=La cartella di destinazione sul server locale JobFTP.ErrorConnect.Title.Bad=ERRORE -MVSFileParser.ERROR.Date.Parse.Fail=FALLITO - nessuna alternativa. La data non pu\u00F2 essere analizzata - {0} JobFTP.Name.Tooltip=Il nome di questa job entry diff --git a/plugins/get-file-with-ftp/impl/src/main/resources/org/pentaho/di/job/entries/ftp/messages/messages_ja_JP.properties b/plugins/get-file-with-ftp/impl/src/main/resources/org/pentaho/di/job/entries/ftp/messages/messages_ja_JP.properties index 4c41db8c8839..74ad8778b6d8 100644 --- a/plugins/get-file-with-ftp/impl/src/main/resources/org/pentaho/di/job/entries/ftp/messages/messages_ja_JP.properties +++ b/plugins/get-file-with-ftp/impl/src/main/resources/org/pentaho/di/job/entries/ftp/messages/messages_ja_JP.properties @@ -151,28 +151,3 @@ JobEntryFTP.DEBUG.Getting.Other.Parsers=Getting other parsers JobEntryFTP.DEBUG.Creating.Parsers=Trying to create other parsers JobEntryFTP.DEBUG.Created.Other.Parser=Created ftp file parser - {0} JobEntryFTP.ERROR.Creating.Parser=Exception getting ftp file parser - {0} - - -MVSFileParser.DEBUG.Checking.Parser=Checking MVS Parser for Valid Format... -MVSFileParser.INFO.Detected.Dir=Detected MVS Directory Listing Format -MVSFileParser.INFO.Detected.PDS=Detected MVS Partitioned Dataset Listing Format -MVSFileParser.DEBUG.Detected.Migrated=Detected a migrated entry -MVSFileParser.DEBUG.Skip.Header=Skipping header -MVSFileParser.DEBUG.Skip.ARCIVE=Skipping ARCIVE file - not supported -MVSFileParser.DEBUG.Skip.Migrated=Skipping Migrated file - not supported -MVSFileParser.DEBUG.Skip.recf=Skipping unsupported recf - needs to start with F or V -MVSFileParser.DEBUG.Skip.dso=Skipping unsupported organization - must be PS, PO, or PO-E -MVSFileParser.DEBUG.Found.File=Found a file (PS) - {0} -MVSFileParser.DEBUG.Found.Folder=Found a folder (PO/PO-E) - {0} -MVSFileParser.DEBUG.Ignore.Locale=Ignoring the set locale. -MVSFileParser.DEBUG.Date.Parse.Error=Date parse exception - probably swapped day/month -MVSFileParser.DEBUG.Date.Parse.Choose.Alt=Choosing alternate format - {0} -MVSFileParser.ERROR.Date.Parse.Fail=FAIL - no alternate to fall back on. Date cannot be parsed - {0} -MVSFileParser.DEBUG.Guess.Date=Guessing the date format... -MVSFileParser.DEBUG.Guess.Date.Obvious=Easy one - found obvious year, and obvious day -MVSFileParser.DEBUG.Guess.Date.Ambiguous=Ambiguous one - found obvious year, but day/month could be wrong so created alternate -MVSFileParser.DEBUG.Guess.Date.Decided=Decided on {0} -MVSFileParser.DEBUG.Guess.Date.Unparsable=Parse failed - Invalid Date: {0} -MVSFileParser.DEBUG.Guess.Date.Year.Ambiguous=Could not figure out year from this date format: {0} -MVSFileParser.ERROR.Invalid.Folder.Line=Invalid Directory Line: {0} -MVSFileParser.ERROR.Invalid.PDS.Line=Invalid PDS Line: {0}