SAM-3012 - Clean up events in samigo to remove camel case and improve…

… consistency (sakaiproject#4194)
jbbadano · Apr 22, 2017 · 59e65c3 · 59e65c3
1 parent 9e7bb10
commit 59e65c3
Show file tree

Hide file tree

Showing 20 changed files with 68 additions and 35 deletions.
diff --git a/dashboard/app/src/java/org/sakaiproject/dash/app/SakaiProxy.java b/dashboard/app/src/java/org/sakaiproject/dash/app/SakaiProxy.java
@@ -87,14 +87,14 @@ public interface SakaiProxy {
        sam.pubsetting.edit    | siteId=f08b61c2-2b74-4355-8978-ae26718a00b7, publishedAssessmentId=13 
        sam.pubassessment.confirm_edit | siteId=f08b61c2-2b74-4355-8978-ae26718a00b7, publishedAssessmentId=13 
        sam.pubassessment.republish    | siteId=f08b61c2-2b74-4355-8978-ae26718a00b7, publishedAssessmentId=13  
-       sam.pubAssessment.remove       | siteId=f08b61c2-2b74-4355-8978-ae26718a00b7, publisedAssessmentId=13  
+       sam.pubassessment.remove       | siteId=f08b61c2-2b74-4355-8978-ae26718a00b7, publisedAssessmentId=13  
     */
 
 	public static final String EVENT_PUBASSESSMENT_PUBLISH = "sam.assessment.publish";
 	public static final String EVENT_PUBASSESSMENT_SETTINGS = "sam.pubsetting.edit";
 	public static final String EVENT_PUBASSESSMENT_UNPUBLISH = "sam.pubassessment.confirm_edit";
 	public static final String EVENT_PUBASSESSMENT_REPUBLISH = "sam.pubassessment.republish";
-	public static final String EVENT_PUBASSESSMENT_REMOVE = "sam.pubAssessment.remove";
+	public static final String EVENT_PUBASSESSMENT_REMOVE = "sam.pubassessment.remove";
 
 	public static final String PERMIT_ANNOUNCEMENT_ACCESS = AnnouncementService.SECURE_ANNC_READ;
     public static final String PERMIT_ANNOUNCEMENT_ACCESS_DRAFT = AnnouncementService.SECURE_ANNC_READ_DRAFT;

diff --git a/reference/docs/conversion/sakai_12_mysql_conversion.sql b/reference/docs/conversion/sakai_12_mysql_conversion.sql
@@ -424,3 +424,20 @@ alter table lti_deploy drop column allowlori;
 alter table lti_tools drop column allowlori;
 drop table lti_mapping;
 -- END SAK-32442
+
+-- SAM-3012 Update samigo events 
+-- Update camel case events
+UPDATE SAKAI_EVENT SET EVENT = 'sam.assessment.submit' WHERE EVENT = 'sam.assessmentSubmitted';
+UPDATE SAKAI_EVENT SET EVENT = 'sam.assessment.graded.auto' WHERE EVENT = 'sam.assessmentAutoGraded';
+UPDATE SAKAI_EVENT SET EVENT = 'sam.assessment.submit.auto"' WHERE EVENT = 'sam.assessmentAutoSubmitted';
+UPDATE SAKAI_EVENT SET EVENT = 'sam.assessment.submit.timer.thread' WHERE EVENT = 'sam.assessmentTimedSubmitted';
+UPDATE SAKAI_EVENT SET EVENT = 'sam.pubassessment.remove' WHERE EVENT = 'sam.pubAssessment.remove';
+
+-- Update name of submission events
+UPDATE SAKAI_EVENT SET EVENT = 'sam.assessment.submit.from_last' WHERE EVENT = 'sam.submit.from_last_page';
+UPDATE SAKAI_EVENT SET EVENT = 'sam.assessment.submit.from_toc' WHERE EVENT = 'sam.submit.from_toc';
+UPDATE SAKAI_EVENT SET EVENT = 'sam.assessment.submit.thread' WHERE EVENT = 'sam.assessment.thread_submit';
+UPDATE SAKAI_EVENT SET EVENT = 'sam.assessment.submit.timer' WHERE EVENT = 'sam.assessment.timer_submit';
+UPDATE SAKAI_EVENT SET EVENT = 'sam.assessment.submit.timer.url' WHERE EVENT = 'sam.assessment.timer_submit.url';
+
+-- END SAM-3012 Update samigo events 
diff --git a/reference/docs/conversion/sakai_12_oracle_conversion.sql b/reference/docs/conversion/sakai_12_oracle_conversion.sql
@@ -484,3 +484,20 @@ alter table lti_deploy drop column allowlori;
 alter table lti_tools drop column allowlori;
 drop table lti_mapping
 -- END SAK-32442
+
+-- SAM-3012 - Update samigo events
+-- Update camel case events
+UPDATE SAKAI_EVENT SET EVENT = 'sam.assessment.submit' WHERE EVENT = 'sam.assessmentSubmitted';
+UPDATE SAKAI_EVENT SET EVENT = 'sam.assessment.graded.auto' WHERE EVENT = 'sam.assessmentAutoGraded';
+UPDATE SAKAI_EVENT SET EVENT = 'sam.assessment.submit.auto"' WHERE EVENT = 'sam.assessmentAutoSubmitted';
+UPDATE SAKAI_EVENT SET EVENT = 'sam.assessment.submit.timer.thread' WHERE EVENT = 'sam.assessmentTimedSubmitted';
+UPDATE SAKAI_EVENT SET EVENT = 'sam.pubassessment.remove' WHERE EVENT = 'sam.pubAssessment.remove';
+
+-- Update name of submission events
+UPDATE SAKAI_EVENT SET EVENT = 'sam.assessment.submit.from_last' WHERE EVENT = 'sam.submit.from_last_page';
+UPDATE SAKAI_EVENT SET EVENT = 'sam.assessment.submit.from_toc' WHERE EVENT = 'sam.submit.from_toc';
+UPDATE SAKAI_EVENT SET EVENT = 'sam.assessment.submit.thread' WHERE EVENT = 'sam.assessment.thread_submit';
+UPDATE SAKAI_EVENT SET EVENT = 'sam.assessment.submit.timer' WHERE EVENT = 'sam.assessment.timer_submit';
+UPDATE SAKAI_EVENT SET EVENT = 'sam.assessment.submit.timer.url' WHERE EVENT = 'sam.assessment.timer_submit.url';
+
+-- END SAM-3012
diff --git a/samigo/samigo-api/src/java/org/sakaiproject/samigo/util/SamigoConstants.java b/samigo/samigo-api/src/java/org/sakaiproject/samigo/util/SamigoConstants.java
@@ -41,23 +41,22 @@ public final class SamigoConstants {
      * Events
      */
     // Submission events
-    public static final     String      EVENT_ASSESSMENT_SUBMIT                             = "sam.assessment.submit";
-    public static final     String      EVENT_ASSESSMENT_SUBMIT_CHECKED                     = "sam.assessment.submit.checked";
-    public static final     String      EVENT_ASSESSMENT_SUBMIT_CLICKSUB                    = "sam.assessment.submit.click_sub";
-    public static final     String      EVENT_ASSESSMENT_SUBMITTED                          = "sam.assessmentSubmitted";
-    public static final     String      EVENT_ASSESSMENT_SUBMITTED_AUTO                     = "sam.assessmentAutoSubmitted";
-    public static final     String      EVENT_ASSESSMENT_SUBMITTED_TIMED                    = "sam.assessmentTimedSubmitted";
-    public static final     String      EVENT_ASSESSMENT_SUBMITTED_FROM_LASTPAGE            = "sam.submit.from_last_page";
-    public static final     String      EVENT_ASSESSMENT_SUBMITTED_FROM_TOC                 = "sam.submit.from_toc";
+    public static final     String      EVENT_ASSESSMENT_SUBMITTED                          = "sam.assessment.submit";
+    public static final     String      EVENT_ASSESSMENT_SUBMITTED_CHECKED                  = "sam.assessment.submit.checked";
+    public static final     String      EVENT_ASSESSMENT_SUBMITTED_CLICKSUB                 = "sam.assessment.submit.click_sub";
+    public static final     String      EVENT_ASSESSMENT_SUBMITTED_AUTO                     = "sam.assessment.submit.auto";
+    public static final     String      EVENT_ASSESSMENT_SUBMITTED_FROM_LASTPAGE            = "sam.assessment.submit.from_last_page";
+    public static final     String      EVENT_ASSESSMENT_SUBMITTED_FROM_TOC                 = "sam.assessment.submit.from_toc";
     public static final     String      EVENT_ASSESSMENT_SUBMITTED_VIA_URL                  = "sam.assessment.submit.via_url";
-    public static final     String      EVENT_ASSESSMENT_SUBMITTED_THREAD                   = "sam.assessment.thread_submit";
-    public static final     String      EVENT_ASSESSMENT_SUBMITTED_TIMER                    = "sam.assessment.timer_submit";
-    public static final     String      EVENT_ASSESSMENT_SUBMITTED_TIMER_VIA_URL            = "sam.assessment.timer_submit.url";
+    public static final     String      EVENT_ASSESSMENT_SUBMITTED_THREAD                   = "sam.assessment.submit.thread";
+    public static final     String      EVENT_ASSESSMENT_SUBMITTED_TIMER                    = "sam.assessment.submit.timer";
+    public static final     String      EVENT_ASSESSMENT_SUBMITTED_TIMER_VIA_URL            = "sam.assessment.submit.timer.url";
+    public static final     String      EVENT_ASSESSMENT_SUBMITTED_TIMER_THREAD             = "sam.assessment.submit.timer.thread";
 
     //Assessment scoring events
     public static final     String      EVENT_ASSESSMENT_TOTAL_SCORE_UPDATE                 = "sam.total.score.update";
     public static final     String      EVENT_ASSESSMENT_STUDENT_SCORE_UPDATE               = "sam.student.score.update";
-    public static final     String      EVENT_ASSESSMENT_AUTO_GRADED                        = "sam.assessmentAutoGraded";
+    public static final     String      EVENT_ASSESSMENT_AUTO_GRADED                        = "sam.assessment.graded.auto";
     public static final     String      EVENT_ASSESSMENT_QUESTION_SCORE_UPDATE              = "sam.question.score.update";
 
     //Assessment manipulation
@@ -76,8 +75,8 @@ public final class SamigoConstants {
     //Published assessment events
     public static final     String      EVENT_PUBLISHED_ASSESSMENT_REVISE                   = "sam.pubassessment.revise";
     public static final     String      EVENT_PUBLISHED_ASSESSMENT_SAVEITEM                 = "sam.pubassessment.saveitem";
-    public static final     String      EVENT_PUBLISHED_ASSESSMENT_REMOVE                   = "sam.pubAssessment.remove";
-    public static final     String      EVENT_PUBLISHED_ASSESSMENT_CONFIRM_EDIT                = "sam.pubassessment.confirm_edit";
+    public static final     String      EVENT_PUBLISHED_ASSESSMENT_REMOVE                   = "sam.pubassessment.remove";
+    public static final     String      EVENT_PUBLISHED_ASSESSMENT_CONFIRM_EDIT             = "sam.pubassessment.confirm_edit";
     public static final     String      EVENT_PUBLISHED_ASSESSMENT_REPUBLISH                = "sam.pubassessment.republish";
     public static final     String      EVENT_PUBLISHED_ASSESSMENT_SETTING_EDIT             = "sam.pubsetting.edit";
     public static final     String      EVENT_PUBLISHED_ASSESSMENT_UNINDEXITEM              = "sam.pubassessment.unindexitem";

diff --git a/...o/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/delivery/DeliveryBean.java b/...o/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/delivery/DeliveryBean.java
@@ -1567,14 +1567,14 @@ private String submitForGrade(boolean isFromTimer, boolean submitFromTimeoutPopu
 		  return "editAssessment";
 	  }	  
 
-	  EventTrackingService.post(EventTrackingService.newEvent(SamigoConstants.EVENT_ASSESSMENT_SUBMIT_CLICKSUB, "siteId=" + AgentFacade.getCurrentSiteId() + ", submissionId=" + adata.getAssessmentGradingId(), siteId, true, NotificationService.NOTI_REQUIRED));
+	  EventTrackingService.post(EventTrackingService.newEvent(SamigoConstants.EVENT_ASSESSMENT_SUBMITTED_CLICKSUB, "siteId=" + AgentFacade.getCurrentSiteId() + ", submissionId=" + adata.getAssessmentGradingId(), siteId, true, NotificationService.NOTI_REQUIRED));
 
 	  if (!submitFromTimeoutPopup) {
 
 		  String nextAction = checkBeforeProceed(true, isFromTimer);
 		  log.debug("***** next Action="+nextAction);
 
-		  EventTrackingService.post(EventTrackingService.newEvent(SamigoConstants.EVENT_ASSESSMENT_SUBMIT_CHECKED, "siteId=" + AgentFacade.getCurrentSiteId() + ", submissionId=" + adata.getAssessmentGradingId(), siteId, true, NotificationService.NOTI_REQUIRED));
+		  EventTrackingService.post(EventTrackingService.newEvent(SamigoConstants.EVENT_ASSESSMENT_SUBMITTED_CHECKED, "siteId=" + AgentFacade.getCurrentSiteId() + ", submissionId=" + adata.getAssessmentGradingId(), siteId, true, NotificationService.NOTI_REQUIRED));
 
 
 		  if (!("safeToProceed").equals(nextAction)){
@@ -1624,7 +1624,7 @@ private String submitForGrade(boolean isFromTimer, boolean submitFromTimeoutPopu
 			  EventTrackingService.post(EventTrackingService.newEvent(SamigoConstants.EVENT_ASSESSMENT_SUBMITTED_VIA_URL, resource, siteId, true, NotificationService.NOTI_REQUIRED));
 		  }
 		  else {
-			  EventTrackingService.post(EventTrackingService.newEvent(SamigoConstants.EVENT_ASSESSMENT_SUBMIT, resource, true));
+			  EventTrackingService.post(EventTrackingService.newEvent(SamigoConstants.EVENT_ASSESSMENT_SUBMITTED, resource, true));
 		  }
 	  }
 	  else {

diff --git a/.../java/org/sakaiproject/tool/assessment/ui/queue/delivery/SubmitTimedAssessmentThread.java b/.../java/org/sakaiproject/tool/assessment/ui/queue/delivery/SubmitTimedAssessmentThread.java
@@ -146,7 +146,7 @@ public void run(){
                                                                 .collect(Collectors.joining(";")));
             }            
 
-            EventTrackingService.post(EventTrackingService.newEvent(SamigoConstants.EVENT_ASSESSMENT_SUBMITTED_TIMED, notiValues.toString(), siteId, true, SamigoConstants.NOTI_EVENT_ASSESSMENT_TIMED_SUBMITTED));
+            EventTrackingService.post(EventTrackingService.newEvent(SamigoConstants.EVENT_ASSESSMENT_SUBMITTED_TIMER_THREAD, notiValues.toString(), siteId, true, SamigoConstants.NOTI_EVENT_ASSESSMENT_TIMED_SUBMITTED));
             notifyGradebookByScoringType(ag, timedAG.getPublishedAssessment());
             log.debug("**** 4a. time's up, timeLeft+latency buffer reached, saved to DB");
             log.info("Submitted timed assessment assessmentId=" + eventLogData.getAssessmentId() + " userEid=" + eventLogData.getUserEid() + " siteId=" + siteId + ", submissionId=" + ag.getAssessmentGradingId());

diff --git a/samigo/samigo-impl/src/java/org/sakaiproject/samigo/impl/SamigoETSProviderImpl.java b/samigo/samigo-impl/src/java/org/sakaiproject/samigo/impl/SamigoETSProviderImpl.java
@@ -92,7 +92,7 @@ public      void                notify                              (String even
             case SamigoConstants.EVENT_ASSESSMENT_SUBMITTED_AUTO:
                 handleAssessmentAutoSubmitted(notificationValues, event);
                 break;
-            case SamigoConstants.EVENT_ASSESSMENT_SUBMITTED_TIMED:
+            case SamigoConstants.EVENT_ASSESSMENT_SUBMITTED_TIMER_THREAD:
                 handleAssessmentTimedSubmitted(notificationValues, event);
                 break;
         }

diff --git a/samigo/samigo-impl/src/java/org/sakaiproject/samigo/impl/SamigoObserver.java b/samigo/samigo-impl/src/java/org/sakaiproject/samigo/impl/SamigoObserver.java
@@ -59,11 +59,11 @@ public void update(Observable arg0, Object arg) {
             String hashMapString = event.getResource();
             Map<String, Object> notiValues =  stringToHashMap(hashMapString);
             samigoETSProvider.notify(SamigoConstants.EVENT_ASSESSMENT_SUBMITTED_AUTO, notiValues, event);
-        } else if(SamigoConstants.EVENT_ASSESSMENT_SUBMITTED_TIMED.equals(eventType)){
+        } else if(SamigoConstants.EVENT_ASSESSMENT_SUBMITTED_TIMER_THREAD.equals(eventType)){
             log.debug("Assessment Timed Submitted Event");
             String hashMapString = event.getResource();
             Map<String, Object> notiValues = stringToHashMap(hashMapString);
-            samigoETSProvider.notify(SamigoConstants.EVENT_ASSESSMENT_SUBMITTED_TIMED, notiValues, event);
+            samigoETSProvider.notify(SamigoConstants.EVENT_ASSESSMENT_SUBMITTED_TIMER_THREAD, notiValues, event);
         }
     }
 

diff --git a/sitestats/sitestats-api/src/config/org/sakaiproject/sitestats/config/toolEventsDef.xml b/sitestats/sitestats-api/src/config/org/sakaiproject/sitestats/config/toolEventsDef.xml
@@ -349,7 +349,7 @@
 		<event eventId="sam.assessment.revise" selected="true"/>
 		<event eventId="sam.assessment.submit" selected="true"/>
 		<event eventId="sam.assessment.submit.via_url" selected="true"/>
-		<event eventId="sam.assessment.timer_submit" selected="true"/>
+		<event eventId="sam.assessment.submit.timer" selected="true"/>
 		<event eventId="sam.assessment.publish" selected="true"/>
 		<event eventId="sam.assessment.take" selected="true"/>
 		<event eventId="sam.assessment.take.via_url" selected="true"/>

diff --git a/sitestats/sitestats-bundle/src/resources/Events.properties b/sitestats/sitestats-bundle/src/resources/Events.properties
@@ -180,7 +180,7 @@ sam.assessment.create=T&Q Assessment create
 sam.assessment.revise=T&Q Assessment part/question add/edit
 sam.assessment.submit=T&Q Assessment submit 
 sam.assessment.submit.via_url=T&Q Assessment submit via URL
-sam.assessment.timer_submit=T&Q Assessment submit from timer
+sam.assessment.submit.timer=T&Q Assessment submit from timer
 sam.assessment.publish=T&Q Assessment publish
 sam.assessment.take=T&Q Assessment take
 sam.assessment.take.via_url=T&Q Assessment take via URL

diff --git a/sitestats/sitestats-bundle/src/resources/Events_ca.properties b/sitestats/sitestats-bundle/src/resources/Events_ca.properties
@@ -180,7 +180,7 @@ sam.assessment.create=Creaci\u00f3 d'una prova
 sam.assessment.revise=Revisi\u00f3 d'una prova (addici\u00f3/edici\u00f3 d'una part/d'una pregunta)
 sam.assessment.submit=Lliurament d'una prova
 sam.assessment.submit.via_url=Lliura una prova via URL
-sam.assessment.timer_submit=Lliura una prova per temporitzador
+sam.assessment.submit.timer=Lliura una prova per temporitzador
 sam.assessment.publish=Publicaci\u00f3 d'una prova
 sam.assessment.take=Inici d'una prova
 sam.assessment.take.via_url=Prova feta via URL

diff --git a/sitestats/sitestats-bundle/src/resources/Events_de.properties b/sitestats/sitestats-bundle/src/resources/Events_de.properties
@@ -180,7 +180,7 @@ sam.assessment.create=P&T-Pr\u00fcfung erstellen
 sam.assessment.revise=Teil/Frage der P&T-Pr\u00fcfung hinzuf\u00fcgen/bearbeiten
 sam.assessment.submit=P&T-Pr\u00fcfung einreichen 
 sam.assessment.submit.via_url=P&T-Pr\u00fcfung einreichen
-sam.assessment.timer_submit=P&T-Pr\u00fcfung \u00fcber Timer einreichen
+sam.assessment.submit.timer=P&T-Pr\u00fcfung \u00fcber Timer einreichen
 sam.assessment.publish=P&T-Pr\u00fcfung ver\u00f6ffentlichen
 sam.assessment.take=P&T-Pr\u00fcfung absolvieren
 sam.assessment.take.via_url=P&T-Pr\u00fcfung \u00fcber URL ablegen

diff --git a/sitestats/sitestats-bundle/src/resources/Events_es.properties b/sitestats/sitestats-bundle/src/resources/Events_es.properties
@@ -180,7 +180,7 @@ sam.assessment.create=Crear un nuevo examen
 sam.assessment.revise=Revisar un examen existente (a\u00f1adir/editar pregunta/parte)
 sam.assessment.submit=Enviar un examen
 sam.assessment.submit.via_url=Mandar un examen por URL en Ex\u00e1menes
-sam.assessment.timer_submit=Mandar un examen por temporizador en Ex\u00e1menes
+sam.assessment.submit.timer=Mandar un examen por temporizador en Ex\u00e1menes
 sam.assessment.publish=Publicar un examen
 sam.assessment.take=Comenzar la realizaci\u00f3n de examen
 sam.assessment.take.via_url=Realizar un examen mediante URL

diff --git a/sitestats/sitestats-bundle/src/resources/Events_eu.properties b/sitestats/sitestats-bundle/src/resources/Events_eu.properties
@@ -185,7 +185,7 @@ sam.assessment.publish= Argitaratu azterketa bat
 sam.assessment.revise= Gehitu/editatu galdera edo zatia
 sam.assessment.submit= Bidali azterketa bat
 sam.assessment.take= Egin azterketa -ikasle moduan - 
-sam.assessment.timer_submit=Auto-bidalketa denbora agortzean
+sam.assessment.submit.timer=Auto-bidalketa denbora agortzean
 sam.email= Bidali posta
 sam.pubassessment.confirm_edit= Berretsi azterketa baten argitalpena
 sam.pubassessment.revise= Berrikusi argitaratuta dagoen azterketa

diff --git a/sitestats/sitestats-bundle/src/resources/Events_fr_FR.properties b/sitestats/sitestats-bundle/src/resources/Events_fr_FR.properties
@@ -181,7 +181,7 @@ sam.assessment.create=\u00c9valuation T&Q cr\u00e9\u00e9e
 sam.assessment.revise=Ajouter/modifier une question/partie de l'\u00e9valuation T&Q
 sam.assessment.submit=Soumission de l'\u00e9valuation T&Q
 sam.assessment.submit.via_url=\u00c9valuation T&Q soumise via une URL
-sam.assessment.timer_submit=\u00c9valuation T&Q soumise par le minuteur
+sam.assessment.submit.timer=\u00c9valuation T&Q soumise par le minuteur
 sam.assessment.publish=Publication de l'\u00e9valuation T&Q
 sam.assessment.take=Passe une \u00e9valuation T&Q
 sam.assessment.take.via_url=Passe une \u00e9valuation T&Q via une URL

diff --git a/sitestats/sitestats-bundle/src/resources/Events_hi_IN.properties b/sitestats/sitestats-bundle/src/resources/Events_hi_IN.properties
@@ -181,7 +181,7 @@ sam.assessment.create=\u091f\u0940 \u090f\u0902\u0921 \u0915\u094d\u092f\u0942 \
 sam.assessment.revise=\u091f\u0940 \u090f\u0902\u0921 \u0915\u094d\u092f\u0942 \u0906\u0915\u0932\u0928 \u092d\u093e\u0917/\u092a\u094d\u0930\u0936\u094d\u0928 \u091c\u094b\u0921\u093c\u0947\u0902/\u0938\u0902\u092a\u093e\u0926\u093f\u0924 \u0915\u0930\u0947\u0902
 sam.assessment.submit=\u091f\u0940 \u090f\u0902\u0921 \u0915\u094d\u092f\u0942 \u0906\u0915\u0932\u0928 \u0938\u092c\u092e\u093f\u091f \u0915\u0930\u0947\u0902 
 sam.assessment.submit.via_url=\u091f\u0940 \u090f\u0902\u0921 \u0915\u094d\u092f\u0942 \u0906\u0915\u0932\u0928 \u092f\u0942\u0906\u0930\u090f\u0932 \u0926\u094d\u0935\u093e\u0930\u093e \u091c\u092e\u093e \u0915\u0930\u0947\u0902
-sam.assessment.timer_submit=\u091f\u0940 \u090f\u0902\u0921 \u0915\u094d\u092f\u0942 \u0906\u0915\u0932\u0928 \u091f\u093e\u0907\u092e\u0930 \u0938\u0947 \u091c\u092e\u093e \u0915\u0930\u0947\u0902
+sam.assessment.submit.timer=\u091f\u0940 \u090f\u0902\u0921 \u0915\u094d\u092f\u0942 \u0906\u0915\u0932\u0928 \u091f\u093e\u0907\u092e\u0930 \u0938\u0947 \u091c\u092e\u093e \u0915\u0930\u0947\u0902
 sam.assessment.publish=\u091f\u0940 \u090f\u0902\u0921 \u0915\u094d\u092f\u0942 \u0906\u0915\u0932\u0928 \u092a\u094d\u0930\u0915\u093e\u0936\u093f\u0924 \u0915\u0930\u0947\u0902
 sam.assessment.take=\u091f\u0940 \u090f\u0902\u0921 \u0915\u094d\u092f\u0942 \u0906\u0915\u0932\u0928 \u0932\u0947
 sam.assessment.take.via_url=\u091f\u0940 \u090f\u0902\u0921 \u0915\u094d\u092f\u0942 \u0906\u0915\u0932\u0928 \u092f\u0942\u0906\u0930\u090f\u0932 \u0915\u0947 \u092e\u093e\u0927\u094d\u092f\u092e \u0938\u0947 \u0932\u0947

diff --git a/sitestats/sitestats-bundle/src/resources/Events_ja.properties b/sitestats/sitestats-bundle/src/resources/Events_ja.properties
@@ -131,7 +131,7 @@ sam.assessment.create=T&Q \u30c6\u30b9\u30c8\u4f5c\u6210
 sam.assessment.revise=T&Q \u30c6\u30b9\u30c8\u30d1\u30fc\u30c8/\u554f\u984c\u8ffd\u52a0/\u7de8\u96c6
 sam.assessment.submit=T&Q \u30c6\u30b9\u30c8\u3092\u63d0\u51fa
 sam.assessment.submit.via_url=URL\u7d4c\u7531\u3067T&Q \u30c6\u30b9\u30c8\u3092\u63d0\u51fa
-sam.assessment.timer_submit=\u30bf\u30a4\u30de\u30fc\u304b\u3089T&Q \u30c6\u30b9\u30c8\u3092\u63d0\u51fa
+sam.assessment.submit.timer=\u30bf\u30a4\u30de\u30fc\u304b\u3089T&Q \u30c6\u30b9\u30c8\u3092\u63d0\u51fa
 sam.assessment.publish=T&Q \u30c6\u30b9\u30c8\u516c\u958b
 sam.assessment.take=T&Q \u30c6\u30b9\u30c8\u3092\u53d7\u9a13
 sam.assessment.take.via_url=URL\u7d4c\u7531\u3067T&Q \u30c6\u30b9\u30c8\u3092\u53d7\u9a13

diff --git a/sitestats/sitestats-bundle/src/resources/Events_pt_BR.properties b/sitestats/sitestats-bundle/src/resources/Events_pt_BR.properties
@@ -186,7 +186,7 @@ sam.assessment.create=Nova Avalia\u00e7\u00e3o
 sam.assessment.revise=Editar Avalia\u00e7\u00e3o (adicionar/editar pergunta/parte)
 sam.assessment.submit=Submeter uma Avalia\u00e7\u00e3o  
 sam.assessment.submit.via_url=Submeter Avalia\u00e7\u00e3o via URL 
-sam.assessment.timer_submit=Submeter Avalia\u00e7\u00e3o Cronometrada 
+sam.assessment.timer.submit=Submeter Avalia\u00e7\u00e3o Cronometrada 
 sam.assessment.publish=Publicar Avalia\u00e7\u00e3o 
 sam.assessment.take=Iniciar Avalia\u00e7\u00e3o 
 sam.assessment.take.via_url=Iniciar Avalia\u00e7\u00e3o via URL