GNOME.org
 

[evolution-data-server] Mark user-visible strings in book/cal backends for translation

commit 00d6b9f8e8a3cc770eec35d0cf86482bc893cf2e
Author: Milan Crha <mcrha redhat com>
Date:   Tue Aug 28 15:06:53 2012 +0200

    Mark user-visible strings in book/cal backends for translation

 addressbook/backends/ldap/e-book-backend-ldap.c    |   22 ++++++++++----------
 addressbook/backends/vcf/e-book-backend-vcf.c      |    4 +-
 .../backends/webdav/e-book-backend-webdav.c        |   16 +++++++-------
 calendar/backends/caldav/e-cal-backend-caldav.c    |   14 ++++++------
 4 files changed, 28 insertions(+), 28 deletions(-)
---
diff --git a/addressbook/backends/ldap/e-book-backend-ldap.c b/addressbook/backends/ldap/e-book-backend-ldap.c
index a85a7a5..ad4296a 100644
--- a/addressbook/backends/ldap/e-book-backend-ldap.c
+++ b/addressbook/backends/ldap/e-book-backend-ldap.c
@@ -966,7 +966,7 @@ e_book_backend_ldap_connect (EBookBackendLDAP *bl,
 			g_propagate_error (
 				error, e_data_book_create_error (
 				E_DATA_BOOK_STATUS_OTHER_ERROR,
-				"Failed to bind using either v3 or v2 binds"));
+				_("Failed to bind using either v3 or v2 binds")));
 			return FALSE;
 
 		} else if (ldap_error == LDAP_SERVER_DOWN) {
@@ -1228,8 +1228,8 @@ ldap_error_to_response (gint ldap_error)
 		return EDB_ERROR (CONTACTID_ALREADY_EXISTS);
 	else
 		return e_data_book_create_error_fmt (E_DATA_BOOK_STATUS_OTHER_ERROR,
-				"LDAP error 0x%x (%s)", ldap_error,
-				ldap_err2string (ldap_error) ? ldap_err2string (ldap_error) : "Unknown error");
+				_("LDAP error 0x%x (%s)"), ldap_error,
+				ldap_err2string (ldap_error) ? ldap_err2string (ldap_error) : _("Unknown error"));
 }
 
 static const gchar *
@@ -2019,7 +2019,7 @@ modify_contact_search_handler (LDAPOp *op,
 		if (!e) {
 			e_data_book_respond_modify_contacts (op->book,
 							     op->opid,
-							     e_data_book_create_error_fmt (E_DATA_BOOK_STATUS_OTHER_ERROR, "%s: NULL returned from ldap_first_entry", G_STRFUNC),
+							     e_data_book_create_error_fmt (E_DATA_BOOK_STATUS_OTHER_ERROR, _("%s: NULL returned from ldap_first_entry"), G_STRFUNC),
 							     NULL);
 			ldap_op_finished (op);
 			return;
@@ -2262,7 +2262,7 @@ modify_contact_rename_handler (LDAPOp *op,
 		e_data_book_respond_modify_contacts (op->book,
 						     op->opid,
 						     e_data_book_create_error_fmt (E_DATA_BOOK_STATUS_OTHER_ERROR,
-						     "%s: Unhandled result type %d returned", G_STRFUNC, ldap_msgtype (res)),
+						     _("%s: Unhandled result type %d returned"), G_STRFUNC, ldap_msgtype (res)),
 						     NULL);
 		ldap_op_finished (op);
 	}
@@ -2402,7 +2402,7 @@ get_contact_handler (LDAPOp *op,
 		if (!e) {
 			e_data_book_respond_get_contact (op->book,
 							 op->opid,
-							 e_data_book_create_error_fmt (E_DATA_BOOK_STATUS_OTHER_ERROR, "%s: NULL returned from ldap_first_entry", G_STRFUNC),
+							 e_data_book_create_error_fmt (E_DATA_BOOK_STATUS_OTHER_ERROR, _("%s: NULL returned from ldap_first_entry"), G_STRFUNC),
 							 NULL);
 			ldap_op_finished (op);
 			return;
@@ -2453,7 +2453,7 @@ get_contact_handler (LDAPOp *op,
 		e_data_book_respond_get_contact (op->book,
 						 op->opid,
 						 e_data_book_create_error_fmt (E_DATA_BOOK_STATUS_OTHER_ERROR,
-							"%s: Unhandled result type %d returned", G_STRFUNC, msg_type),
+							_("%s: Unhandled result type %d returned"), G_STRFUNC, msg_type),
 						 NULL);
 		ldap_op_finished (op);
 	}
@@ -2670,7 +2670,7 @@ contact_list_handler (LDAPOp *op,
 		e_data_book_respond_get_contact_list (op->book,
 						      op->opid,
 						      e_data_book_create_error_fmt (E_DATA_BOOK_STATUS_OTHER_ERROR,
-							    "%s: Unhandled search result type %d returned", G_STRFUNC, msg_type),
+							    _("%s: Unhandled search result type %d returned"), G_STRFUNC, msg_type),
 						      NULL);
 		ldap_op_finished (op);
 	}
@@ -2883,7 +2883,7 @@ contact_list_uids_handler (LDAPOp *op,
 		g_warning ("unhandled search result type %d returned", msg_type);
 		e_data_book_respond_get_contact_list_uids (op->book, op->opid,
 							   e_data_book_create_error_fmt (E_DATA_BOOK_STATUS_OTHER_ERROR,
-							      "%s: Unhandled search result type %d returned", G_STRFUNC, msg_type),
+							      _("%s: Unhandled search result type %d returned"), G_STRFUNC, msg_type),
 							   NULL);
 		ldap_op_finished (op);
 	}
@@ -4781,8 +4781,8 @@ ldap_search_handler (LDAPOp *op,
 			edb_err = EDB_ERROR (SUCCESS);
 		else
 			edb_err = e_data_book_create_error_fmt (E_DATA_BOOK_STATUS_OTHER_ERROR,
-				"LDAP error 0x%x (%s)", ldap_error,
-				ldap_err2string (ldap_error) ? ldap_err2string (ldap_error) : "Unknown error");
+				_("LDAP error 0x%x (%s)"), ldap_error,
+				ldap_err2string (ldap_error) ? ldap_err2string (ldap_error) : _("Unknown error"));
 
 		e_data_book_view_notify_complete (view, edb_err);
 		if (edb_err)
diff --git a/addressbook/backends/vcf/e-book-backend-vcf.c b/addressbook/backends/vcf/e-book-backend-vcf.c
index bb61b86..e6a68d3 100644
--- a/addressbook/backends/vcf/e-book-backend-vcf.c
+++ b/addressbook/backends/vcf/e-book-backend-vcf.c
@@ -613,7 +613,7 @@ e_book_backend_vcf_open (EBookBackendSync *backend,
 				if (errno == EACCES || errno == EPERM) {
 					g_propagate_error (perror, EDB_ERROR (PERMISSION_DENIED));
 				} else {
-					g_propagate_error (perror, e_data_book_create_error_fmt (E_DATA_BOOK_STATUS_OTHER_ERROR, "Failed to make directory %s: %s", dirname, g_strerror (errno)));
+					g_propagate_error (perror, e_data_book_create_error_fmt (E_DATA_BOOK_STATUS_OTHER_ERROR, _("Failed to make directory %s: %s"), dirname, g_strerror (errno)));
 				}
 				goto exit;
 			}
@@ -642,7 +642,7 @@ e_book_backend_vcf_open (EBookBackendSync *backend,
 		g_propagate_error (
 			perror, e_data_book_create_error_fmt (
 			E_DATA_BOOK_STATUS_OTHER_ERROR,
-			"Failed to open addressbook at '%s': %s",
+			_("Failed to open addressbook at '%s': %s"),
 			dirname, g_strerror (errno)));
 		goto exit;
 	}
diff --git a/addressbook/backends/webdav/e-book-backend-webdav.c b/addressbook/backends/webdav/e-book-backend-webdav.c
index 91a1287..b8d5d11 100644
--- a/addressbook/backends/webdav/e-book-backend-webdav.c
+++ b/addressbook/backends/webdav/e-book-backend-webdav.c
@@ -444,7 +444,7 @@ e_book_backend_webdav_remove_contacts (EBookBackend *backend,
 			g_warning ("DELETE failed with HTTP status %d", status);
 			e_data_book_respond_remove_contacts (book, opid,
 							     e_data_book_create_error_fmt (E_DATA_BOOK_STATUS_OTHER_ERROR,
-									 "DELETE failed with HTTP status %d", status),
+									 _("DELETE failed with HTTP status %d"), status),
 							     NULL);
 		}
 		return;
@@ -504,7 +504,7 @@ e_book_backend_webdav_modify_contacts (EBookBackend *backend,
 			/* too bad no special error code in evolution for this... */
 			e_data_book_respond_modify_contacts (book, opid,
 					e_data_book_create_error_fmt (E_DATA_BOOK_STATUS_OTHER_ERROR,
-					"Contact on server changed -> not modifying"),
+					_("Contact on server changed -> not modifying")),
 					NULL);
 			g_free (status_reason);
 			return;
@@ -512,7 +512,7 @@ e_book_backend_webdav_modify_contacts (EBookBackend *backend,
 
 		e_data_book_respond_modify_contacts (book, opid,
 				e_data_book_create_error_fmt (E_DATA_BOOK_STATUS_OTHER_ERROR,
-				"Modify contact failed with HTTP status: %d (%s)", status, status_reason),
+				_("Modify contact failed with HTTP status: %d (%s)"), status, status_reason),
 				NULL);
 		g_free (status_reason);
 		return;
@@ -909,7 +909,7 @@ download_contacts (EBookBackendWebdav *webdav,
 
 	if (book_view != NULL) {
 		e_data_book_view_notify_progress (book_view, -1,
-				"Loading Addressbook summary...");
+				_("Loading Addressbook summary..."));
 	}
 
 	message = send_propfind (webdav);
@@ -925,7 +925,7 @@ download_contacts (EBookBackendWebdav *webdav,
 	if (status != 207) {
 		GError *error;
 
-		error = e_data_book_create_error_fmt (E_DATA_BOOK_STATUS_OTHER_ERROR, "PROPFIND on webdav failed with HTTP status %d (%s)",
+		error = e_data_book_create_error_fmt (E_DATA_BOOK_STATUS_OTHER_ERROR, _("PROPFIND on webdav failed with HTTP status %d (%s)"),
 			status,
 			message->reason_phrase && *message->reason_phrase ? message->reason_phrase :
 			(soup_status_get_phrase (message->status_code) ? soup_status_get_phrase (message->status_code) : _("Unknown error")));
@@ -946,7 +946,7 @@ download_contacts (EBookBackendWebdav *webdav,
 		if (book_view)
 			e_data_book_view_notify_progress (book_view, -1, NULL);
 
-		return e_data_book_create_error_fmt (E_DATA_BOOK_STATUS_OTHER_ERROR, "No response body in webdav PROPFIND result");
+		return e_data_book_create_error_fmt (E_DATA_BOOK_STATUS_OTHER_ERROR, _("No response body in webdav PROPFIND result"));
 	}
 
 	/* parse response */
@@ -977,7 +977,7 @@ download_contacts (EBookBackendWebdav *webdav,
 		if (book_view != NULL) {
 			gfloat percent = 100.0 / count * i;
 			gchar buf[100];
-			snprintf (buf, sizeof (buf), "Loading Contacts (%d%%)", (gint) percent);
+			snprintf (buf, sizeof (buf), _("Loading Contacts (%d%%)"), (gint) percent);
 			e_data_book_view_notify_progress (book_view, -1, buf);
 		}
 
@@ -1284,7 +1284,7 @@ e_book_backend_webdav_open (EBookBackend *backend,
 	priv->uri = soup_uri_to_string (suri, FALSE);
 	if (!priv->uri) {
 		soup_uri_free (suri);
-		e_book_backend_respond_opened (backend, book, opid, EDB_ERROR_EX (OTHER_ERROR, "Cannot transform SoupURI to string"));
+		e_book_backend_respond_opened (backend, book, opid, EDB_ERROR_EX (OTHER_ERROR, _("Cannot transform SoupURI to string")));
 		return;
 	}
 
diff --git a/calendar/backends/caldav/e-cal-backend-caldav.c b/calendar/backends/caldav/e-cal-backend-caldav.c
index e6416ab..f4b7f3b 100644
--- a/calendar/backends/caldav/e-cal-backend-caldav.c
+++ b/calendar/backends/caldav/e-cal-backend-caldav.c
@@ -632,7 +632,7 @@ check_state (ECalBackendCalDAV *cbdav,
 	*online = FALSE;
 
 	if (!cbdav->priv->loaded) {
-		g_propagate_error (perror, EDC_ERROR_EX (OtherError, "Not loaded"));
+		g_propagate_error (perror, EDC_ERROR_EX (OtherError, _("CalDAV backend is not loaded yet")));
 		return FALSE;
 	}
 
@@ -1014,7 +1014,7 @@ redirect_handler (SoupMessage *msg,
 		if (!new_uri) {
 			soup_message_set_status_full (msg,
 						      SOUP_STATUS_MALFORMED,
-						      "Invalid Redirect URL");
+						      _("Invalid Redirect URL"));
 			return;
 		}
 
@@ -2636,7 +2636,7 @@ initialize_backend (ECalBackendCalDAV *cbdav,
 		cbdav->priv->store = e_cal_backend_file_store_new (cache_dir);
 
 		if (cbdav->priv->store == NULL) {
-			g_propagate_error (perror, EDC_ERROR_EX (OtherError, "Cannot create local store"));
+			g_propagate_error (perror, EDC_ERROR_EX (OtherError, _("Cannot create local store")));
 			return FALSE;
 		}
 
@@ -2645,7 +2645,7 @@ initialize_backend (ECalBackendCalDAV *cbdav,
 
 	/* Set the local attachment store */
 	if (g_mkdir_with_parents (cache_dir, 0700) < 0) {
-		g_propagate_error (perror, EDC_ERROR_EX (OtherError, "mkdir failed"));
+		g_propagate_error (perror, e_data_cal_create_error_fmt (OtherError, _("Cannot create local cache folder '%s'"), cache_dir));
 		return FALSE;
 	}
 
@@ -2656,7 +2656,7 @@ initialize_backend (ECalBackendCalDAV *cbdav,
 		slave = g_thread_create (caldav_synch_slave_loop, cbdav, FALSE, NULL);
 
 		if (slave == NULL) {
-			g_propagate_error (perror, EDC_ERROR_EX (OtherError, "Could not create synch slave"));
+			g_propagate_error (perror, EDC_ERROR_EX (OtherError, _("Could not create synch slave thread")));
 		}
 
 		cbdav->priv->synch_slave = slave;
@@ -4605,7 +4605,7 @@ caldav_get_free_busy (ECalBackendSync *backend,
 		caldav_receive_schedule_outbox_url (cbdav);
 		if (!cbdav->priv->schedule_outbox_url) {
 			cbdav->priv->calendar_schedule = FALSE;
-			g_propagate_error (error, EDC_ERROR_EX (OtherError, "Schedule outbox url not found"));
+			g_propagate_error (error, EDC_ERROR_EX (OtherError, _("Schedule outbox url not found")));
 			return;
 		}
 	}
@@ -4704,7 +4704,7 @@ caldav_get_free_busy (ECalBackendSync *backend,
 			result = xpath_eval (xpctx, "/C:schedule-response/C:response");
 
 			if (result == NULL || result->type != XPATH_NODESET) {
-				err = EDC_ERROR_EX (OtherError, "Unexpected result in schedule-response");
+				err = EDC_ERROR_EX (OtherError, _("Unexpected result in schedule-response"));
 			} else {
 				gint i, n;
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]