Merge pull request #5828 from rmansoor/master

[BISERVER-15169] - Correcting some of the externalized messages
pentaho · Jan 16, 2025 · 7c4ffce · 7c4ffce
2 parents 1b7ef70 + 1cfac2d
commit 7c4ffce
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/.../src/main/java/org/pentaho/platform/plugin/services/exporter/PentahoPlatformExporter.java b/.../src/main/java/org/pentaho/platform/plugin/services/exporter/PentahoPlatformExporter.java
@@ -423,7 +423,7 @@ protected void exportUsersAndRoles() {
       }
       getRepositoryExportLogger().debug( "Finished backup of global user settings" );
     }
-    getRepositoryExportLogger().info( Messages.getInstance().getString( "PentahoPlatformExporter.INFO_SUCCESSFUL_ROLE_EXPORT_COUNT", successfulExportUsers, usersSize ) );
+    getRepositoryExportLogger().info( Messages.getInstance().getString( "PentahoPlatformExporter.INFO_SUCCESSFUL_USER_EXPORT_COUNT", successfulExportUsers, usersSize ) );
 
     getRepositoryExportLogger().info( Messages.getInstance().getString( "PentahoPlatformExporter.INFO_END_EXPORT_USER" ) );
 

diff --git a/...ions/src/main/resources/org/pentaho/platform/plugin/services/messages/messages.properties b/...ions/src/main/resources/org/pentaho/platform/plugin/services/messages/messages.properties
@@ -218,7 +218,7 @@ CommandLineProcessor.INFO_OPTION_URL_DESCRIPTION=url of repository (e.g. http://
 CommandLineProcessor.INFO_OPTION_FILEPATH_DESCRIPTION=Path to directory of files for import, or path to .zip file for export
 CommandLineProcessor.INFO_OPTION_CHARSET_DESCRIPTION=charset to use for the repository (characters from external systems converted to this charset)
 CommandLineProcessor.INFO_OPTION_LOGFILE_DESCRIPTION=full path and filename of logfile messages
-CommandLineProcessor.INFO_OPTION_LOGLEVEL_DESCRIPTION=Log Level
+CommandLineProcessor.INFO_OPTION_LOGLEVEL_DESCRIPTION=Log Level (INFO, ERROR, DEBUG, TRACE)
 CommandLineProcessor.INFO_OPTION_PATH_DESCRIPTION=repository path to which to add imported files, or to export from (e.g. /public)
 CommandLineProcessor.INFO_OPTION_OVERWRITE_DESCRIPTION=overwrite files (import only)
 CommandLineProcessor.INFO_OPTION_PERMISSION_DESCRIPTION=apply ACL manifest permissions to files and folders  (import only)
@@ -374,15 +374,15 @@ PentahoPlatformExporter.INFO_END_EXPORT_ROLE=*********************************
 PentahoPlatformExporter.INFO_START_EXPORT_METASTORE=*********************************  [ Start: Backup Metastore ] *******************************
 PentahoPlatformExporter.INFO_END_EXPORT_METASTORE=*********************************  [ End: Backup Metastore ] *******************************
 PentahoPlatformExporter.INFO_SUCCESSFUL_EXPORT_METASTORE=Finished adding the metastore to the backup manifest
-PentahoPlatformExporter.INFO_START_EXPORT_MONDRIAN_DATASOURCE=*********************************  [ Start: Backup Mondrian datasource(s) ] *******************************
+PentahoPlatformExporter.INFO_START_EXPORT_MONDRIAN_DATASOURCE=*********************************  [ Start: Backup Mondrian DataSource(s) ] *******************************
 PentahoPlatformExporter.INFO_COUNT_MONDRIAN_DATASOURCE_TO_EXPORT=Found [ {0} ] Role(s) to backup
-PentahoPlatformExporter.INFO_SUCCESSFUL_MONDRIAN_DATASOURCE_EXPORT_COUNT=Successfully perform backup of [ {0} ] out of [ {1} ] Role(s)
+PentahoPlatformExporter.INFO_SUCCESSFUL_MONDRIAN_DATASOURCE_EXPORT_COUNT=Successfully perform backup of [ {0} ] out of [ {1} ] Mondrian datasource(s)
 PentahoPlatformExporter.ERROR_MONDRIAN_DATASOURCE_EXPORT=Error performing backup of Mondrian DataSource. Cause [ {0} ]
-PentahoPlatformExporter.INFO_END_EXPORT_MONDRIAN_DATASOURCE=*********************************  [ End: Backup Mondrian datasource(s) ] *******************************
-PentahoPlatformExporter.INFO_START_EXPORT_METADATA=*********************************  [ Start: Backup Metadata datasource(s) ] *******************************
-PentahoPlatformExporter.INFO_COUNT_METADATA_DATASOURCE_TO_EXPORT=Found [ {0} ] Metadata DataSource(s) to backup
-PentahoPlatformExporter.INFO_SUCCESSFUL_METADATA_DATASOURCE_EXPORT_COUNT=Successfully perform backup of [ {0} ] out of [ {1} ] Metadata DataSource(s)
-PentahoPlatformExporter.ERROR_METADATA_DATASOURCE_EXPORT=Error performing backup of Mondrian DataSource. Cause [ {0} ]
+PentahoPlatformExporter.INFO_END_EXPORT_MONDRIAN_DATASOURCE=*********************************  [ End: Backup Mondrian DataSource(s) ] *******************************
+PentahoPlatformExporter.INFO_START_EXPORT_METADATA=*********************************  [ Start: Backup Metadata DataSource(s) ] *******************************
+PentahoPlatformExporter.INFO_COUNT_METADATA_DATASOURCE_TO_EXPORT=Found [ {0} ] Metadata datasource(s) to backup
+PentahoPlatformExporter.INFO_SUCCESSFUL_METADATA_DATASOURCE_EXPORT_COUNT=Successfully perform backup of [ {0} ] out of [ {1} ] Metadata datasource(s)
+PentahoPlatformExporter.ERROR_METADATA_DATASOURCE_EXPORT=Error performing backup of Mondrian datasource. Cause [ {0} ]
 PentahoPlatformExporter.INFO_END_EXPORT_METADATA=***********************  [ End: Backup metadata datasource(s) ]*************************
 PentahoPlatformExporter.ERROR_EXPORT_FILE_CONTENT=Error while performing backup of file content. Cause {0}
 PentahoPlatformExporter.ERROR_GENERATING_EXPORT_XML=Error generating export XML