Skip to content

Commit f8e76db

Browse files
committedFeb 18, 2019
translate all ziputils error messages and remove log tags
1 parent 9efe4c5 commit f8e76db

File tree

1 file changed

+15
-28
lines changed

1 file changed

+15
-28
lines changed
 

‎src/core/qgsziputils.cpp

Lines changed: 15 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -37,32 +37,27 @@ bool QgsZipUtils::unzip( const QString &zipFilename, const QString &dir, QString
3737

3838
if ( !QFileInfo::exists( zipFilename ) )
3939
{
40-
QString err = QObject::tr( "Error zip file does not exist: '%1'" ).arg( zipFilename );
41-
QgsMessageLog::logMessage( err, QStringLiteral( "QgsZipUtils" ) );
40+
QgsMessageLog::logMessage( QObject::tr( "Error zip file does not exist: '%1'" ).arg( zipFilename ) );
4241
return false;
4342
}
4443
else if ( zipFilename.isEmpty() )
4544
{
46-
QString err = QObject::tr( "Error zip filename is empty" );
47-
QgsMessageLog::logMessage( err, QStringLiteral( "QgsZipUtils" ) );
45+
QgsMessageLog::logMessage( QObject::tr( "Error zip filename is empty" ) );
4846
return false;
4947
}
5048
else if ( !QDir( dir ).exists( dir ) )
5149
{
52-
QString err = QObject::tr( "Error output dir does not exist: '%1'" ).arg( dir );
53-
QgsMessageLog::logMessage( err, QStringLiteral( "QgsZipUtils" ) );
50+
QgsMessageLog::logMessage( QObject::tr( "Error output dir does not exist: '%1'" ).arg( dir ) );
5451
return false;
5552
}
5653
else if ( !QFileInfo( dir ).isDir() )
5754
{
58-
QString err = QObject::tr( "Error output dir is not a directory: '%1'" ).arg( dir );
59-
QgsMessageLog::logMessage( err, QStringLiteral( "QgsZipUtils" ) );
55+
QgsMessageLog::logMessage( QObject::tr( "Error output dir is not a directory: '%1'" ).arg( dir ) );
6056
return false;
6157
}
6258
else if ( !QFileInfo( dir ).isWritable() )
6359
{
64-
QString err = QObject::tr( "Error output dir is not writable: '%1'" ).arg( dir );
65-
QgsMessageLog::logMessage( err, QStringLiteral( "QgsZipUtils" ) );
60+
QgsMessageLog::logMessage( QObject::tr( "Error output dir is not writable: '%1'" ).arg( dir ) );
6661
return false;
6762
}
6863

@@ -93,13 +88,13 @@ bool QgsZipUtils::unzip( const QString &zipFilename, const QString &dir, QString
9388
if ( !newFile.absoluteDir().exists() )
9489
{
9590
if ( !QDir( dir ).mkpath( newFile.absolutePath() ) )
96-
QgsMessageLog::logMessage( QStringLiteral( "Failed to create a subdirectory %1/%2" ).arg( dir ).arg( fileName ) );
91+
QgsMessageLog::logMessage( QObject::tr( "Failed to create a subdirectory %1/%2" ).arg( dir ).arg( fileName ) );
9792
}
9893

9994
QFile outFile( newFile.absoluteFilePath() );
10095
if ( !outFile.open( QIODevice::WriteOnly | QIODevice::Truncate ) )
10196
{
102-
QgsMessageLog::logMessage( QStringLiteral( "Could not write to %1" ).arg( newFile.absoluteFilePath() ) );
97+
QgsMessageLog::logMessage( QObject::tr( "Could not write to %1" ).arg( newFile.absoluteFilePath() ) );
10398
}
10499
else
105100
{
@@ -111,26 +106,23 @@ bool QgsZipUtils::unzip( const QString &zipFilename, const QString &dir, QString
111106
else
112107
{
113108
zip_fclose( file );
114-
QString err = QObject::tr( "Error reading file: '%1'" ).arg( zip_strerror( z ) );
115-
QgsMessageLog::logMessage( err, QStringLiteral( "QgsZipUtils" ) );
109+
QgsMessageLog::logMessage( QObject::tr( "Error reading file: '%1'" ).arg( zip_strerror( z ) ) );
116110
return false;
117111
}
118112
}
119113
}
120114
else
121115
{
122116
zip_close( z );
123-
QString err = QObject::tr( "Error getting files: '%1'" ).arg( zip_strerror( z ) );
124-
QgsMessageLog::logMessage( err, QStringLiteral( "QgsZipUtils" ) );
117+
QgsMessageLog::logMessage( QObject::tr( "Error getting files: '%1'" ).arg( zip_strerror( z ) ) );
125118
return false;
126119
}
127120

128121
zip_close( z );
129122
}
130123
else
131124
{
132-
QString err = QObject::tr( "Error opening zip archive: '%1' (Error code: %2)" ).arg( z ? zip_strerror( z ) : zipFilename, rc );
133-
QgsMessageLog::logMessage( err, QStringLiteral( "QgsZipUtils" ) );
125+
QgsMessageLog::logMessage( QObject::tr( "Error opening zip archive: '%1' (Error code: %2)" ).arg( z ? zip_strerror( z ) : zipFilename, rc ) );
134126
return false;
135127
}
136128

@@ -141,8 +133,7 @@ bool QgsZipUtils::zip( const QString &zipFilename, const QStringList &files )
141133
{
142134
if ( zipFilename.isEmpty() )
143135
{
144-
QString err = QObject::tr( "Error zip filename is empty" );
145-
QgsMessageLog::logMessage( err, QStringLiteral( "QgsZipUtils" ) );
136+
QgsMessageLog::logMessage( QObject::tr( "Error zip filename is empty" ) );
146137
return false;
147138
}
148139

@@ -157,8 +148,7 @@ bool QgsZipUtils::zip( const QString &zipFilename, const QStringList &files )
157148
QFileInfo fileInfo( file );
158149
if ( !fileInfo.exists() )
159150
{
160-
QString err = QObject::tr( "Error input file does not exist: '%1'" ).arg( file );
161-
QgsMessageLog::logMessage( err, QStringLiteral( "QgsZipUtils" ) );
151+
QgsMessageLog::logMessage( QObject::tr( "Error input file does not exist: '%1'" ).arg( file ) );
162152
zip_close( z );
163153
return false;
164154
}
@@ -175,16 +165,14 @@ bool QgsZipUtils::zip( const QString &zipFilename, const QStringList &files )
175165
#endif
176166
if ( rc == -1 )
177167
{
178-
QString err = QObject::tr( "Error adding file '%1': %2" ).arg( file, zip_strerror( z ) );
179-
QgsMessageLog::logMessage( err, QStringLiteral( "QgsZipUtils" ) );
168+
QgsMessageLog::logMessage( QObject::tr( "Error adding file '%1': %2" ).arg( file, zip_strerror( z ) ) );
180169
zip_close( z );
181170
return false;
182171
}
183172
}
184173
else
185174
{
186-
QString err = QObject::tr( "Error creating data source '%1': %2" ).arg( file, zip_strerror( z ) );
187-
QgsMessageLog::logMessage( err, QStringLiteral( "QgsZipUtils" ) );
175+
QgsMessageLog::logMessage( QObject::tr( "Error creating data source '%1': %2" ).arg( file, zip_strerror( z ) ) );
188176
zip_close( z );
189177
return false;
190178
}
@@ -194,8 +182,7 @@ bool QgsZipUtils::zip( const QString &zipFilename, const QStringList &files )
194182
}
195183
else
196184
{
197-
QString err = QObject::tr( "Error creating zip archive '%1': %2" ).arg( zipFilename, zip_strerror( z ) );
198-
QgsMessageLog::logMessage( err, QStringLiteral( "QgsZipUtils" ) );
185+
QgsMessageLog::logMessage( QObject::tr( "Error creating zip archive '%1': %2" ).arg( zipFilename, zip_strerror( z ) ) );
199186
return false;
200187
}
201188

0 commit comments

Comments
 (0)
Please sign in to comment.