[gnome-control-center] user-accounts: Mark some strings as translatable
- From: Jiro Matsuzawa <jmatsuzawa src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-control-center] user-accounts: Mark some strings as translatable
- Date: Tue, 13 Aug 2013 12:16:17 +0000 (UTC)
commit aa3af401147c9550bc19d14b5cdaf5588083f7c1
Author: Jiro Matsuzawa <jmatsuzawa gnome org>
Date: Mon Aug 12 14:49:43 2013 +0900
user-accounts: Mark some strings as translatable
https://bugzilla.gnome.org/show_bug.cgi?id=695230
panels/user-accounts/um-history-dialog.c | 28 ++++++++++++++++++++--------
panels/user-accounts/um-user-panel.c | 8 ++++++--
panels/user-accounts/um-utils.c | 6 ++++--
3 files changed, 30 insertions(+), 12 deletions(-)
---
diff --git a/panels/user-accounts/um-history-dialog.c b/panels/user-accounts/um-history-dialog.c
index 3f4cc19..13df362 100644
--- a/panels/user-accounts/um-history-dialog.c
+++ b/panels/user-accounts/um-history-dialog.c
@@ -92,15 +92,23 @@ show_week_label (UmHistoryDialog *um)
}
else {
date = g_date_time_add_days (um->week, 6);
- from = g_date_time_format (um->week, "%b %e");
+ /* Translators: This is a date format string in the style of "Feb 18",
+ shown as the first day of a week on login history dialog. */
+ from = g_date_time_format (um->week, C_("login history week label","%b %e"));
if (g_date_time_get_year (um->week) == g_date_time_get_year (um->current_week)) {
- to = g_date_time_format (date, "%b %e");
+ /* Translators: This is a date format string in the style of "Feb 24",
+ shown as the last day of a week on login history dialog. */
+ to = g_date_time_format (date, C_("login history week label","%b %e"));
}
else {
- to = g_date_time_format (date, "%b %e, %Y");
+ /* Translators: This is a date format string in the style of "Feb 24, 2013",
+ shown as the last day of a week on login history dialog. */
+ to = g_date_time_format (date, C_("login history week label","%b %e, %Y"));
}
- label = g_strconcat (from, " - ", to, NULL);
+ /* Translators: This indicates a week label on a login history.
+ The first %s is the first day of a week, and the second %s the last day. */
+ label = g_strdup_printf(C_("login history week label", "%s - %s"), from, to);
g_date_time_unref (date);
g_free (from);
@@ -182,8 +190,12 @@ add_record (GtkWidget *grid, GDateTime *datetime, gchar *record_string, gint lin
GtkWidget *label;
date = get_smart_date (datetime);
- time = g_date_time_format (datetime, "%k:%M");
- str = g_strconcat (date, ", ", time, NULL);
+ /* Translators: This is a time format string in the style of "22:58".
+ It indicates a login time which follows a date. */
+ time = g_date_time_format (datetime, C_("login date-time", "%k:%M"));
+ /* Translators: This indicates a login date-time.
+ The first %s is a date, and the second %s a time. */
+ str = g_strdup_printf(C_("login date-time", "%s, %s"), date, time);
label = gtk_label_new (str);
gtk_widget_set_halign (label, GTK_ALIGN_START);
gtk_grid_attach (GTK_GRID (grid), label, 1, line, 1, 1);
@@ -245,13 +257,13 @@ show_week (UmHistoryDialog *um)
if (history.logout_time > 0 && history.logout_time < to) {
datetime = g_date_time_new_from_unix_local (history.logout_time);
- add_record (grid, datetime, "Session Ended", line);
+ add_record (grid, datetime, _("Session Ended"), line);
line++;
}
if (history.login_time >= from) {
datetime = g_date_time_new_from_unix_local (history.login_time);
- add_record (grid, datetime, "Session Started", line);
+ add_record (grid, datetime, _("Session Started"), line);
line++;
}
}
diff --git a/panels/user-accounts/um-user-panel.c b/panels/user-accounts/um-user-panel.c
index 2785c38..73a93e1 100644
--- a/panels/user-accounts/um-user-panel.c
+++ b/panels/user-accounts/um-user-panel.c
@@ -621,9 +621,13 @@ get_login_time_text (ActUser *user)
else if (time > 0) {
date_time = g_date_time_new_from_unix_local (time);
date_str = get_smart_date (date_time);
- time_str = g_date_time_format (date_time, "%k:%M");
+ /* Translators: This is a time format string in the style of "22:58".
+ It indicates a login time which follows a date. */
+ time_str = g_date_time_format (date_time, C_("login date-time", "%k:%M"));
- text = g_strconcat (date_str, ", ", time_str, NULL);
+ /* Translators: This indicates a login date-time.
+ The first %s is a date, and the second %s a time. */
+ text = g_strdup_printf(C_("login date-time", "%s, %s"), date_str, time_str);
g_date_time_unref (date_time);
g_free (date_str);
diff --git a/panels/user-accounts/um-utils.c b/panels/user-accounts/um-utils.c
index f6b495b..529812c 100644
--- a/panels/user-accounts/um-utils.c
+++ b/panels/user-accounts/um-utils.c
@@ -791,10 +791,12 @@ get_smart_date (GDateTime *date)
}
else {
if (g_date_time_get_year (date) == g_date_time_get_year (today)) {
- label = g_date_time_format (date, "%b %e");
+ /* Translators: This is a date format string in the style of "Feb 24". */
+ label = g_date_time_format (date, _("%b %e"));
}
else {
- label = g_date_time_format (date, "%b %e, %Y");
+ /* Translators: This is a date format string in the style of "Feb 24, 2013". */
+ label = g_date_time_format (date, _("%b %e, %Y"));
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]