Made clist titles i18n:able Added which views that are possible for --view

1999-03-24  Tomas Ogren  <stric@ing.umu.se>

* gncal-todo.c (gncal_todo_init): Made clist titles i18n:able
* main.c (poptOption): Added which views that are possible for
--view in the --help text (closes #367)
* main.c (dump_events): Added (short) month to the strftime and made
the strings i18n:able

svn path=/trunk/; revision=778

5 files changed, 45 insertions, 16 deletions

diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 81fc21e15a..61d56d9286 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,18 @@
+1999-03-24  Tomas Ogren  <stric@ing.umu.se>
+
+	* gncal-todo.c (gncal_todo_init): Made clist titles i18n:able
+	* main.c (poptOption): Added which views that are possible for
+	--view in the --help text (closes #367)
+	* main.c (dump_events): Added (short) month to the strftime and made
+	the strings i18n:able
+
+1999-03-23  Tomas Ogren  <stric@ing.umu.se>
+
+	* gncal/calobj.c: Added 2 paranthesis..
+	"foobar = d / 60*60" is _NOT_ the same as "foobar = d / (60*60)"
+	which caused heavy alarm-corruption with alarms between 2 hrs and
+	2 days.
+
 1999-03-23  Nat Friedman  <nat@nat.org>
 
 	* eventedit.c (ee_store_recur_rule_to_ical): Set the
diff --git a/calendar/gncal-todo.c b/calendar/gncal-todo.c
index c64233ae88..669b07e07e 100644
--- a/calendar/gncal-todo.c
+++ b/calendar/gncal-todo.c
@@ -377,7 +377,14 @@ gncal_todo_init (GncalTodo *todo)
 	GtkWidget *w;
 	GtkWidget *sw;
 	GtkWidget *hbox;
-	gchar *titles[2] = {"Summary","Due Date"};
+	gchar *titles[2] = {
+	    N_("Summary"),
+	    N_("Due Date")
+	};
+	char *tmp[2];
+	tmp[0] = _(titles[0]);
+	tmp[1] = _(titles[1]);
+
 	gtk_box_set_spacing (GTK_BOX (todo), 4);
 
 	/* Label */
@@ -395,7 +402,7 @@ gncal_todo_init (GncalTodo *todo)
 	gtk_widget_show (sw);
 
 
-	w = gtk_clist_new_with_titles(2, titles);
+	w = gtk_clist_new_with_titles(2, tmp);
 
 	todo->clist = GTK_CLIST (w);
 	gtk_clist_set_selection_mode (todo->clist, GTK_SELECTION_BROWSE);
diff --git a/calendar/gui/gncal-todo.c b/calendar/gui/gncal-todo.c
index c64233ae88..669b07e07e 100644
--- a/calendar/gui/gncal-todo.c
+++ b/calendar/gui/gncal-todo.c
@@ -377,7 +377,14 @@ gncal_todo_init (GncalTodo *todo)
 	GtkWidget *w;
 	GtkWidget *sw;
 	GtkWidget *hbox;
-	gchar *titles[2] = {"Summary","Due Date"};
+	gchar *titles[2] = {
+	    N_("Summary"),
+	    N_("Due Date")
+	};
+	char *tmp[2];
+	tmp[0] = _(titles[0]);
+	tmp[1] = _(titles[1]);
+
 	gtk_box_set_spacing (GTK_BOX (todo), 4);
 
 	/* Label */
@@ -395,7 +402,7 @@ gncal_todo_init (GncalTodo *todo)
 	gtk_widget_show (sw);
 
 
-	w = gtk_clist_new_with_titles(2, titles);
+	w = gtk_clist_new_with_titles(2, tmp);
 
 	todo->clist = GTK_CLIST (w);
 	gtk_clist_set_selection_mode (todo->clist, GTK_SELECTION_BROWSE);
diff --git a/calendar/gui/main.c b/calendar/gui/main.c
index 6818eb8d23..76736acfbe 100644
--- a/calendar/gui/main.c
+++ b/calendar/gui/main.c
@@ -640,14 +640,14 @@ dump_events (void)
 		te = *localtime (&co->ev_end);
 
 		if (same_day (&today, &ts))
-			format = "%H:%M";
+			format = N_("%H:%M");
 		else
-			format = "%A %d, %H:%M";
-		strftime (start, sizeof (start), format, &ts);
+			format = N_("%A %b %d, %H:%M");
+		strftime (start, sizeof (start), _(format), &ts);
 
 		if (!same_day (&ts, &te))
-			format = "%A %d, %H:%M";
-		strftime (end,   sizeof (start), format, &te);
+			format = N_("%A %b %d, %H:%M");
+		strftime (end,   sizeof (start), _(format), &te);
 
 		printf ("%s -- %s\n", start, end);
 		printf ("  %s\n", co->ico->summary);
@@ -715,7 +715,7 @@ static const struct poptOption options [] = {
 	{ "file", 'F', POPT_ARG_STRING, NULL, 'F', N_("File to load calendar from"), N_("FILE") },
 	{ "userfile", '\0', POPT_ARG_NONE, NULL, USERFILE_KEY, N_("Load the user calendar"), NULL },
 	{ "geometry", '\0', POPT_ARG_STRING, NULL, GEOMETRY_KEY, N_("Geometry for starting up"), N_("GEOMETRY") },
-	{ "view", '\0', POPT_ARG_STRING, NULL, VIEW_KEY, N_("The startup view mode"), N_("VIEW") },
+	{ "view", '\0', POPT_ARG_STRING, NULL, VIEW_KEY, N_("The startup view mode (dayview, weekview, monthview, yearview)"), N_("VIEW") },
 	{ "to", 't', POPT_ARG_STRING, NULL, 't', N_("Specifies ending date [for --events]"), N_("DATE") },
 	{ "hidden", 0, POPT_ARG_NONE, NULL, HIDDEN_KEY, N_("If used, starts in iconic mode"), NULL },
 	{ NULL, '\0', 0, NULL, 0}
diff --git a/calendar/main.c b/calendar/main.c
index 6818eb8d23..76736acfbe 100644
--- a/calendar/main.c
+++ b/calendar/main.c
@@ -640,14 +640,14 @@ dump_events (void)
 		te = *localtime (&co->ev_end);
 
 		if (same_day (&today, &ts))
-			format = "%H:%M";
+			format = N_("%H:%M");
 		else
-			format = "%A %d, %H:%M";
-		strftime (start, sizeof (start), format, &ts);
+			format = N_("%A %b %d, %H:%M");
+		strftime (start, sizeof (start), _(format), &ts);
 
 		if (!same_day (&ts, &te))
-			format = "%A %d, %H:%M";
-		strftime (end,   sizeof (start), format, &te);
+			format = N_("%A %b %d, %H:%M");
+		strftime (end,   sizeof (start), _(format), &te);
 
 		printf ("%s -- %s\n", start, end);
 		printf ("  %s\n", co->ico->summary);
@@ -715,7 +715,7 @@ static const struct poptOption options [] = {
 	{ "file", 'F', POPT_ARG_STRING, NULL, 'F', N_("File to load calendar from"), N_("FILE") },
 	{ "userfile", '\0', POPT_ARG_NONE, NULL, USERFILE_KEY, N_("Load the user calendar"), NULL },
 	{ "geometry", '\0', POPT_ARG_STRING, NULL, GEOMETRY_KEY, N_("Geometry for starting up"), N_("GEOMETRY") },
-	{ "view", '\0', POPT_ARG_STRING, NULL, VIEW_KEY, N_("The startup view mode"), N_("VIEW") },
+	{ "view", '\0', POPT_ARG_STRING, NULL, VIEW_KEY, N_("The startup view mode (dayview, weekview, monthview, yearview)"), N_("VIEW") },
 	{ "to", 't', POPT_ARG_STRING, NULL, 't', N_("Specifies ending date [for --events]"), N_("DATE") },
 	{ "hidden", 0, POPT_ARG_NONE, NULL, HIDDEN_KEY, N_("If used, starts in iconic mode"), NULL },
 	{ NULL, '\0', 0, NULL, 0}