Index: openacs-4/packages/calendar/calendar.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/calendar.info,v
diff -u -r1.47.2.12 -r1.47.2.13
--- openacs-4/packages/calendar/calendar.info	21 Oct 2022 13:20:22 -0000	1.47.2.12
+++ openacs-4/packages/calendar/calendar.info	14 Feb 2023 14:18:25 -0000	1.47.2.13
@@ -7,7 +7,7 @@
     <initial-install-p>f</initial-install-p>
     <singleton-p>f</singleton-p>
 
-    <version name="2.10.1d4" url="http://openacs.org/repository/download/apm/calendar-2.10.1d4.apm">
+    <version name="2.10.1d5" url="http://openacs.org/repository/download/apm/calendar-2.10.1d5.apm">
         <owner url="mailto:openacs-calendar@dirkgomez.de">Dirk Gomez</owner>
         <summary>Personal and shared event calendars.</summary>
         <release-date>2021-09-15</release-date>
@@ -17,7 +17,7 @@
         <maturity>2</maturity>
         <package_instance_name>#calendar.Calendar#</package_instance_name>
 
-        <provides url="calendar" version="2.10.1d4"/>
+        <provides url="calendar" version="2.10.1d5"/>
         <requires url="attachments" version="0.11"/>
         <requires url="acs-datetime" version="5.9.1"/>
         <requires url="acs-events" version="0.6.2d2"/>
Index: openacs-4/packages/calendar/catalog/calendar.de_DE.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/catalog/calendar.de_DE.ISO-8859-1.xml,v
diff -u -r1.19.2.2 -r1.19.2.3
--- openacs-4/packages/calendar/catalog/calendar.de_DE.ISO-8859-1.xml	21 Oct 2022 13:20:22 -0000	1.19.2.2
+++ openacs-4/packages/calendar/catalog/calendar.de_DE.ISO-8859-1.xml	14 Feb 2023 14:18:25 -0000	1.19.2.3
@@ -49,6 +49,7 @@
   <msg key="developer_note_calendar_add">Hinweis: Die Erstellung eines neuen Kalenders erfolgt in drei Schritten: &lt;ol&gt; &lt;li&gt; Geben Sie einen Namen f�r den Kalender ein und �ndern Sie falls n�tig die Standardberechtigungen. &lt;li&gt; W�hlen Sie Gruppen und/oder einzelne Benutzer als Zielgruppe aus. &lt;li&gt; Erteilen Sie nach Bedarf gruppen- oder benutzerspezifische Berechtigungen.&lt;/ol&gt;  </msg>
   <msg key="Edit">Bearbeiten</msg>
   <msg key="edit">Bearbeiten</msg>
+  <msg key="Edited">Bearbeitet</msg>
   <msg key="End_Time">Endet</msg>
   <msg key="Event">Ereignis</msg>
   <msg key="Events">Ereignisse</msg>
@@ -82,6 +83,7 @@
   <msg key="Item">Eintrag</msg>
   <msg key="last_week">letzte Woche</msg>
   <msg key="List">Liste</msg>
+  <msg key="Location">Ort</msg>
   <msg key="lt_Are_you_sure_you_want">Wollen Sie diesen Kalender wirklich l�schen? Alle Eintr�ge und die mit dem Kalender verbundenen Berechtigungen werden dann ebenfalls gel�scht.</msg>
   <msg key="lt_Are_you_sure_you_want_1">Wollen Sie dieses Ereignis wirklich l�schen?</msg>
   <msg key="lt_Audiences_for_calenda">Zielgruppen f�r Kalender</msg>
@@ -115,6 +117,7 @@
   <msg key="Manage_Item_Types">Elementtypen verwalten</msg>
   <msg key="Monday">Montag</msg>
   <msg key="Month">Monat</msg>
+  <msg key="New">Neuer</msg>
   <msg key="New_Type">Neue Eintragskategorie:</msg>
   <msg key="next_day">N�chster Tag</msg>
   <msg key="next_month">N�chster Monat</msg>
@@ -177,5 +180,4 @@
   <msg key="Yes">Ja</msg>
   <msg key="yes_delete_it">Ja, l�schen</msg>
   <msg key="Yes_I_am_sure">Ja, wirklich</msg>
-  <msg key="Location">Ort</msg>
 </message_catalog>
Index: openacs-4/packages/calendar/catalog/calendar.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/catalog/calendar.en_US.ISO-8859-1.xml,v
diff -u -r1.36.2.1 -r1.36.2.2
--- openacs-4/packages/calendar/catalog/calendar.en_US.ISO-8859-1.xml	5 Dec 2021 16:13:59 -0000	1.36.2.1
+++ openacs-4/packages/calendar/catalog/calendar.en_US.ISO-8859-1.xml	14 Feb 2023 14:18:25 -0000	1.36.2.2
@@ -30,9 +30,9 @@
   <msg key="Calendar_Item_Delete">Calendar Item Delete</msg>
   <msg key="Calendar_Item_Types">Calendar Item Types</msg>
   <msg key="Calendar_Name">Calendar Name</msg>
-  <msg key="Calendar_Permissions">&quot;Calendar Permissions&quot;</msg>
+  <msg key="Calendar_Permissions">&#34;Calendar Permissions&#34;</msg>
   <msg key="Calendar_Permissions_1">Calendar Permissions</msg>
-  <msg key="Calendar_Preferences">&quot;Calendar Preferences&quot;</msg>
+  <msg key="Calendar_Preferences">&#34;Calendar Preferences&#34;</msg>
   <msg key="Calendars">Calendars</msg>
   <msg key="Choose">Choose</msg>
   <msg key="Close_Window">Close Window</msg>
@@ -59,6 +59,7 @@
 </msg>
   <msg key="Edit">Edit</msg>
   <msg key="edit">edit</msg>
+  <msg key="Edited">Edited</msg>
   <msg key="End_Time">End Time</msg>
   <msg key="Event">Event</msg>
   <msg key="Events">Events</msg>
@@ -94,7 +95,7 @@
   <msg key="List">List</msg>
   <msg key="Location">Location</msg>
   <msg key="lt_Are_you_sure_you_want">Are you sure you want to delete this calendar? All the calendar items
-      and all the permission that's associated with this calendar will be 
+      and all the permission that&#39;s associated with this calendar will be 
       deleted as well.</msg>
   <msg key="lt_Are_you_sure_you_want_1">Are you sure you want to delete this event?</msg>
   <msg key="lt_Audiences_for_calenda">Audiences for calendar</msg>
@@ -103,7 +104,7 @@
   <msg key="lt_Calendar_Choose_Calen">Calendar: Choose Calendar</msg>
   <msg key="lt_Calendar_detail_listi">Calendar detail: listing all the info about the individual calendar</msg>
   <msg key="lt_Calendar_Item_Adminis">Calendar Item Administration</msg>
-  <msg key="lt_Calendar_Item_Permiss">&quot;Calendar Item Permissions&quot;</msg>
+  <msg key="lt_Calendar_Item_Permiss">&#34;Calendar Item Permissions&#34;</msg>
   <msg key="lt_Calendars_Repeating_E">Calendars: Repeating Event</msg>
   <msg key="lt_Create_a_new_calendar">Create a new calendar</msg>
   <msg key="lt_delete_all_occurrence">delete all occurrences</msg>
@@ -119,21 +120,21 @@
         &lt;/if&gt;
 
         &lt;else&gt;
-          &lt;tr class=&quot;days&quot;&gt;
-            &lt;multiple name=&quot;days_of_week&quot;&gt;
+          &lt;tr class=&#34;days&#34;&gt;
+            &lt;multiple name=&#34;days_of_week&#34;&gt;
               &lt;td&gt;%days_of_week.day_short%&lt;/td&gt;
             &lt;/multiple&gt;
           &lt;/tr&gt;
       
-          &lt;multiple name=&quot;days&quot;&gt;
+          &lt;multiple name=&#34;days&#34;&gt;
             &lt;if %days.beginning_of_week_p% true&gt;
               &lt;tr&gt;
             &lt;/if&gt;
         
             &lt;if %days.active_p% true&gt;
               &lt;if %days.today_p% true&gt;
-                &lt;td class=&quot;today&quot; onclick=&quot;javascript:location.href='%days.url%';&quot;&gt;
-                  &lt;a href=&quot;%days.url%&quot; title=&quot;&lt;#_ Go to %month_name% %days.day_number%, %year%</msg>
+                &lt;td class=&#34;today&#34; onclick=&#34;javascript:location.href=&#39;%days.url%&#39;;&#34;&gt;
+                  &lt;a href=&#34;%days.url%&#34; title=&#34;&lt;#_ Go to %month_name% %days.day_number%, %year%</msg>
   <description key="lt_Go_to_monthsname_curr_1">This looks like a buggy internationalization of the package.</description>
 
   <msg key="lt_Hide_Checked_Calendar">Hide Selected Calendars</msg>
@@ -149,12 +150,13 @@
   <msg key="lt_There_are_no_audience">There are no audiences for this calendar</msg>
   <msg key="lt_This_is_a_repeating_e">This is a repeating event</msg>
   <msg key="lt_You_are_choosing_to_m">You are choosing to make this event recurrent, so that it appears more
-than once in your calendar. The event's details are:</msg>
+than once in your calendar. The event&#39;s details are:</msg>
   <msg key="lt_You_can_manage_the_fo">You can manage the following calendars</msg>
   <msg key="lt_You_have_no_party_wid">You have no party wide calendars</msg>
   <msg key="Manage_Item_Types">Manage Item Types</msg>
   <msg key="Monday">Monday</msg>
   <msg key="Month">Month</msg>
+  <msg key="New">New</msg>
   <msg key="New_Type">New Type:</msg>
   <msg key="next_day">Next day</msg>
   <msg key="next_month">Next Month</msg>
@@ -211,7 +213,6 @@
   <msg key="Type_Help">Your calendar item can optionally be classified
   into types. Choose one from the drop down.</msg>
   <msg key="Use_Hours_Below">Use Hours Below:</msg>
-  <msg key="Use_Hours_Below">Use Hours Below:</msg>
   <msg key="view">View</msg>
   <msg key="Wednesday">Wednesday</msg>
   <msg key="Week">Week</msg>
Index: openacs-4/packages/calendar/catalog/calendar.it_IT.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/catalog/calendar.it_IT.ISO-8859-1.xml,v
diff -u -r1.18 -r1.18.2.1
--- openacs-4/packages/calendar/catalog/calendar.it_IT.ISO-8859-1.xml	22 Jun 2018 08:46:59 -0000	1.18
+++ openacs-4/packages/calendar/catalog/calendar.it_IT.ISO-8859-1.xml	14 Feb 2023 14:18:25 -0000	1.18.2.1
@@ -49,6 +49,7 @@
   <msg key="developer_note_calendar_add">Nota per gli Sviluppatori: Il processo di creazione del calendario comporta i seguenti passi: &lt;ol&gt;  &lt;li&gt; Creare l&#39;oggetto &amp;quote;calendario&amp;quot;, e modificare i permessi di default se necessario.&lt;li&gt; Seleziona gruppi e/o utenti che potranno vedere il calendario &lt;li&gt; Ae necessario, applicare i permessi specifici agli utenti o ai gruppi. &lt;/ol&gt;</msg>
   <msg key="Edit">Modifica</msg>
   <msg key="edit">modifica</msg>
+  <msg key="Edited">Modificato</msg>
   <msg key="End_Time">Ora finale</msg>
   <msg key="Event">Evento</msg>
   <msg key="Events">Eventi</msg>
@@ -116,6 +117,7 @@
   <msg key="Manage_Item_Types">Gestisci i Tipi evento</msg>
   <msg key="Monday">Luned�</msg>
   <msg key="Month">Mese</msg>
+  <msg key="New">Nuovo</msg>
   <msg key="New_Type">Nuovo Tipo:</msg>
   <msg key="next_day">Giorno successivo</msg>
   <msg key="next_month">Mese Successivo</msg>
Index: openacs-4/packages/calendar/tcl/calendar-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/tcl/calendar-procs.tcl,v
diff -u -r1.39.2.13 -r1.39.2.14
--- openacs-4/packages/calendar/tcl/calendar-procs.tcl	14 Feb 2023 08:47:51 -0000	1.39.2.13
+++ openacs-4/packages/calendar/tcl/calendar-procs.tcl	14 Feb 2023 14:18:25 -0000	1.39.2.14
@@ -565,6 +565,10 @@
     # send text for now.
     set new_content [ad_html_to_text -- $new_content]
 
+    if {[lang::message::message_exists_p en_US calendar.$mode]} {
+        set mode [_ calendar.$mode]
+    }
+
     # Do the notification for the calendar
     notification::new \
         -type_id [notification::type::get_type_id \
Index: openacs-4/packages/calendar/tcl/test/cal-item-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/tcl/test/cal-item-procs.tcl,v
diff -u -r1.8.2.6 -r1.8.2.7
--- openacs-4/packages/calendar/tcl/test/cal-item-procs.tcl	14 Feb 2023 13:43:31 -0000	1.8.2.6
+++ openacs-4/packages/calendar/tcl/test/cal-item-procs.tcl	14 Feb 2023 14:18:25 -0000	1.8.2.7
@@ -269,25 +269,11 @@
                  -description $ci_description \
                  -calendar_id $calendar_id]
 
-        aa_log "Create a notification request for the calendar item"
-        set type_id [notification::type::get_type_id -short_name calendar_notif]
-        set delivery_method_id [lindex [notification::get_delivery_methods -type_id $type_id] 0 1]
-        set interval_id [lindex [notification::get_intervals -type_id $type_id] 0 1]
         set package_id [ad_conn package_id]
-        notification::request::new \
-            -type_id $type_id \
-            -user_id $user_id \
-            -object_id $package_id \
-            -interval_id $interval_id \
-            -delivery_method_id $delivery_method_id
-
-        aa_log "Do notifications"
-        calendar::do_notifications \
-            -mode TestMode \
-            -cal_item_id $cal_item_id
+        set mode_pretty [_ calendar.New]
         aa_true "Notification was generated" [db_0or1row check {
             select 1 from notifications where object_id = :package_id
-            and notif_subject like '%TestMode%'
+            and notif_subject like '%' || :mode_pretty || '%'
             and response_id = :cal_item_id
         }]