remove markups around 'Location'

diff --git a/libempathy-gtk/empathy-contact-widget.c b/libempathy-gtk/empathy-contact-widget.c
index da4e002e375cc15d20c0d55781ad3fec29b80423..4ee188cdd9cd078bf11d84adb84c767d1c2bd953 100644 (file)
--- a/libempathy-gtk/empathy-contact-widget.c
+++ b/libempathy-gtk/empathy-contact-widget.c
@@ -695,13 +695,17 @@ contact_widget_location_update (EmpathyContactWidget *information)
       gchar *text;
       gint64 stamp;
       time_t time_;
       gchar *text;
       gint64 stamp;
       time_t time_;

+      gchar *tmp;

 
       stamp = g_value_get_int64 (value);
       time_ = stamp;
 
       user_date = empathy_time_to_string_relative (time_);
 
 
       stamp = g_value_get_int64 (value);
       time_ = stamp;
 
       user_date = empathy_time_to_string_relative (time_);
 

-      text = g_strconcat ( _("<b>Location</b>, "), user_date, NULL);
+      tmp = g_strdup_printf ("<b>%s</b>", _("Location"));
+      /* translators: format is "Location, $date" */
+      text = g_strdup_printf (_("%s, %s"), tmp, user_date);
+      g_free (tmp);

       gtk_label_set_markup (GTK_LABEL (information->label_location), text);
       g_free (user_date);
       g_free (text);
       gtk_label_set_markup (GTK_LABEL (information->label_location), text);
       g_free (user_date);
       g_free (text);

diff --git a/libempathy-gtk/empathy-individual-widget.c b/libempathy-gtk/empathy-individual-widget.c
index 302aa4fb9a5443f75d0455c3559931fa705bb92e..8c2604c86e1d90773c47d69f9e603f7c936732d3 100644 (file)
--- a/libempathy-gtk/empathy-individual-widget.c
+++ b/libempathy-gtk/empathy-individual-widget.c
@@ -585,13 +585,17 @@ location_update (EmpathyIndividualWidget *self)
       gchar *text;
       gint64 stamp;
       time_t time_;
       gchar *text;
       gint64 stamp;
       time_t time_;

+      gchar *tmp;

 
       stamp = g_value_get_int64 (value);
       time_ = stamp;
 
       user_date = empathy_time_to_string_relative (time_);
 
 
       stamp = g_value_get_int64 (value);
       time_ = stamp;
 
       user_date = empathy_time_to_string_relative (time_);
 

-      text = g_strconcat ( _("<b>Location</b>, "), user_date, NULL);
+      tmp = g_strdup_printf ("<b>%s</b>", _("Location"));
+      /* translators: format is "Location, $date" */
+      text = g_strdup_printf (_("%s, %s"), tmp, user_date);
+      g_free (tmp);

       gtk_label_set_markup (GTK_LABEL (priv->label_location), text);
       g_free (user_date);
       g_free (text);
       gtk_label_set_markup (GTK_LABEL (priv->label_location), text);
       g_free (user_date);
       g_free (text);