Merge branch 'patch-1' into 'dev'

Added translation on Clock

See merge request Shinobi-Systems/Shinobi!95

languages/en_CA.json

@@ -38,6 +38,18 @@
    "Allow API Trigger": "Allow API Trigger",
    "When Detector is Off": "When Detector is Off",
    "When Detector is On": "When Detector is On",
+   "January" : "January",
+   "February" : "February",
+   "March" : "March",
+   "April" : "April",
+   "May": "May",
+   "June" : "June",
+   "July" : "July",
+   "August" : "August",
+   "September" : "September",
+   "October" : "October",
+   "November" : "November",
+   "December" : "December",
    "Sunday": "Sunday",
    "Monday": "Monday",
    "Tuesday": "Tuesday",

web/libs/js/clock.js

@@ -1,6 +1,6 @@
 $(document).ready(function() {
-    var monthNames = [ "January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December" ]; 
-    var dayNames= ["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"]
+    var monthNames = [ lang.January, lang.February, lang.March, lang.April, lang.May, lang.June, lang.July, lang.August, lang.September, lang.October, lang.November, lang.December ]; 
+    var dayNames= [lang.Sunday, lang.Monday, lang.Tuesday, lang.Wednesday, lang.Thursday, lang.Friday, lang.Saturday]
 
     var newDate = new Date();
     newDate.setDate(newDate.getDate());