Merge remote-tracking branch 'origin/master' into error-info

config/locales/de.yml

@@ -94,6 +94,7 @@ de:
         requested_at: Angefragezeitpunkt
         question: "Frage"
         close: "Fenster schließen"
+        last_update: "Letzte Aktivität"
       submission:
         cause: Anlass
         code: Code
@@ -460,7 +461,7 @@ de:
           Thank you for helping other users on CodeOcean!
           <br>
           This mail was automatically sent by CodeOcean. <br>
-        subject: "%{author} sagt danke!"
+        subject: "%{author} sagt Danke!"
   request_for_comments:
     click_here: Zum Kommentieren auf die Seitenleiste klicken!
     comments: Kommentare
@@ -472,6 +473,8 @@ de:
     index:
       get_my_comment_requests: Meine Kommentaranfragen
       all: "Alle Kommentaranfragen"
+      get_rfcs_with_my_comments: Kommentaranfragen die ich kommentiert habe
+      get_my_rfc_activity: "Meine Kommentaraktivität"
     no_question: "Der Autor hat keine Frage zu dieser Anfrage gestellt."
     mark_as_solved: "Diese Frage als beantwortet markieren"
     show_all: "Alle Anfragen anzeigen"
@@ -482,6 +485,7 @@ de:
     write_a_thank_you_node: "Wenn Sie möchten, können Sie sich bei allen Mitstudenten, die Ihnen bei der Beantwortung Ihrer Frage geholfen haben, bedanken:"
     send_thank_you_note: "Senden"
     cancel_thank_you_note: "Nichts senden"
+    comment_edited: "bearbeitet"
   sessions:
     create:
       failure: Fehlerhafte E-Mail oder Passwort.

config/locales/en.yml

@@ -115,6 +115,7 @@ en:
         requested_at: Request Date
         question: "Question"
         close: Close window
+        last_update: "Last Update"
       submission:
         cause: Cause
         code: Code
@@ -493,6 +494,8 @@ en:
     index:
       all: All Requests for Comments
       get_my_comment_requests: My Requests for Comments
+      get_rfcs_with_my_comments: Requests for Comments I have commented on
+      get_my_rfc_activity: "My Comment Activity"
     no_question: "The author did not enter a question for this request."
     mark_as_solved: "Mark this question as answered"
     show_all: "All requests"
@@ -503,6 +506,7 @@ en:
     write_a_thank_you_node: "If you want, you can write a thank you note to all your commenters:"
     send_thank_you_note: "Send"
     cancel_thank_you_note: "Don't send"
+    comment_edited: "edited"
   sessions:
     create:
       failure: Invalid email or password.

config/routes.rb

@@ -27,6 +27,7 @@ Rails.application.routes.draw do
     end
   end
   get '/my_request_for_comments', as: 'my_request_for_comments', to: 'request_for_comments#get_my_comment_requests'
+  get '/my_rfc_activity', as: 'my_rfc_activity', to: 'request_for_comments#get_rfcs_with_my_comments'
 
   delete '/comment_by_id', to: 'comments#destroy_by_id'
   put '/comments', to: 'comments#update'