Merge branch 'master' of github.com:flxw/codeocean

app/views/request_for_comments/index.html.erb

@@ -1,4 +1,4 @@
-<h1>Listing comment requests</h1>
+<h1><%= t('exercises.implement.comment.listing') %></h1>
 
 <div class="list-group">
   <% @request_for_comments.each do |request_for_comment| %>

app/views/request_for_comments/show.html.erb

@@ -7,14 +7,14 @@
 
 <form class="form-inline">
   <div class="form-group">
-    <p style='display:inline-block'>Line</p>
+    <p style='display:inline-block'><%= t('exercises.implement.comment.line') %></p>
     <input type="number" class="form-control" id="lineInput" placeholder="1" required>
   </div>
   <div class="form-group">
-    <p style='display:inline-block'>Comment</p>
+    <p style='display:inline-block'><%= t('exercises.implement.comment.a_comment') %></p>
     <input type="text" class="form-control" id="commentInput" placeholder="I'd suggest a variable here" required>
   </div>
-  <button id='submitComment' type="submit" class="btn btn-default">Comment!</button>
+  <button id='submitComment' type="submit" class="btn btn-default"><%= t('exercises.implement.comment.addComment') %>!</button>
 </form>
 
 <div id='commentitor' class='editor' data-read-only='true' data-file-id='<%=@request_for_comment.fileid%>'>

config/code_ocean.yml.example

@@ -9,7 +9,7 @@ development:
     enabled: true
     url: http://example.org:3000/api/exceptioninfo?id=&lang=auto
   code_pilot:
-    enabled: true
+    enabled: false
     url: //localhost:3000
 
 production:

config/locales/de.yml

@@ -210,11 +210,14 @@ de:
       test_count: '<span class="number">%{count}</span> Test-Dateien wurden ausgeführt.'
       workspace: Arbeitsbereich
       comment:
+        a_comment: Kommentar
+        line: Zeile
         dialogtitle: Kommentieren Sie diese Zeile!
         others: Andere Kommentare auf dieser Zeile
         addyours: Fügen Sie Ihren Kommentar hinzu
-        addComment: Hinzufügen
+        addComment: Kommentieren
         removeAllOnLine: Alle Kommentare auf dieser Zeile löschen
+        listing: Die neuesten Kommentaranfragen
     index:
       clone: Duplizieren
       implement: Implementieren

config/locales/en.yml

@@ -210,11 +210,14 @@ en:
       test_count: '<span class="number">%{count}</span> test files have been executed.'
       workspace: Workspace
       comment:
+        a_comment: comment
+        line: line
         dialogtitle: Comment on this line!
         others: Other comments on this line
         addyours: Add your comment
-        addComment: Add comment
+        addComment: Comment this
         removeAllOnLine: Remove all comments on this line
+        listing: Listing the newest comment requests
     index:
       clone: Duplicate
       implement: Implement