[pacman-dev] [PATCH 1/3] Fix pacman's log messages not being translated

Olivier Brunel i.am.jack.mail at gmail.com
Thu Dec 13 06:38:15 EST 2012


Log messages should be translated as well. (Those from ALPM already are.)

Signed-off-by: Olivier Brunel <i.am.jack.mail at gmail.com>
---
 src/pacman/callback.c | 6 +++---
 src/pacman/pacman.c   | 2 +-
 src/pacman/sync.c     | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/pacman/callback.c b/src/pacman/callback.c
index 01c6b61..c56c96a 100644
--- a/src/pacman/callback.c
+++ b/src/pacman/callback.c
@@ -176,7 +176,7 @@ void cb_event(alpm_event_t event, void *data1, void *data2)
 			}
 			break;
 		case ALPM_EVENT_ADD_DONE:
-			alpm_logaction(config->handle, "installed %s (%s)\n",
+			alpm_logaction(config->handle, _("installed %s (%s)\n"),
 			         alpm_pkg_get_name(data1),
 			         alpm_pkg_get_version(data1));
 			display_optdepends(data1);
@@ -187,7 +187,7 @@ void cb_event(alpm_event_t event, void *data1, void *data2)
 			}
 			break;
 		case ALPM_EVENT_REMOVE_DONE:
-			alpm_logaction(config->handle, "removed %s (%s)\n",
+			alpm_logaction(config->handle, _("removed %s (%s)\n"),
 			         alpm_pkg_get_name(data1),
 			         alpm_pkg_get_version(data1));
 			break;
@@ -197,7 +197,7 @@ void cb_event(alpm_event_t event, void *data1, void *data2)
 			}
 			break;
 		case ALPM_EVENT_UPGRADE_DONE:
-			alpm_logaction(config->handle, "upgraded %s (%s -> %s)\n",
+			alpm_logaction(config->handle, _("upgraded %s (%s -> %s)\n"),
 			         alpm_pkg_get_name(data1),
 			         alpm_pkg_get_version(data2),
 			         alpm_pkg_get_version(data1));
diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c
index 1ca746d..7db46d7 100644
--- a/src/pacman/pacman.c
+++ b/src/pacman/pacman.c
@@ -743,7 +743,7 @@ static void cl_to_log(int argc, char *argv[])
 		*p++ = ' ';
 	}
 	strcpy(p, argv[i]);
-	alpm_logaction(config->handle, "Running '%s'\n", cl_text);
+	alpm_logaction(config->handle, _("Running '%s'\n"), cl_text);
 	free(cl_text);
 }
 
diff --git a/src/pacman/sync.c b/src/pacman/sync.c
index 532a667..938f9d6 100644
--- a/src/pacman/sync.c
+++ b/src/pacman/sync.c
@@ -787,7 +787,7 @@ static int sync_trans(alpm_list_t *targets)
 
 	if(config->op_s_upgrade) {
 		printf(_(":: Starting full system upgrade...\n"));
-		alpm_logaction(config->handle, "starting full system upgrade\n");
+		alpm_logaction(config->handle, _("starting full system upgrade\n"));
 		if(alpm_sync_sysupgrade(config->handle, config->op_s_upgrade >= 2) == -1) {
 			pm_printf(ALPM_LOG_ERROR, "%s\n", alpm_strerror(alpm_errno(config->handle)));
 			trans_release();
@@ -954,7 +954,7 @@ int pacman_sync(alpm_list_t *targets)
 	if(config->op_s_sync) {
 		/* grab a fresh package list */
 		printf(_(":: Synchronizing package databases...\n"));
-		alpm_logaction(config->handle, "synchronizing package lists\n");
+		alpm_logaction(config->handle, _("synchronizing package lists\n"));
 		if(!sync_synctree(config->op_s_sync, sync_dbs)) {
 			return 1;
 		}
-- 
1.8.0.2



More information about the pacman-dev mailing list