Made title i18n friendly. This was bug #215.

* main.c (new_calendar): Made title i18n friendly. This was bug #215.

* eventedit.c (ee_store_recur_end_to_ical): Set recur->enddate to
recur->_enddate, not to itself, when adding recurring event and supplying
an end date. This fixes (at least part of) bug #99.

svn path=/trunk/; revision=310

5 files changed, 21 insertions, 10 deletions

diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 7de7dd2c19..dac6928599 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,12 @@
+1998-08-11  Nuno Ferreira  <nmrf@rnl.ist.utl.pt>
+
+	* main.c (new_calendar): Made title i18n friendly. This was bug
+	#215.
+
+	* eventedit.c (ee_store_recur_end_to_ical): Set recur->enddate to
+	recur->_enddate, not to itself, when adding recurring event and
+	supplying an end date. This fixes (at least part of) bug #99.
+
 1998-08-10  Federico Mena Quintero  <federico@nuclecu.unam.mx>
 
 	* month-view.[ch]: Start of the month view widget.  This will use
diff --git a/calendar/eventedit.c b/calendar/eventedit.c
index 4cc9ce65b6..3189b11300 100644
--- a/calendar/eventedit.c
+++ b/calendar/eventedit.c
@@ -611,7 +611,7 @@ ee_store_recur_end_to_ical (EventEditor *ee)
 	case 1:
 		/* end date */
 		ical->recur->_enddate = gnome_date_edit_get_date (GNOME_DATE_EDIT (ee->recur_ed_end_on));
-		ical->recur->enddate = ical->recur->enddate;
+		ical->recur->enddate = ical->recur->_enddate;
 		ical->recur->duration = 0;
 		break;
 
diff --git a/calendar/gui/eventedit.c b/calendar/gui/eventedit.c
index 4cc9ce65b6..3189b11300 100644
--- a/calendar/gui/eventedit.c
+++ b/calendar/gui/eventedit.c
@@ -611,7 +611,7 @@ ee_store_recur_end_to_ical (EventEditor *ee)
 	case 1:
 		/* end date */
 		ical->recur->_enddate = gnome_date_edit_get_date (GNOME_DATE_EDIT (ee->recur_ed_end_on));
-		ical->recur->enddate = ical->recur->enddate;
+		ical->recur->enddate = ical->recur->_enddate;
 		ical->recur->duration = 0;
 		break;
 
diff --git a/calendar/gui/main.c b/calendar/gui/main.c
index a769fa6df0..80ee344fcb 100644
--- a/calendar/gui/main.c
+++ b/calendar/gui/main.c
@@ -396,10 +396,12 @@ static void
 new_calendar (char *full_name, char *calendar_file, char *geometry, char *page)
 {
 	GtkWidget   *toplevel;
-	char        *title;
+	char        title[128];
 	int         xpos, ypos, width, height;
-	
-	title = g_copy_strings (full_name, "'s calendar", NULL);
+
+	/* i18n: This "%s%s" indicates possession. Languages where the order is
+       the inverse should translate it to "%2$s%1$s". */
+	g_snprintf(title, 128, _("%s%s"), full_name, _("'s calendar"), NULL);
 
 	toplevel = gnome_calendar_new (title);
 	if (gnome_parse_geometry (geometry, &xpos, &ypos, &width, &height)){
@@ -408,7 +410,6 @@ new_calendar (char *full_name, char *calendar_file, char *geometry, char *page)
 		if (width != -1)
 			gtk_widget_set_usize (toplevel, width, height);
 	}
-	g_free (title);
 	setup_menu (toplevel);
 
 	if (page)
diff --git a/calendar/main.c b/calendar/main.c
index a769fa6df0..80ee344fcb 100644
--- a/calendar/main.c
+++ b/calendar/main.c
@@ -396,10 +396,12 @@ static void
 new_calendar (char *full_name, char *calendar_file, char *geometry, char *page)
 {
 	GtkWidget   *toplevel;
-	char        *title;
+	char        title[128];
 	int         xpos, ypos, width, height;
-	
-	title = g_copy_strings (full_name, "'s calendar", NULL);
+
+	/* i18n: This "%s%s" indicates possession. Languages where the order is
+       the inverse should translate it to "%2$s%1$s". */
+	g_snprintf(title, 128, _("%s%s"), full_name, _("'s calendar"), NULL);
 
 	toplevel = gnome_calendar_new (title);
 	if (gnome_parse_geometry (geometry, &xpos, &ypos, &width, &height)){
@@ -408,7 +410,6 @@ new_calendar (char *full_name, char *calendar_file, char *geometry, char *page)
 		if (width != -1)
 			gtk_widget_set_usize (toplevel, width, height);
 	}
-	g_free (title);
 	setup_menu (toplevel);
 
 	if (page)