translatable error messages

diff --git a/apps/calendar/js/calendar.js b/apps/calendar/js/calendar.js
index a29d667285802d80b1458b8bae2e53b88b11c952..afbb1b28586a6a7f8113aa4612acbaf4ebac6019 100644 (file)
--- a/apps/calendar/js/calendar.js
+++ b/apps/calendar/js/calendar.js
@@ -91,27 +91,27 @@ Calendar={
                        $.post(url, post,
                                function(data){
                                        if(data.status == "error"){
-                                               var output = "Missing fields: <br />";
+                                               var output = missing_field + ": <br />";
                                                if(data.title == "true"){
-                                                       output = output + "Title<br />";
+                                                       output = output + missing_field_title + "<br />";
                                                }
                                                if(data.cal == "true"){
-                                                       output = output + "Calendar<br />";
+                                                       output = output + missing_field_calendar + "<br />";
                                                }
                                                if(data.from == "true"){
-                                                       output = output + "From Date<br />";
+                                                       output = output + missing_field_fromdate + "<br />";
                                                }
                                                if(data.fromtime == "true"){
-                                                       output = output + "From Time<br />";
+                                                       output = output + missing_field_fromtime + "<br />";
                                                }
                                                if(data.to == "true"){
-                                                       output = output + "To Date<br />";
+                                                       output = output + missing_field_todate + "<br />";
                                                }
                                                if(data.totime == "true"){
-                                                       output = output + "To Time<br />";
+                                                       output = output + missing_field_totime + "<br />";
                                                }
                                                if(data.endbeforestart == "true"){
-                                                       output = "The event ends before it starts!";
+                                                       output = output + missing_field_startsbeforeends + "!<br/>";
                                                }
                                                if(data.dberror == "true"){
                                                        output = "There was a database fail!";

diff --git a/apps/calendar/l10n/xgettextfiles b/apps/calendar/l10n/xgettextfiles
index 4cc636436b47a70d9486d2700071b1643d730f72..27b8e457193f5c340125bcc3e4e17b9980abc10e 100644 (file)
--- a/apps/calendar/l10n/xgettextfiles
+++ b/apps/calendar/l10n/xgettextfiles
@@ -1,7 +1,11 @@
 ../appinfo/app.php
+../lib/object.php
 ../templates/calendar.php
+../templates/part.choosecalendar.php
+../templates/part.choosecalendar.rowfields.php
+../templates/part.editcalendar.php
 ../templates/part.editevent.php
-../templates/part.eventinfo.php
+../templates/part.eventform.php
+../templates/part.import.php
 ../templates/part.newevent.php
-../templates/part.choosecalendar.php
-../js/calendar.js
+../templates/settings.php
\ No newline at end of file

diff --git a/apps/calendar/templates/calendar.php b/apps/calendar/templates/calendar.php
index 1c948b948c20288446da17038c3e367226ff8b14..0a6a7008fc1f92fc8e29b5fb3a8767081406701f 100644 (file)
--- a/apps/calendar/templates/calendar.php
+++ b/apps/calendar/templates/calendar.php
@@ -6,6 +6,15 @@ var dayNamesShort = <?php echo json_encode($l->tA(array('Sun.', 'Mon.', 'Tue.',
 var monthNames = <?php echo json_encode($l->tA(array('January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'))) ?>;
 var monthNamesShort = <?php echo json_encode($l->tA(array('Jan.', 'Feb.', 'Mar.', 'Apr.', 'May.', 'Jun.', 'Jul.', 'Aug.', 'Sep.', 'Oct.', 'Nov.', 'Dec.'))) ?>;
 var allDayText = '<?php echo $l->t('All day') ?>';
+var missing_field = '<?php echo $l->t('Missing fields') ?>';
+var missing_field_title = '<?php echo $l->t('Title') ?>';
+var missing_field_calendar = '<?php echo $l->t('Calendar') ?>';
+var missing_field_fromdate = '<?php echo $l->t('From Date') ?>';
+var missing_field_fromtime = '<?php echo $l->t('From Time') ?>';
+var missing_field_todate = '<?php echo $l->t('To Date') ?>';
+var missing_field_totime = '<?php echo $l->t('To Time') ?>';
+var missing_field_startsbeforeends = '<?php echo $l->t('The event ends before it starts') ?>';
+var missing_field_dberror = '<?php echo $l->t('There was a database fail') ?>';
 </script>
                                <div id="controls">
                                        <div>
@@ -25,7 +34,7 @@ var allDayText = '<?php echo $l->t('All day') ?>';
                                                <form>
                                                        <div id="datecontrol">
                                                                <input type="button" value="&nbsp;&lt;&nbsp;" id="datecontrol_left"/>
-                                                               <span id="datecontrol_date"></span>
+                                                               <span class="button" id="datecontrol_date"></span>
                                                                <input type="button" value="&nbsp;&gt;&nbsp;" id="datecontrol_right"/>
                                                        </div>
                                                </form>